修改消息发送数据处理接口

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -60,5 +61,21 @@ public class CarProperty extends BaseEntity {
 	private String groupName;
 	@TableField(exist = false)
 	private String nameKey;
+	
+	@ApiModelProperty(value = "十六进制颜色")
+    @TableField("color")
+    private String color;
+
+    @ApiModelProperty(value = "是否告警:0-否；1-是")
+    @TableField("is_alarm")
+    private Boolean isAlarm;
+
+    @ApiModelProperty(value = "紧急程度枚举（1：紧急，2：严重，3：轻微，4：正常，5：无效，6：备用，7：其他）")
+    @TableField("emergency_level")
+    private String emergencyLevel;
+    
+    @ApiModelProperty(value = "紧急程度描述")
+    @TableField("emergency_level_describe")
+    private String emergencyLevelDescribe;
 
 }

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

@@ -50,6 +50,23 @@ public class EquipmentSpecificIndex extends BaseEntity {
     @ApiModelProperty(value = "指标key（冗余字段）")
     @TableField("equipment_index_key")
     private String equipmentIndexKey;
+    
+    @ApiModelProperty(value = "十六进制颜色")
+    @TableField("color")
+    private String color;
+
+    @ApiModelProperty(value = "是否告警:0-否；1-是")
+    @TableField("is_alarm")
+    private Boolean isAlarm;
+
+    @ApiModelProperty(value = "紧急程度枚举（1：紧急，2：严重，3：轻微，4：正常，5：无效，6：备用，7：其他）")
+    @TableField("emergency_level")
+    private String emergencyLevel;
+    
+    @ApiModelProperty(value = "紧急程度描述")
+    @TableField("emergency_level_describe")
+    private String emergencyLevelDescribe;
+
 
     @TableField(exist = false)
     private String nameKey;

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

@@ -57,7 +57,11 @@
 			ed.equipment_id AS equipmentId,
 			ed.id AS equipmentDetailId,
 			wes.code as equipmentSpecificCode,
-			wes.system_id as systemId
+			wes.system_id as systemId,
+			wesi.is_alarm as isAlarm,
+			wesi.color,
+			wesi.emergency_level as emergencyLevel,
+			wesi.emergency_level_describe as emergencyLevelDescribe
         FROM
         wl_equipment_specific_index AS wesi
         LEFT JOIN wl_equipment_specific AS wes ON wes.id = wesi.equipment_specific_id