Merge branch 'dev_bitmap' of 172.16.10.76:moa/amos-boot-biz into dev_bitmap

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,6 +61,7 @@ public class CarProperty extends BaseEntity {
 	private String groupName;
 	@TableField(exist = false)
 	private String nameKey;
+	
 
 	/**
 	 * 颜色

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

@@ -50,7 +50,7 @@ public class EquipmentSpecificIndex extends BaseEntity {
     @ApiModelProperty(value = "指标key（冗余字段）")
     @TableField("equipment_index_key")
     private String equipmentIndexKey;
-
+    
     @TableField(exist = false)
     private String nameKey;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentIndexController.java

@@ -106,7 +106,6 @@ public class EquipmentIndexController {
         return true;
     }
 
-
     /**
      * 修改消防装备/消防车指标
      *

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

@@ -58,7 +58,10 @@
 			ed.id AS equipmentDetailId,
 			wes.code as equipmentSpecificCode,
 			wes.system_id as systemId,
-			wesi.emergency_level_color AS emergencyLevelColor
+			wesi.is_alarm as isAlarm,
+			wesi.emergency_level_color as emergencyLevelColor,
+			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