修改

src/main/java/com/template/controller/CompaniesPDViewController.java

@@ -32,13 +32,11 @@ public class CompaniesPDViewController {
     private CompaniesPDViewService companiesPDViewService;
 
     @RequestMapping("/getComPage")
-    public CommonResult getComPage(@Param("pageNum") Integer pageNum,@Param("pageSize") Integer pageSize,@Param("town") String town,@Param("companies") String companies) {
+    public CommonResult getComPage(@Param("pageNum") Integer pageNum,@Param("pageSize") Integer pageSize,@Param("townCompanies") String townCompanies) {
         QueryWrapper<CompaniesPDView> queryWrapper = new QueryWrapper<>();
-        if (town!=null&&town!=""){
-            queryWrapper.like("pname",town);
-        }
-        if (companies!=null&&companies!=""){
-            queryWrapper.like("name",companies);
+        if (townCompanies!=null&&townCompanies!=""){
+            queryWrapper.like("name",townCompanies);
+            queryWrapper.or().like("pname",townCompanies);
         }
         IPage<CompaniesPDView> page = companiesPDViewService.page(new Page<CompaniesPDView>(pageNum, pageSize), queryWrapper);
         return CommonResult.ok(page);

src/main/java/com/template/handler/MyMetaObjectHandler.java

@@ -25,16 +25,16 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
             String user_id = request.getHeader("user_head") == null ? "0" : AesUtils.decrypt(request.getHeader("user_head"));
             log.info("start insert fill.....");
             // setFieldValByName(String fieldName, Object fieldVal, MetaObject metaObject
-            this.setFieldValByName("createTime", new Date(), metaObject);
-            this.setFieldValByName("updateTime", new Date(), metaObject);
-            this.setFieldValByName("createUser", user_id, metaObject);
-            this.setFieldValByName("updateUser", user_id, metaObject);
+//            this.setFieldValByName("createTime", new Date(), metaObject);
+//            this.setFieldValByName("updateTime", new Date(), metaObject);
+//            this.setFieldValByName("createUser", user_id, metaObject);
+//            this.setFieldValByName("updateUser", user_id, metaObject);
             this.setFieldValByName("deleted", 0, metaObject);
         } else {
-            this.setFieldValByName("createTime", new Date(), metaObject);
-            this.setFieldValByName("updateTime", new Date(), metaObject);
-            this.setFieldValByName("createUser","0", metaObject);
-            this.setFieldValByName("updateUser","0", metaObject);
+//            this.setFieldValByName("createTime", new Date(), metaObject);
+//            this.setFieldValByName("updateTime", new Date(), metaObject);
+//            this.setFieldValByName("createUser","0", metaObject);
+//            this.setFieldValByName("updateUser","0", metaObject);
             this.setFieldValByName("deleted", 0, metaObject);
         }
     }

src/main/java/com/template/model/Companies.java

@@ -44,7 +44,7 @@ public class Companies implements Serializable {
 
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
 
 
 }

src/main/java/com/template/model/CompaniesPDView.java

@@ -41,7 +41,7 @@ public class CompaniesPDView implements Serializable {
 
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
 
     private String pname;
 

src/main/java/com/template/model/Devices.java

@@ -65,7 +65,7 @@ public class Devices implements Serializable {
 
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
 
     @TableField("deviceSerial")
     private String deviceSerial;

src/main/java/com/template/model/DevicesAlarm.java

@@ -59,7 +59,7 @@ public class DevicesAlarm implements Serializable {
 
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
 
 
 }

src/main/java/com/template/model/DevicesCView.java

@@ -64,7 +64,7 @@ public class DevicesCView implements Serializable {
 
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
 
     @TableField("deviceSerial")
     private String deviceSerial;

src/main/java/com/template/model/Postions.java

@@ -43,7 +43,7 @@ public class Postions implements Serializable {
 
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
 
 
 }

src/main/java/com/template/model/Records.java

@@ -45,7 +45,7 @@ public class Records implements Serializable {
 
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
 
 
 }

src/main/java/com/template/model/Repairs.java

@@ -45,7 +45,7 @@ public class Repairs implements Serializable {
 
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
 
 
 }

src/main/java/com/template/model/Users.java

@@ -49,7 +49,7 @@ public class Users implements Serializable {
 
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
-    private Boolean deleted;
+    private Integer deleted;
 
 
 }

src/main/java/com/template/scheduled/ScheduledService.java

@@ -0,0 +1,95 @@
+package com.template.scheduled;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.template.model.Devices;
+import com.template.model.Records;
+import com.template.services.DevicesService;
+import com.template.services.RecordsService;
+import org.apache.commons.lang3.time.DateUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Controller;
+
+import java.util.*;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-04-20
+ */
+@Component
+@Controller
+public class ScheduledService {
+
+    private static Logger logger = LoggerFactory.getLogger( ScheduledService.class);
+
+    @Autowired
+    RecordsService recordsService;
+
+    @Autowired
+    DevicesService devicesService;
+
+    //定时保存停车场实时数据 每小时一次
+    @Scheduled(cron="0 0/10 * * * ?")
+    public void getParkingInfoScheduled() {
+        QueryWrapper<Records> queryWrapper=new QueryWrapper<>();
+        queryWrapper.last("order by update_at desc");
+        //查询最新记录获取事件，更新10分钟后数据
+        Records oldRecords=recordsService.getOne(queryWrapper);
+        Date endTime = DateUtils.addMinutes(oldRecords.getUpdateAt(), 10);
+        if(endTime.after(new Date())){
+            System.exit(0);
+        }
+        List<Devices> devicesList=devicesService.list(new QueryWrapper<>());
+        logger.info("devicesList++++++++++++++"+devicesList.size());
+        List<Records> recordsList=new ArrayList<>();
+        String[] arr= {"Temperature","Humidity","Light","CO2"};
+        for(Devices devic:devicesList){
+            for(int i=0;i< arr.length;i++){
+                Records records=new Records();
+                records.setDeviceId(devic.getId());
+                switch (arr[i]){
+                    case "Temperature":
+                        records.setType("Temperature");
+                        records.setValue(this.getRandValue(18,28));
+                        records.setCreateAt(endTime);
+                        records.setUpdateAt(endTime);
+                        break;
+                    case "Humidity":
+                        records.setType("Humidity");
+                        records.setValue(this.getRandValue(30,80));
+                        records.setCreateAt(endTime);
+                        records.setUpdateAt(endTime);
+                        break;
+                    case "CO2":
+                        records.setType("CO2");
+                        records.setValue(this.getRandValue(400,1000));
+                        records.setCreateAt(endTime);
+                        records.setUpdateAt(endTime);
+                        break;
+                    case "Light":
+                        records.setType("Light");
+                        records.setValue(this.getRandValue(300,3500));
+                        records.setCreateAt(endTime);
+                        records.setUpdateAt(endTime);
+                        break;
+                }
+                recordsList.add(records);
+            }
+        }
+        boolean a=recordsService.saveOrUpdateBatch(recordsList);
+        logger.info("批量导入结果："+a);
+    }
+
+    public double getRandValue(int min, int max) {
+        Random rand = new Random();
+        int count = rand.nextInt(max - min + 1) + min;
+        return count;
+    }
+}

src/main/resources/application.yml

@@ -4,8 +4,8 @@ server:
 #    context-path: /nayong
 
 spring:
-#  profiles:
-#      active: dev
+  profiles:
+      active: dev
   main:
     allow-circular-references: true
   servlet: