修改三维屏接口

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/HandlerMqttMessageImpl.java

@@ -192,8 +192,8 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
             content.put("id", "id");
             content.put("label", "eqPointName");
             content.put("changeDate", new Date());
-            content.put("orgCode", "orgCode");
-            content.put("status", deviceData.getSoe());
+            content.put("orgCode", equipmentSpecific.getOrgCode());
+            content.put("status", equipmentSpecificIndex.getValue());
             iDataRefreshService.sendRefreshDataWithArea(View3dRefreshAreaEum.monitor_data.getCode(), content);
             String title = String.format("/%s/%s/%s", serviceName, stationName,"data/refresh/monitorData");
             webMqttComponent.publish(title, JSON.toJSONString(view3dService.getEquipStatusList(equipmentSpecific.getOrgCode())));

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/EquipmentSpecificIndexVo.java

 package com.yeejoin.amos.fas.business.vo;
 
+import lombok.Data;
+
 /**
  * @author keyong
  * @title: EquipmentSpecificIndexVo
@@ -8,6 +10,7 @@ package com.yeejoin.amos.fas.business.vo;
  * </pre>
  * @date 2020/11/11 16:49
  */
+@Data
 public class EquipmentSpecificIndexVo {
 
     // id
@@ -21,6 +24,10 @@ public class EquipmentSpecificIndexVo {
 
     // 性能指标id
     private Long equipmentIndexId;
+    
+    private String equipmentIndexName;
+    
+    private String equipmentIndexUnitName;
 
     // 性能指标name key
     private String nameKey;

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_view3d.xml

@@ -518,7 +518,7 @@
 			and wlei.type_code!='FIREALARM'
 			and (wlesi.`value` = 'true'
 			OR wlesi.`value` = 'false')
-			ORDER BY wlesi.create_date DESC
+			ORDER BY wlesi.update_date DESC
 			limit 0,5
 	</select>