item：消防系统4小联调修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java

@@ -89,7 +89,7 @@ public class ConfigureController extends AbstractBaseController {
     @RequestMapping(value = "/equipAlarmLine", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "系统近一周告警趋势图", produces = "application/json;charset=UTF-8", notes = "系统近一周告警趋势图")
-    public ResponseModel equipStatusCount(@RequestParam(required = false) String systemCode, @RequestParam(required = false) String indexKeys) {
+    public ResponseModel equipAlarmLine(@RequestParam(required = false) String systemCode, @RequestParam(required = false) String indexKeys) {
         HashMap<String, Object> hashMap = new HashMap<>();
         ReginParams reginParams = getSelectedOrgInfo();
         ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
@@ -108,7 +108,6 @@ public class ConfigureController extends AbstractBaseController {
         return CommonResponseUtil.success(equipmentSpecificAlarmService.equipAlarmLine(hashMap));
     }
 
-
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取系统告警信息")
     @GetMapping("/getSystemAlarmInfo")

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

@@ -670,38 +670,42 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
         List<EquipAlarmLineVo> list = equipmentSpecificAlarmMapper.equipAlarmLine(hashMap);
         if (!CollectionUtils.isEmpty(list)) {
             LinkedHashSet<String> xAxis = new LinkedHashSet<>();
-            List<Map<String, Object>> yAxis = new ArrayList<>();
-//            LinkedHashMap<String, Object> yAxis = new LinkedHashMap<>();
+            List<Map<String, LinkedList<Object>>> yAxis = new ArrayList<>();
 
             //  取出所有非空indexName
-            Set<Object> indexKNameSet = list.stream().map(EquipAlarmLineVo::getIndexName).filter(StringUtils::isNotBlank).collect(Collectors.toSet());
+            Set<String> indexKNameSet = list.stream().map(EquipAlarmLineVo::getIndexName).filter(StringUtils::isNotBlank).collect(Collectors.toSet());
             Map<String, List<EquipAlarmLineVo>> dateCollect = list.stream().collect(Collectors.groupingBy(EquipAlarmLineVo::getDate));
-            Map<String,List<EquipAlarmLineVo>> sortMap = new TreeMap<>((o1,o2)->o2.compareTo(o1));
+            Map<String, List<EquipAlarmLineVo>> sortMap = new TreeMap<>((o1, o2) -> o2.compareTo(o1));
             sortMap.putAll(dateCollect);
 
-//            Map<String, List<EquipAlarmLineVo>> dateCollect = list.stream().sorted(Comparator.comparing(EquipAlarmLineVo::getDate).reversed()).collect(Collectors.groupingBy(EquipAlarmLineVo::getDate));
-
             //  迭代器倒序遍历map
-            ListIterator<Map.Entry<String, List<EquipAlarmLineVo>>> i = new ArrayList<Map.Entry<String, List<EquipAlarmLineVo>>>(sortMap.entrySet()).listIterator(sortMap.size());
-            while (i.hasPrevious()) {
-                HashMap<String, Object> dataMap = new HashMap<>();
+            String date = null;
+            for (String indexName : indexKNameSet) {
+                HashMap<String, LinkedList<Object>> dataMap = new HashMap<>();
                 LinkedList<Object> yData = new LinkedList<>();
-
-                Map.Entry<String, List<EquipAlarmLineVo>> entry = i.previous();
-                String key = entry.getKey();
-                List<EquipAlarmLineVo> value = entry.getValue();
-
-                for (EquipAlarmLineVo vo : value) {
-                    String indexName = vo.getIndexName();
-                    if (indexKNameSet.contains(indexName)) {
-                        yData.add(vo.getTotal());
-                    } else {
-                        yData.add(0);
+                //  解决迭代器遍历一次的问题
+                ListIterator<Map.Entry<String, List<EquipAlarmLineVo>>> i = new ArrayList<Map.Entry<String, List<EquipAlarmLineVo>>>(sortMap.entrySet()).listIterator(sortMap.size());
+                while (i.hasPrevious()) {
+                    Map.Entry<String, List<EquipAlarmLineVo>> entry = i.previous();
+                    String key = entry.getKey();
+                    List<EquipAlarmLineVo> value = entry.getValue();
+
+                    for (EquipAlarmLineVo vo : value) {
+                        String name = vo.getIndexName();
+                        if (key.equals(date)) {
+                            yData = yAxis.get(i.previousIndex()).get("data");
+                        }
+                        if (indexName.equals(name)) {
+                            yData.add(vo.getTotal());
+                        } else {
+                            yData.add(0);
+                        }
                     }
+                    xAxis.add(key.substring(5));
+                    date = key;
                 }
                 dataMap.put("data", yData);
                 yAxis.add(dataMap);
-                xAxis.add(key.substring(5));
             }
             resultMap.put("legend", indexKNameSet);
             resultMap.put("axisData", xAxis);