item:稳压泵bug修改

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DateUtils.java

@@ -917,7 +917,7 @@ public class DateUtils {
                 } else {
                     date = dateAddMinutes(date, 1);
                 }
-                if (dateCompare(endDate, date) == 1) {
+                if (dateCompare(endDate, date) >= 0) {
                     list.add(convertDateToString(date, pattern));
                 } else {
                     break;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java

@@ -282,7 +282,9 @@ public class EmergencyServiceImpl implements IEmergencyService {
                     }
                 }
                 DecimalFormat df = new DecimalFormat("0.0");
-                PressurePumpAnalysisEnum.PRESSURE_PUMP_DAY_AVG.setValue(df.format(Double.valueOf(dayAvgFrequency.get()) / Double.valueOf(Math.abs(Integer.parseInt(PressurePumpRelateEnum.DAY_AVG.getValue())))));
+                int dayAvgCount = dayAvgFrequency.get();
+                String dayAvgStartNum = dayAvgCount == 0 ? "0" : df.format(dayAvgCount / (double) Math.abs(Integer.parseInt(PressurePumpRelateEnum.DAY_AVG.getValue())));
+                PressurePumpAnalysisEnum.PRESSURE_PUMP_DAY_AVG.setValue(dayAvgStartNum);
                 //  6. 管网压力状态
                 double pressureDiff = pressurePumpService.getAllPressurePumpPipePressureDiff(dataList, dataPipeList, PressurePumpRelateEnum.PRESSURE_PUMP_START_BEFORE_MINUTE.getValue());
                 PressurePumpAnalysisEnum.PRESSURE_PUMP_PIPE.setValue(pressureDiff > Double.parseDouble(PressurePumpRelateEnum.PIPE_PRESSURE_DIFF.getValue()) ? PressurePumpRelateEnum.PIPE_PRESSURE_ABNORMAL_STATUS.getValue() : PressurePumpRelateEnum.PIPE_PRESSURE_NORMAL_STATUS.getValue());

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/SupervisionVideoServiceImpl.java

@@ -129,7 +129,8 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
                 log.error("近3天平均启动次数获取失败-->dayAvgFrequency：{}", e.getMessage());
             }
             DecimalFormat df = new DecimalFormat("0.0");
-            String dayAvgStartNum = df.format(Double.valueOf(dayAvgFrequency.get()) / Double.valueOf(Math.abs(Integer.parseInt(PressurePumpRelateEnum.DAY_AVG.getValue()))));
+            int dayAvgCount = dayAvgFrequency.get();
+            String dayAvgStartNum = dayAvgCount == 0 ? "0" : df.format(dayAvgCount / (double) Math.abs(Integer.parseInt(PressurePumpRelateEnum.DAY_AVG.getValue())));
             pressurePumpInfo = fireFightingSystemMapper.getPressurePumpInfo(page, bizOrgCode, null);
             String prefix = null;
             for (Map<String, Object> item : pressurePumpInfo.getRecords()) {
@@ -214,7 +215,7 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
             pressurePumpInfo.getRecords().stream(
             ).map(item -> {
                 item.put("startAndStopInterval", finalDiffMinute);
-                if (finalDiffMinute < Long.valueOf(PressurePumpRelateEnum.START_FIVE.getValue())) {
+                if (finalDiffMinute <= Long.valueOf(PressurePumpRelateEnum.START_FIVE.getValue())) {
                     item.put("generalState", PressurePumpRelateEnum.PIPE_PRESSURE_ABNORMAL_STATUS.getValue());
                 } else {
                     item.put("generalState", PressurePumpRelateEnum.PIPE_PRESSURE_NORMAL_STATUS.getValue());