item:稳压泵启停状态图添加当前时间

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

@@ -346,6 +346,8 @@ public class EmergencyServiceImpl implements IEmergencyService {
             //  从 json 配置文件获取配置信息
             List<Map> infoList = pressurePumpService.getNameKeyInfoList(PressurePumpRelateEnum.PRESSURE_PUMP.getValue());
             if (!CollectionUtils.isEmpty(infoList)) {
+                Date dateNow = DateUtils.getDateNow();
+                String dateNowString = DateUtils.getDateNowString();
                 Map infoMap = infoList.get(0);
                 String equipmentCode = infoMap.get("equipmentCode").toString();
                 //  获取稳压泵
@@ -362,7 +364,6 @@ public class EmergencyServiceImpl implements IEmergencyService {
                         if (iotCode != null) {
                             //  判断开始时间，是否在redis缓存有效期之内，是，redis获取数据，否则，iot获取数据
                             int expire = Integer.parseInt(infoMap.get("expire").toString()) * -1;
-                            Date dateNow = DateUtils.getDateNow();
                             Date beforeDate = DateUtils.dateAddSeconds(dateNow, expire);
                             Date startDate = DateUtils.convertStrToDate(startTime, DateUtils.DATE_TIME_PATTERN);
                             Date endDate = DateUtils.convertStrToDate(endTime, DateUtils.DATE_TIME_PATTERN);
@@ -390,6 +391,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
                             }
                         }
                     }
+                    timeSet.add(dateNowString);
                     //  数据时间排序
                     List<String> sortTimeList = new ArrayList<>(timeSet);
                     Collections.sort(sortTimeList);
@@ -421,14 +423,15 @@ public class EmergencyServiceImpl implements IEmergencyService {
                                 Collections.reverse(dataList);
                                 Map<String, List<Map<String, String>>> dataMap = dataList.stream().filter(y -> y.containsKey(PressurePumpRelateEnum.CREATED_TIME.getValue())).collect(Collectors.groupingBy(e -> e.get("createdTime").substring(5, 16)));
                                 List<Map<String, String>> yDataList = null;
+                                String flag = null;
                                 for (String t : timeList) {
                                     List<Map<String, String>> data = dataMap.get(t);
                                     if (!CollectionUtils.isEmpty(data)) {
                                         yDataList = data.stream().filter(o -> PressurePumpRelateEnum.IOT_INDEX_VALUE_TRUE.getValue().equalsIgnoreCase(o.get(pressurePumpStart))).collect(Collectors.toList());
-                                        String flag = data.get(data.size() - 1).get(pressurePumpStart);
+                                        flag = data.get(data.size() - 1).get(pressurePumpStart);
                                         yList.add(!CollectionUtils.isEmpty(yDataList) ? Integer.parseInt(PressurePumpRelateEnum.START.getValue()) : PressurePumpRelateEnum.IOT_INDEX_VALUE_TRUE.getValue().equalsIgnoreCase(flag) ? Integer.parseInt(PressurePumpRelateEnum.START.getValue()) : Integer.parseInt(PressurePumpRelateEnum.STOP.getValue()));
                                     } else {
-                                        yList.add(Integer.parseInt(PressurePumpRelateEnum.STOP.getValue()));
+                                        yList.add(StringUtils.isNotBlank(flag) && PressurePumpRelateEnum.IOT_INDEX_VALUE_TRUE.getValue().equalsIgnoreCase(flag) ? Integer.parseInt(PressurePumpRelateEnum.START.getValue()) : Integer.parseInt(PressurePumpRelateEnum.STOP.getValue()));
                                     }
                                 }
                             } else {