Merge branch 'dev' into fpg-dev

# Conflicts:
#	jeecg-module-gather/src/main/java/org/jeecg/modules/fpgJob/LeanModelStatistics.java

jeecg-module-gather/src/main/java/org/jeecg/modules/fpgJob/LeanEventTriggerWarnTask.java

@@ -0,0 +1,64 @@
+package org.jeecg.modules.fpgJob;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.device.service.IDeviceInformationService;
+import org.jeecg.modules.devicePoint.service.IDevicePointService;
+import org.jeecg.modules.events.service.ILeanEventsHostService;
+import org.jeecg.modules.gatherData.entity.FpgGatherData;
+import org.jeecg.modules.gatherData.service.IFpgGatherDataService;
+import org.jeecg.modules.leanEventWarn.service.ILeanEventWarnInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@EnableAsync
+@Component
+//@EnableScheduling
+public class LeanEventTriggerWarnTask {
+
+    @Autowired
+    IDeviceInformationService deviceInformationService;
+
+    @Autowired
+    IDevicePointService devicePointService;
+
+    @Autowired
+    IFpgGatherDataService fpgGatherDataService;
+
+    @Autowired
+    MongoTemplate mongoTemplate;
+
+    @Autowired
+    RedisTemplate redisTemplate;
+
+    @Autowired
+    ILeanEventsHostService leanEventsHostService;
+
+//    @Autowired
+//    ILeanEventWarnInfoService leanEventWarnInfoService;
+
+    @Scheduled(cron = "0/10 * * * * *")
+    public void leanEventTriggerWarnHandle(){
+        LambdaQueryWrapper<FpgGatherData> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.isNotNull(FpgGatherData::getDeviceInformationId).orderByDesc(FpgGatherData::getCreateTime);
+        List<FpgGatherData> fpgGatherDataList = fpgGatherDataService.list(queryWrapper);
+        List<String> fpgGatherDataIds = new ArrayList<>();
+        if (oConvertUtils.listIsNotEmpty(fpgGatherDataList)){
+            fpgGatherDataIds = fpgGatherDataList.stream().map(FpgGatherData::getId).collect(Collectors.toList());
+
+//            fpgGatherDataService.removeBatchByIds(, )
+        }
+    }
+
+
+}

jeecg-module-gather/src/main/java/org/jeecg/modules/leanEventWarn/service/impl/LeanEventWarnInfoServiceImpl.java

@@ -35,10 +35,6 @@ import java.util.stream.Collectors;
 @Service
 public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoMapper, LeanEventWarnInfo> implements ILeanEventWarnInfoService {
 
-
-    @Autowired
-    ILeanEventWarnInfoService leanEventWarnInfoService;
-
     @Autowired
     IFpgGatherDataService fpgGatherDataService;
 
@@ -67,7 +63,7 @@ public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoM
             leanEventWarnInfo.setDeviceWarnInfo("HOST_OPEN状态下，查询采集数据为空，主设备未开启，触发精益事件告警！");
             leanEventWarnInfo.setWarnType("1");
             leanEventWarnInfo.setDeviceWarnLevel("0");
-            leanEventWarnInfoService.insertWarnInfo(leanEventWarnInfo);
+            baseMapper.insert(leanEventWarnInfo);
             return;
         }
         // 根据采集点的运行电流，判断是否需要上报告警信息 （辅设备电流小于等于5,上报告警信息）
@@ -78,7 +74,7 @@ public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoM
                 leanEventWarnInfo.setDeviceWarnInfo("HOST_OPEN状态下，辅设备电流大于5A，触发精益事件告警！");
                 leanEventWarnInfo.setWarnType("1");
                 leanEventWarnInfo.setDeviceWarnLevel("0");
-                leanEventWarnInfoService.insertWarnInfo(leanEventWarnInfo);
+                baseMapper.insert(leanEventWarnInfo);
             }
         });
     }
@@ -100,7 +96,7 @@ public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoM
             leanEventWarnInfo.setDeviceWarnInfo("HOST_CLOSE状态下，查询采集数据为空，主设备未开启，触发精益事件告警！");
             leanEventWarnInfo.setWarnType("1");
             leanEventWarnInfo.setDeviceWarnLevel("0");
-            leanEventWarnInfoService.insertWarnInfo(leanEventWarnInfo);
+            baseMapper.insert(leanEventWarnInfo);
             return;
         }
         // 根据采集点的电流，判断是否需要上报告警信息 （辅设备电流大于5,上报告警信息）
@@ -111,7 +107,7 @@ public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoM
                 leanEventWarnInfo.setDeviceWarnInfo("HOST_CLOSE状态下，辅设备电流大于5A，触发精益事件告警！");
                 leanEventWarnInfo.setWarnType("1");
                 leanEventWarnInfo.setDeviceWarnLevel("0");
-                leanEventWarnInfoService.insertWarnInfo(leanEventWarnInfo);
+                baseMapper.insert(leanEventWarnInfo);
             }
         });
     }
@@ -134,7 +130,7 @@ public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoM
             leanEventWarnInfo.setDeviceWarnInfo("FPG_OPEN状态下，查询采集数据为空，触发精益事件告警！");
             leanEventWarnInfo.setWarnType("1");
             leanEventWarnInfo.setDeviceWarnLevel("0");
-            leanEventWarnInfoService.insertWarnInfo(leanEventWarnInfo);
+            baseMapper.insert(leanEventWarnInfo);
             return;
         }
         // 获取尖、峰、平、谷配置信息并拼接开始时间、结束时间
@@ -158,7 +154,7 @@ public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoM
                 leanEventWarnInfo.setDeviceWarnInfo("FPG_OPEN状态下，尖时段采集到的数据电流小于5A，触发精益事件告警！");
                 leanEventWarnInfo.setWarnType("1");
                 leanEventWarnInfo.setDeviceWarnLevel("0");
-                leanEventWarnInfoService.insertWarnInfo(leanEventWarnInfo);
+                baseMapper.insert(leanEventWarnInfo);
             }
             boolean peaksIsExit = peaksNewPeaksAndValleysTimeConfigList.stream().anyMatch(a -> containsCreateTime(localDateTime, a.getStartTime(), a.getEndTime()));
             if (peaksIsExit && x.getCurrent().compareTo(limitVoltage) < 0){
@@ -166,7 +162,7 @@ public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoM
                 leanEventWarnInfo.setDeviceWarnInfo("FPG_OPEN状态下，峰采集到的数据电流小于5A，触发精益事件告警！");
                 leanEventWarnInfo.setWarnType("1");
                 leanEventWarnInfo.setDeviceWarnLevel("0");
-                leanEventWarnInfoService.insertWarnInfo(leanEventWarnInfo);
+                baseMapper.insert(leanEventWarnInfo);
             }
             boolean flatIsExit = flatNewPeaksAndValleysTimeConfigList.stream().anyMatch(a -> containsCreateTime(localDateTime, a.getStartTime(), a.getEndTime()));
             if (flatIsExit && x.getCurrent().compareTo(limitVoltage) < 0){
@@ -174,7 +170,7 @@ public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoM
                 leanEventWarnInfo.setDeviceWarnInfo("FPG_OPEN状态下，平时段采集到的数据电流小于5A，触发精益事件告警！");
                 leanEventWarnInfo.setWarnType("1");
                 leanEventWarnInfo.setDeviceWarnLevel("0");
-                leanEventWarnInfoService.insertWarnInfo(leanEventWarnInfo);
+                baseMapper.insert(leanEventWarnInfo);
             }
             boolean valleysIsExit = valleysNewPeaksAndValleysTimeConfigList.stream().anyMatch(a -> containsCreateTime(localDateTime, a.getStartTime(), a.getEndTime()));
             if (valleysIsExit && x.getCurrent().compareTo(limitVoltage) < 0){
@@ -182,7 +178,7 @@ public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoM
                 leanEventWarnInfo.setDeviceWarnInfo("FPG_OPEN状态下，谷时段采集到的数据电流小于5A，触发精益事件告警！");
                 leanEventWarnInfo.setWarnType("1");
                 leanEventWarnInfo.setDeviceWarnLevel("0");
-                leanEventWarnInfoService.insertWarnInfo(leanEventWarnInfo);
+                baseMapper.insert(leanEventWarnInfo);
             }
         });
     }
@@ -205,7 +201,7 @@ public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoM
             leanEventWarnInfo.setDeviceWarnInfo("FPG_CLOSE状态下，查询采集数据为空，触发精益事件告警！");
             leanEventWarnInfo.setWarnType("1");
             leanEventWarnInfo.setDeviceWarnLevel("0");
-            leanEventWarnInfoService.insertWarnInfo(leanEventWarnInfo);
+            baseMapper.insert(leanEventWarnInfo);
             return;
         }
         // 获取尖、峰、平、谷配置信息并拼接开始时间、结束时间
@@ -229,7 +225,7 @@ public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoM
                 leanEventWarnInfo.setDeviceWarnInfo("FPG_CLOSE状态下，采集到的数据电流大于5A，触发精益事件告警！");
                 leanEventWarnInfo.setWarnType("1");
                 leanEventWarnInfo.setDeviceWarnLevel("0");
-                leanEventWarnInfoService.insertWarnInfo(leanEventWarnInfo);
+                baseMapper.insert(leanEventWarnInfo);
             }
             boolean peaksIsExit = peaksNewPeaksAndValleysTimeConfigList.stream().anyMatch(a -> containsCreateTime(localDateTime, a.getStartTime(), a.getEndTime()));
             if (peaksIsExit && x.getCurrent().compareTo(limitVoltage) > 0){
@@ -238,7 +234,7 @@ public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoM
                 leanEventWarnInfo.setDeviceWarnInfo("FPG_CLOSE状态下，采集到的数据电流大于5A，触发精益事件告警！");
                 leanEventWarnInfo.setWarnType("1");
                 leanEventWarnInfo.setDeviceWarnLevel("0");
-                leanEventWarnInfoService.insertWarnInfo(leanEventWarnInfo);
+                baseMapper.insert(leanEventWarnInfo);
             }
             boolean flatIsExit = flatNewPeaksAndValleysTimeConfigList.stream().anyMatch(a -> containsCreateTime(localDateTime, a.getStartTime(), a.getEndTime()));
             if (flatIsExit && x.getCurrent().compareTo(limitVoltage) > 0){
@@ -247,7 +243,7 @@ public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoM
                 leanEventWarnInfo.setDeviceWarnInfo("FPG_CLOSE状态下，采集到的数据电流大于5A，触发精益事件告警！");
                 leanEventWarnInfo.setWarnType("1");
                 leanEventWarnInfo.setDeviceWarnLevel("0");
-                leanEventWarnInfoService.insertWarnInfo(leanEventWarnInfo);
+                baseMapper.insert(leanEventWarnInfo);
             }
             boolean valleysIsExit = valleysNewPeaksAndValleysTimeConfigList.stream().anyMatch(a -> containsCreateTime(localDateTime, a.getStartTime(), a.getEndTime()));
             if (valleysIsExit && x.getCurrent().compareTo(limitVoltage) > 0){
@@ -256,7 +252,7 @@ public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoM
                 leanEventWarnInfo.setDeviceWarnInfo("FPG_CLOSE状态下，采集到的数据电流大于5A，触发精益事件告警！");
                 leanEventWarnInfo.setWarnType("1");
                 leanEventWarnInfo.setDeviceWarnLevel("0");
-                leanEventWarnInfoService.insertWarnInfo(leanEventWarnInfo);
+                baseMapper.insert(leanEventWarnInfo);
             }
         });
     }