1.对健康指数时间与预警时间进行处理保证获取的时间为整点整分

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

@@ -1457,8 +1457,10 @@ public class CommonServiceImpl {
         if (!openHealth) {
             return;
         }
-        String format = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:00");
-        Date time = DateUtil.parse(format, "yyyy-MM-dd HH:mm:00");
+        Date time = new Date();
+        time = DateUtil.offsetMinute(time,-DateUtil.minute(time)%10);
+        String format = DateUtil.format(time, "yyyy-MM-dd HH:mm:00");
+        time = DateUtil.parse(format, "yyyy-MM-dd HH:mm:00");
         logger.info("风机---------------------健康指数时间----" + time);
         Calendar calendar = Calendar.getInstance();
         List<IdxBizFanPointProcessVariableClassificationDto> data = idxBizFanPointProcessVariableClassificationMapper.getInfluxDBData();
@@ -1758,8 +1760,10 @@ public class CommonServiceImpl {
             return;
         }
         Calendar calendar = Calendar.getInstance();
-        String format = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:00");
-        Date time = DateUtil.parse(format, "yyyy-MM-dd HH:mm:00");
+        Date time = new Date();
+        time = DateUtil.offsetMinute(time,-DateUtil.minute(time)%10);
+        String format = DateUtil.format(time, "yyyy-MM-dd HH:mm:00");
+        time = DateUtil.parse(format, "yyyy-MM-dd HH:mm:00");
         logger.info("光伏---------------------健康指数时间----" + time);
         List<IdxBizPvPointProcessVariableClassificationDto> data = idxBizPvPointProcessVariableClassificationMapper.getInfluxDBData();
         Map<String, List<IdxBizPvPointProcessVariableClassificationDto>> maps = data.stream().collect(Collectors.groupingBy(IdxBizPvPointProcessVariableClassificationDto::getGatewayId));