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

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

@@ -670,15 +670,21 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
         List<EquipAlarmLineVo> list = equipmentSpecificAlarmMapper.equipAlarmLine(hashMap);
         if (!CollectionUtils.isEmpty(list)) {
             LinkedHashSet<String> xAxis = new LinkedHashSet<>();
-            LinkedHashMap<String, Object> yAxis = new LinkedHashMap<>();
+            List<Map<String, Object>> yAxis = new ArrayList<>();
+//            LinkedHashMap<String, Object> yAxis = new LinkedHashMap<>();
 
             //  取出所有非空indexName
             Set<Object> 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));
+            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>>>(dateCollect.entrySet()).listIterator(dateCollect.size());
+            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<>();
                 LinkedList<Object> yData = new LinkedList<>();
 
                 Map.Entry<String, List<EquipAlarmLineVo>> entry = i.previous();
@@ -693,12 +699,13 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                         yData.add(0);
                     }
                 }
-                yAxis.put(key, yData);
-                xAxis.add(key);
+                dataMap.put("data", yData);
+                yAxis.add(dataMap);
+                xAxis.add(key.substring(5));
             }
             resultMap.put("legend", indexKNameSet);
-            resultMap.put("xAxis", xAxis);
-            resultMap.put("yAxis", yAxis);
+            resultMap.put("axisData", xAxis);
+            resultMap.put("seriesData", yAxis);
         }
         return resultMap;
     }

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -259,7 +259,7 @@
     </select>
     <select id="pageQuery" resultType="java.util.HashMap">
         SELECT
-            `wlesal`.`id` AS `id`,
+            `wlesal`.`equipment_specific_alarm_id` AS `id`,
             `wles`.`code` AS `code`,
             `wlesal`.`equipment_specific_name` AS `specificName`,
             `wlesal`.`equipment_specific_index_key` AS `indexKey`,
@@ -268,7 +268,7 @@
             IF
                 ( `wlesal`.`clean_time` IS NOT NULL, '已消除', '未消除' ) AS `cleanStatus`,
             `wlesal`.`iot_code` AS `iotCode`,
-            `wlesal`.`create_date` AS `createDate`
+            CONVERT ( `wlesal`.`create_date`, CHAR ) AS `createDate`
         FROM
             `wl_equipment_specific_alarm_log` `wlesal`
                 LEFT JOIN `wl_equipment_specific` `wles` ON `wlesal`.`equipment_specific_id` = `wles`.`id`
@@ -1238,6 +1238,6 @@
         s.date,
         s1.equipment_specific_index_key
         ORDER BY
-        s.date
+        s.date DESC
     </select>
 </mapper>
\ No newline at end of file