设备添加设备状态字段

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

@@ -97,6 +97,11 @@ public class EquipmentSpecific extends BaseEntity {
     @TableField("realtime_iot_index_update_date")
     private Date realtimeIotIndexUpdateDate;
     
+
+    @ApiModelProperty(value = "物联设备实时状态，默认0表示正常（绿色#00ff00），1为故障类（黄色 #ffd500），2为火警类（红色#ff0000）")
+    @TableField("equip_status")
+    private String equipStatus="0";
+    
     @ApiModelProperty(value = "完整二维码")
     @TableField(exist = false)
     private String fullqrCode;

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

 package com.yeejoin.equipmanage.common.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -61,4 +63,8 @@ public class EquipTypeImgAmountVO {
 
     @ApiModelProperty(value = "纬度")
     private Double latitude;
+    
+    @ApiModelProperty(value = "物联设备实时状态")
+    private Double equipStatus;
+   
 }

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -752,5 +752,48 @@
             alter table `wl_video` add column `video_type` varchar(100) DEFAULT 'flv' COMMENT '视频格式: 1.flv,2.rtsp,3.hls，4.other';
         </sql>
     </changeSet>
+    
+    <changeSet author="maoy" id="202300511-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_specific" columnName="equip_status"/>
+            </not>
+        </preConditions>
+        <comment>wl_equipment_specific新增属性字段 equip_status</comment>
+        <sql>
+          ALTER TABLE `wl_equipment_specific`
+		ADD COLUMN `equip_status`  varchar(20) NULL DEFAULT 0 COMMENT '物联设备实时状态，默认0表示正常（绿色），1为故障类（黄色），2为火警类（红色）' ;
+        </sql>
+    </changeSet>
+     <changeSet author="maoy" id="202300511-2">
+        <preConditions onFail="MARK_RAN">
+              <columnExists tableName="wl_equipment_specific" columnName="equip_status"/>
+        </preConditions>
+        <comment>wl_equipment_specific字段 equip_status 初始化</comment>
+        <sql>
+        
+		UPDATE wl_equipment_specific es SET es.equip_status = IFNULL((
+			SELECT
+				(
+					CASE
+					WHEN find_in_set(
+						'FIREALARM',
+						GROUP_CONCAT(esa.type)
+					) > 0 THEN
+						'2'
+					ELSE
+						'1'
+					END
+				) s
+			FROM
+				`wl_equipment_specific_alarm` esa
+			WHERE
+				esa.equipment_specific_id = es.id
+			AND esa.`status` = TRUE
+			GROUP BY
+				esa.equipment_specific_id
+			),'0') ;
+        </sql>
+    </changeSet>
 
 </databaseChangeLog>
\ No newline at end of file

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

@@ -1976,9 +1976,10 @@
             wles.create_date as createDate,
             wled.code as eqtype,
             wles.biz_org_code as bizOrgCode,
-            wles.biz_org_name as bizOrgName
+            wles.biz_org_name as bizOrgName,
+            wles.equip_status as equipStatus
             FROM
-            (select id,name,qr_code,code ,iot_code ,biz_org_code,team_id ,biz_org_name,create_date ,equipment_detail_id ,system_id from wl_equipment_specific) wles
+            (select id,name,qr_code,code ,iot_code ,biz_org_code,team_id ,biz_org_name,create_date ,equipment_detail_id ,system_id,equip_status from wl_equipment_specific) wles
             LEFT JOIN (select id,amount,status,equipment_specific_id,warehouse_structure_id from wl_stock_detail ) wlsd on wlsd.equipment_specific_id = wles.id
             LEFT JOIN wl_warehouse_structure wlws on wlsd.warehouse_structure_id = wlws.id
             LEFT JOIN (select id,standard ,name ,area ,code, equipment_id ,manufacturer_id,is_import from wl_equipment_detail) wled on wles.equipment_detail_id = wled.id
@@ -2093,9 +2094,10 @@
             wles.create_date as createDate,
             wled.code as eqtype,
             wles.biz_org_code as bizOrgCode,
-            wles.biz_org_name as bizOrgName
+            wles.biz_org_name as bizOrgName,
+            wles.equip_status as equipStatus
             FROM
-            (select id,qr_code,code ,iot_code ,biz_org_code ,team_id,biz_org_name,create_date ,equipment_detail_id ,system_id from wl_equipment_specific) wles
+            (select id,qr_code,code ,iot_code ,biz_org_code ,team_id,biz_org_name,create_date ,equipment_detail_id ,system_id ,equip_status from wl_equipment_specific) wles
             LEFT JOIN (select id,amount,status,equipment_specific_id,warehouse_structure_id from wl_stock_detail ) wlsd on wlsd.equipment_specific_id = wles.id
             LEFT JOIN wl_warehouse_structure wlws on wlsd.warehouse_structure_id = wlws.id
             LEFT JOIN (select id,standard ,name ,area ,code, equipment_id ,manufacturer_id,is_import from wl_equipment_detail) wled on wles.equipment_detail_id = wled.id