Merge branch 'develop_dl_plan6' into develop_dl_plan6_temp

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

@@ -41,8 +41,6 @@ import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAccessor;
 import java.util.*;
@@ -192,8 +190,8 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
         Page<Map<String, Object>> resultPage = this.baseMapper.page(result, param);
         if (resultPage.getTotal() > 0) {
             for (Map<String, Object> x : resultPage.getRecords()) {
-                LocalDateTime createDate = (LocalDateTime) x.get("createDate");
-                x.put("createDate", Date.from(createDate.atZone(ZoneId.systemDefault()).toInstant()));
+//                LocalDateTime createDate = (LocalDateTime) x.get("createDate");
+//                x.put("createDate", Date.from(createDate.atZone(ZoneId.systemDefault()).toInstant()));
                 if (ObjectUtils.isEmpty(x.get("handleType"))) {
                     x.put("handleType", null);
                 } else {
@@ -760,8 +758,8 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
         Page<Map<String, Object>> resultPage = this.baseMapper.page(result, param);
         if (resultPage.getTotal() > 0) {
             for (Map<String, Object> x : resultPage.getRecords()) {
-                LocalDateTime createDate = (LocalDateTime) x.get("createDate");
-                x.put("createDate", Date.from(createDate.atZone(ZoneId.systemDefault()).toInstant()));
+//                LocalDateTime createDate = (LocalDateTime) x.get("createDate");
+//                x.put("createDate", Date.from(createDate.atZone(ZoneId.systemDefault()).toInstant()));
                 if (ObjectUtils.isEmpty(x.get("handleType"))) {
                     x.put("handleType", null);
                 } else {
@@ -777,7 +775,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
         for (Map<String, Object> stringObjectMap : list) {
             records.add(stringObjectMap);
         }
-        resultPage.setRecords(records);
+        records.sort((t1, t2) -> t2.get("createDate").toString().compareTo(t1.get("createDate").toString()));
         return resultPage;
     }
 

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

@@ -1514,7 +1514,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         model.setCategory(1);
         List<String> receive = new ArrayList<>();
         receive.add("system");
-        model.setRelationId(String.valueOf(data.getEquipmentSpecificId()));
+        model.setRelationId(String.valueOf(data.getEquipmentId()));
         model.setRecivers(receive);
         Token token = remoteSecurityService.getServerToken();
         systemctlFeign.create(token.getAppKey(), token.getProduct(), token.getToke(), model);

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

@@ -195,7 +195,10 @@
 	        AS fireEquipmentPointValue,
 	        wlesal.type AS typeCode,
 	        (select type_name from wl_signal_classify sc where sc.type_code = wlesal.type limit 1) as type,
-	        wlesal.create_date AS createDate,
+            date_format(
+            wlesal.create_date,
+            '%Y-%m-%d %H:%i:%s'
+            ) createDate,
 	        CONCAT_WS(' ', wles.position,wled.area) AS warehouseStructureName, /*告警列表拼接详细地址*/
 	        (select
 	        group_concat(fet.`name`)

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

@@ -4,13 +4,16 @@
 
 <select id="selectAll" resultType="java.util.Map">
     select
-        id message_id,
-        type fireEquipmentSpecificIndexName,
+        id messageId,
+        type equipmentSpecificIndexName,
         position,
         name equipmentSpecificName,
-        create_date createDate,
-        message_type,
-        is_read,
+        date_format(
+        create_date,
+        '%Y-%m-%d %H:%i:%s'
+        ) createDate,
+        message_type messageType,
+        is_read isRead,
         equipment_specific_id id
     from
         wl_marquee_data