fpg精益事件测试

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

@@ -58,11 +58,11 @@ public class LeanEventTriggerWarnTask {
                 leanEventsHostTriggerWarnHandle(x);
             });
             // 逻辑删除已校验完精益事件告警的采集数据，事件告警使用状态0:使用中1:使用结束
-//            List<FpgGatherData> updateFpgGatherDataList = fpgGatherDataList.stream().map(s -> s.setEventWarnUpdatetime(new Date())).collect(Collectors.toList());
-//            if (oConvertUtils.listIsNotEmpty(updateFpgGatherDataList)){
-//                log.info("{}{}", "FPG采集表数据使用结束总数：", fpgGatherDataList.size());
-//                fpgGatherDataService.updateBatchById(updateFpgGatherDataList);
-//            }
+            List<FpgGatherData> updateFpgGatherDataList = fpgGatherDataList.stream().map(s -> s.setEventWarnUpdatetime(new Date())).collect(Collectors.toList());
+            if (oConvertUtils.listIsNotEmpty(updateFpgGatherDataList)){
+                log.info("{}{}", "FPG采集表数据使用结束总数：", fpgGatherDataList.size());
+                fpgGatherDataService.updateBatchById(updateFpgGatherDataList);
+            }
         }
     }
 

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

@@ -200,7 +200,7 @@ public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoM
     private void saveOrUpdateLeanEventWarnInfo(FpgGatherData fpgGatherData, LeanEventWarnInfo leanEventWarnInfo) {
         LambdaQueryWrapper<LeanEventWarnInfo> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(LeanEventWarnInfo::getDeviceRegionId, fpgGatherData.getDeviceRegionId()).eq(LeanEventWarnInfo::getDevicePointId, fpgGatherData.getDevicePointId()).
-                eq(LeanEventWarnInfo::getDeviceInformationId, fpgGatherData.getDeviceInformationId());
+                eq(LeanEventWarnInfo::getDeviceInformationId, fpgGatherData.getDeviceInformationId()).eq(LeanEventWarnInfo::getWarnType, leanEventWarnInfo.getWarnType());
         LeanEventWarnInfo leanEventWarnInfoObj = baseMapper.selectOne(wrapper);
         if (leanEventWarnInfoObj == null){
             baseMapper.insert(leanEventWarnInfo);
@@ -317,6 +317,7 @@ public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoM
             log.info("{}{}", "fpg_ing_time峰平谷数据采集FpgStatiscsModelMongodb查询为空!", "设备ID:" +fpgGatherData.getDeviceInformationId() + "采集点ID:" + fpgGatherData.getDevicePointId()+ "区域ID:" + fpgGatherData.getDevicePointId());
             return;
         }
+
         // 判断MongoDB中的累加运行时长是否大于 LeanEventsHostConfig中的尖峰平谷运行限制时长
         int runTimeLimit = Integer.parseInt(leanEventsHostConfig.getRunTime());
         if("tops".equals(leanEventsHost.getDeviceInformationId())){