修改

src/main/java/com/xmgl/recognition/config/FaceRunner.java

@@ -0,0 +1,45 @@
+package com.xmgl.recognition.config;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xmgl.recognition.modules.enterprise.entity.DeviceAlarm;
+import com.xmgl.recognition.modules.enterprise.service.IDeviceAlarmService;
+import com.xmgl.recognition.redis.Constant.CacheConstants;
+import com.xmgl.recognition.redis.lock.RedisRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+@Order(value = 2)
+@Slf4j
+public class FaceRunner implements CommandLineRunner {
+
+    @Autowired
+    private RedisRepository redisRepository;
+
+    @Autowired
+    private IDeviceAlarmService deviceAlarmService;
+
+    @Override
+    public void run(String... args) {
+        redisRepository.delAll(CacheConstants.DEVICE_ALARM);
+        for (int i = 1; i < 31; i++) {
+            DateTime dateTime = DateUtil.offsetDay(new Date(), -i);
+            Map<String, Object> map = new HashMap<>();
+            map.put("time", dateTime.toDateStr());
+            map.put("num", deviceAlarmService.count(Wrappers.<DeviceAlarm>lambdaQuery()
+                    .between(DeviceAlarm::getReportTime, DateUtil.beginOfDay(dateTime), DateUtil.endOfDay(dateTime))));
+            redisRepository.leftPush(CacheConstants.DEVICE_ALARM, map);
+        }
+        log.info("=========初始化预警信息统计成功========");
+    }
+}

src/main/java/com/xmgl/recognition/modules/enterprise/controller/DeviceAlarmController.java

@@ -3,6 +3,7 @@ package com.xmgl.recognition.modules.enterprise.controller;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.xmgl.recognition.annotation.OperLog;
 import com.xmgl.recognition.jeecg.common.util.PageUtil;
@@ -94,7 +95,36 @@ public class DeviceAlarmController {
     })
     @PostMapping(value = "/page")
     public Result<IPage<DeviceAlarm>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
-        IPage<DeviceAlarm> pageList = deviceAlarmService.pageList(map);
+        Page page = PageUtil.getPage(map);
+        String code = MapUtils.getString(map, "code");
+        String deptId = MapUtils.getString(map, "deptId");
+        String deptGroup = MapUtils.getString(map, "deptGroup");
+        String startTime = MapUtils.getString(map, "startTime");
+        String endTime = MapUtils.getString(map, "endTime");
+        String type = MapUtils.getString(map, "type");
+        QueryWrapper<DeviceAlarm> wrapper = Wrappers.<DeviceAlarm>query();
+        if (StringUtils.isNotBlank(code)) {
+            wrapper.eq("a.device_code", code);
+        }
+        if (StringUtils.isNotBlank(deptId)) {
+            wrapper.eq("a.dept_id", deptId);
+        }
+        if (StringUtils.isNotBlank(deptGroup)) {
+            wrapper.eq("a.dept_group", deptGroup);
+        }
+        if (StringUtils.isNotBlank(startTime)) {
+            wrapper.ge("a.report_time", startTime);
+        }
+        if (StringUtils.isNotBlank(endTime)) {
+            wrapper.le("a.report_time", endTime);
+        }
+        if (StringUtils.isNotBlank(endTime)) {
+            wrapper.le("a.report_time", endTime);
+        }
+        if (StringUtils.isNotBlank(type)) {
+            wrapper.eq("a.type", type);
+        }
+        IPage<DeviceAlarm> pageList = deviceAlarmService.pageList(page, wrapper);
         return Result.success(pageList);
     }
 
@@ -150,9 +180,9 @@ public class DeviceAlarmController {
     public Result<Map<String, Object>> queryStat() {
         Result<Map<String, Object>> result = new Result<Map<String, Object>>();
         Map<String, Object> resultMap = new HashMap<>();
-        List<DeviceAlarm> deviceAlarmList = deviceAlarmService.getList(Wrappers.<DeviceAlarm>lambdaQuery()
+        List<DeviceAlarm> deviceAlarmList = deviceAlarmService.pageList(new Page(1, 50), Wrappers.<DeviceAlarm>query()
-                .between(DeviceAlarm::getReportTime, DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()))
+                .between("a.report_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()))
-                .orderByDesc(DeviceAlarm::getReportTime));
+                .orderByDesc("a.report_time")).getRecords();
         List<Algorithm> algorithms = algorithmService.list();
         deviceAlarmList.stream().forEach(d -> {
             List<Algorithm> algorithmList = algorithms.stream().filter(a -> a.getRemark().equals(d.getType().toString())).collect(Collectors.toList());

src/main/java/com/xmgl/recognition/modules/enterprise/service/IDeviceAlarmService.java

@@ -3,6 +3,7 @@ package com.xmgl.recognition.modules.enterprise.service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xmgl.recognition.modules.enterprise.entity.DeviceAlarm;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -18,7 +19,7 @@ import java.util.Map;
  */
 public interface IDeviceAlarmService extends IService<DeviceAlarm> {
 
-    Page<DeviceAlarm> pageList(Map<String, Object> map);
+    Page<DeviceAlarm> pageList(Page page, Wrapper<DeviceAlarm> wrapper);
 
     List<DeviceAlarm> getList(Wrapper<DeviceAlarm> wrapper);
 

src/main/java/com/xmgl/recognition/modules/enterprise/service/impl/DeviceAlarmServiceImpl.java

@@ -27,29 +27,7 @@ import java.util.Map;
 public class DeviceAlarmServiceImpl extends ServiceImpl<DeviceAlarmMapper, DeviceAlarm> implements IDeviceAlarmService {
 
     @Override
-    public Page<DeviceAlarm> pageList(Map<String, Object> map) {
+    public Page<DeviceAlarm> pageList(Page page, Wrapper<DeviceAlarm> wrapper) {
-        Page page = PageUtil.getPage(map);
-        String code = MapUtils.getString(map, "code");
-        String deptId = MapUtils.getString(map, "deptId");
-        String deptGroup = MapUtils.getString(map, "deptGroup");
-        String startTime = MapUtils.getString(map, "startTime");
-        String endTime = MapUtils.getString(map, "endTime");
-        QueryWrapper<DeviceAlarm> wrapper = Wrappers.<DeviceAlarm>query();
-        if (StringUtils.isNotBlank(code)) {
-            wrapper.eq("a.device_code", code);
-        }
-        if (StringUtils.isNotBlank(deptId)) {
-            wrapper.eq("a.dept_id", deptId);
-        }
-        if (StringUtils.isNotBlank(deptGroup)) {
-            wrapper.eq("a.dept_group", deptGroup);
-        }
-        if (StringUtils.isNotBlank(startTime)) {
-            wrapper.ge("a.report_time", startTime);
-        }
-        if (StringUtils.isNotBlank(endTime)) {
-            wrapper.le("a.report_time", endTime);
-        }
         return baseMapper.pageList(page, wrapper);
     }
 

src/main/resources/application-dev.properties

@@ -1,7 +1,7 @@
 # 数据库配置
-spring.datasource.url=jdbc:mysql://localhost:3306/airecognition?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
+spring.datasource.url=jdbc:mysql://139.9.66.234:3306/airecognition?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8
 spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.password=JXJ@admin
 # 数据库驱动类
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 # 数据库连接池配置