`fix`

ruoyi-admin/src/main/java/org/dromara/web/task/KafkaMessageConsumer.java

@@ -46,7 +46,7 @@ public class KafkaMessageConsumer {
 
     @Scheduled(cron = "*/1 * * * * *")
     public void doChange() {
-        System.out.println("事件判断");
+//        System.out.println("事件判断");
         try{
             eventMap.forEach((key, value) -> {
                 if(DateUtil.current()-value>Integer.parseInt(finalEventChangeTime)){

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/TblEventController.java

@@ -138,10 +138,10 @@ public class TblEventController extends BaseController {
         }
         OssClient storage = OssFactory.instance();
         Map<String, Object> data = new HashMap<>();
-        data.put("地点",tblEventVo.getAddr());
-        data.put("事故时间",tblEventVo.getCreateTime());
+        data.put("事件地点",tblEventVo.getAddr());
+        data.put("事件时间",tblEventVo.getCreateTime());
         try{
-            data.put("事故类型", JSONUtil.parseObj(tblEventVo.getExt2()).getStr("lx"));
+            data.put("事件类型", JSONUtil.parseObj(tblEventVo.getExt2()).getStr("lx"));
         }catch (Exception e) {}
         try{
             data.put("事件来源", JSONUtil.parseObj(tblEventVo.getExt2()).getStr("from"));

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/TblDeviceServiceImpl.java

@@ -81,6 +81,9 @@ public class TblDeviceServiceImpl implements ITblDeviceService {
         lqw.eq(StringUtils.isNotBlank(bo.getLat()), TblDevice::getLat, bo.getLat());
         lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblDevice::getExt1, bo.getExt1());
         lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblDevice::getExt2, bo.getExt2());
+        if(params.get("hasevent")!=null && params.get("hasevent").equals("1")){
+            lqw.apply("(select count(tbl_event.id) from tbl_event where tbl_device.id=tbl_event.ext2->'$.deviceVo.id' and tbl_event.status='2')>0");
+        }
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/TblEventServiceImpl.java

@@ -89,9 +89,9 @@ public class TblEventServiceImpl implements ITblEventService {
         if(params.get("key")!=null){
             lqw.apply(StringUtils.format(" ext2->'$.lx' like '%{}%' or addr like '%{}%'", params.get("key").toString(), params.get("key").toString()));
         }
+
         lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
             TblEvent::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
-
 //        lqw.orderBy(true,false,TblEvent::getCreateTime);
         return lqw;
     }