解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java

@@ -946,6 +946,7 @@ public class CommonServiceImpl {
 
     @Scheduled(cron = "0 0/10 * * * ?")
     private void healthWarningMinuteByFJ() {
+        Date time = new Date();
         List<IdxBizFanPointProcessVariableClassificationDto> data = idxBizFanPointProcessVariableClassificationMapper.getInfluxDBData();
         Map<String, List<IdxBizFanPointProcessVariableClassificationDto>> maps = data.stream().collect(Collectors.groupingBy(IdxBizFanPointProcessVariableClassificationDto::getGatewayId));
         BoolQueryBuilder boolMustAll = QueryBuilders.boolQuery();
@@ -1041,6 +1042,8 @@ public class CommonServiceImpl {
                             BeanUtils.copyProperties(idxBizFanHealthIndex, obj);
                             idxBizFanHealthIndex.setHealthIndex(object.getDouble("indexValue"));
                             idxBizFanHealthIndex.setAnalysisObjSeq(obj.getSequenceNbr());
+                            idxBizFanHealthIndex.setRecDate(time);
+                            idxBizFanHealthIndex.setSequenceNbr(null);
                             idxBizFanHealthIndex.setRecDate(new Date());
                             //获取健康指数对应等级
                             LambdaQueryWrapper<IdxBizFanHealthLevel> query = new LambdaQueryWrapper<>();
@@ -1070,6 +1073,7 @@ public class CommonServiceImpl {
 
     @Scheduled(cron = "0 0/10 * * * ?")
     private void healthWarningMinuteByGF() {
+        Date time = new Date();
         List<IdxBizPvPointProcessVariableClassificationDto> data = idxBizPvPointProcessVariableClassificationMapper.getInfluxDBData();
         Map<String, List<IdxBizPvPointProcessVariableClassificationDto>> maps = data.stream().collect(Collectors.groupingBy(IdxBizPvPointProcessVariableClassificationDto::getGatewayId));
         BoolQueryBuilder boolMustAll = QueryBuilders.boolQuery();
@@ -1165,7 +1169,7 @@ public class CommonServiceImpl {
                             BeanUtils.copyProperties(idxBizFanHealthIndex, obj);
                             idxBizFanHealthIndex.setHealthIndex(object.getDouble("indexValue"));
                             idxBizFanHealthIndex.setAnalysisObjSeq(obj.getSequenceNbr());
-                            idxBizFanHealthIndex.setRecDate(new Date());
+                            idxBizFanHealthIndex.setRecDate(time);
                             //获取健康指数对应等级
                             LambdaQueryWrapper<IdxBizPvHealthLevel> query = new LambdaQueryWrapper<>();
                             query.eq(IdxBizPvHealthLevel::getAnalysisObjType, "设备");

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HealthStatusIndicatorServiceImpl.java

@@ -62,7 +62,7 @@ public class HealthStatusIndicatorServiceImpl {
     private void healthWarningMinuteGF() {
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.HOUR_OF_DAY,calendar.get(Calendar.HOUR_OF_DAY)-1);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
         LambdaQueryWrapper<IdxBizPvHealthIndex> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizPvHealthIndex::getAnalysisType,"按时刻");
@@ -129,7 +129,7 @@ public class HealthStatusIndicatorServiceImpl {
     private void healthWarningHourGF() {
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.HOUR_OF_DAY,calendar.get(Calendar.HOUR_OF_DAY)-5);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
         LambdaQueryWrapper<IdxBizPvHealthIndex> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizPvHealthIndex::getAnalysisType,"按小时");
@@ -197,7 +197,7 @@ public class HealthStatusIndicatorServiceImpl {
     private void healthWarningDayGF() {
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)-3);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
 
         LambdaQueryWrapper<IdxBizPvHealthIndex> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizPvHealthIndex::getAnalysisType,"按天");
@@ -259,7 +259,7 @@ public class HealthStatusIndicatorServiceImpl {
     private void healthWarningMinute() {
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.HOUR_OF_DAY,calendar.get(Calendar.HOUR_OF_DAY)-1);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
         LambdaQueryWrapper<IdxBizFanHealthIndex> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizFanHealthIndex::getAnalysisType,"按时刻");
@@ -326,7 +326,7 @@ public class HealthStatusIndicatorServiceImpl {
     private void healthWarningHour() {
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.HOUR_OF_DAY,calendar.get(Calendar.HOUR_OF_DAY)-5);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
         LambdaQueryWrapper<IdxBizFanHealthIndex> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizFanHealthIndex::getAnalysisType,"按小时");
@@ -394,7 +394,7 @@ public class HealthStatusIndicatorServiceImpl {
     private void healthWarningDay() {
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)-3);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
 
         LambdaQueryWrapper<IdxBizFanHealthIndex> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizFanHealthIndex::getAnalysisType,"按天");