Merge remote-tracking branch 'origin/develop_bugfix@dl' into develop_bugfix@dl

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

@@ -2456,10 +2456,12 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                 List<String> values = new ArrayList<>();
                 for (Map<String, String> mapList : listObject) {
                     String time = change(mapList.get("time")).substring(0, 13);
-                    if (stringIntegerHashMap.containsKey(time)) {
-                        stringIntegerHashMap.put(time, stringIntegerHashMap.get(time) + 1);
-                    } else {
-                        stringIntegerHashMap.put(time, 1);
+                    if (mapList.containsKey(indexKey) && mapList.get(indexKey).equals("true")) {
+                        if (stringIntegerHashMap.containsKey(time)) {
+                            stringIntegerHashMap.put(time, stringIntegerHashMap.get(time) + 1);
+                        } else {
+                            stringIntegerHashMap.put(time, 1);
+                        }
                     }
                 }
             }
@@ -2569,15 +2571,19 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                     for (Map<String, String> mapList : listObject) {
                         String time = change(mapList.get("time"));
                         String dateX = roundToNextFiveMinutes(time);
-                        if (stringIntegerHashMap.containsKey(dateX)){
-                            for (String key : equipIndexKeyNew) {
-                                if (mapList.containsKey(key) && !ObjectUtils.isEmpty(mapList.get(key))) {
+
+                        for (String key : equipIndexKeyNew) {
+                            if (mapList.containsKey(key) && !ObjectUtils.isEmpty(mapList.get(key))) {
+                                if (stringIntegerHashMap.containsKey(dateX)) {
                                     stringIntegerHashMap.get(dateX).add(new BigDecimal(mapList.get(key)));
+                                } else {
+                                    List<BigDecimal> bigDecimals = new ArrayList<>();
+                                    bigDecimals.add(new BigDecimal(mapList.get(key)));
+                                    stringIntegerHashMap.put(dateX, bigDecimals);
                                 }
                             }
-                        } else {
-                            stringIntegerHashMap.put(dateX, new ArrayList<>());
                         }
+
                     }
                 }
             }