消息处理代码整理

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/CarProperty.java

@@ -52,16 +52,8 @@ public class CarProperty extends BaseEntity {
      */
     @TableField(value = "equipment_index_key")
 	private String equipmentIndexKey;
+    
 
-	@TableField(exist = false)
-	private String unitName;
-	@TableField(exist = false)
-	private String perfQuotaName;
-	@TableField(exist = false)
-	private String groupName;
-	@TableField(exist = false)
-	private String nameKey;
-	
 
 	/**
 	 * 颜色
@@ -87,4 +79,18 @@ public class CarProperty extends BaseEntity {
 	@TableField(value = "emergency_level_describe")
 	private String emergencyLevelDescribe;
 
+	@TableField(exist = false)
+	private String unitName;
+	@TableField(exist = false)
+	private String perfQuotaName;
+	@TableField(exist = false)
+	private String groupName;
+	
+	@TableField(exist = false)
+	private String nameKey;
+	
+	@TableField(exist = false)
+	private String iotCode;
+	
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/CarForGisEnum.java

@@ -16,7 +16,7 @@ public enum CarForGisEnum {
     DL("电量","FireCar_Power"),
     DDHX("对地航向","FireCar_CourseOverGround"),
     SJ("时间","time"),
-    QT("启停","state");
+    QT("启停","FireCar_Start");
 
     private String describe;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/EquipmentIndexLabelsEnum.java

@@ -10,7 +10,7 @@ package com.yeejoin.equipmanage.common.enums;
  */
 public enum EquipmentIndexLabelsEnum {
 
-    labels("labels", "装备指标编码");
+    labels("FireCar_Labels", "装备指标编码");
 
     public final String name;
 

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

@@ -12,7 +12,12 @@
         wcp.is_alarm as isAlarm,
 		wcp.emergency_level_color as emergencyLevelColor,
 		wcp.emergency_level as emergencyLevel,
-		wcp.emergency_level_describe as emergencyLevelDescribe
+		wcp.emergency_level_describe as emergencyLevelDescribe,
+		wc.iot_code as iotCode,
+		wc.`name` as carName,
+		wc.car_num as carNum,
+		wei.unit unitName,
+		wei.group_name as groupName
         FROM
         wl_car_property wcp
         LEFT JOIN wl_car AS wc ON wc.id = wcp.car_id