东北大学预警新增气瓶功能支持

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/dto/WarningNoticeLogDto.java

@@ -118,6 +118,9 @@ public class WarningNoticeLogDto {
     @ApiModelProperty("是否处理（0 未处理，1已处理）")
     private Integer dispose;
 
+
+    @ApiModelProperty("位置状态（0离位 1在位）")
+    private Integer locationState;
     @ApiModelProperty("创建人名称")
     private String createName;
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/WarningNoticeLog.java

@@ -125,6 +125,9 @@ public class WarningNoticeLog extends Model<WarningNoticeLog> {
     @ApiModelProperty("是否处理（0 未处理，1已处理）")
     private Integer dispose;
 
+    @ApiModelProperty("位置状态（0离位 1在位）")
+    private Integer locationState;
+
     @ApiModelProperty("创建人名称")
     private String createName;
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/WarningNoticeLogVO.java

@@ -124,6 +124,11 @@ public class WarningNoticeLogVO {
 
     @ApiModelProperty("是否处理（0 未处理，1已处理）")
     private Integer dispose;
+
+
+    @ApiModelProperty("位置状态（0离位 1在位）")
+    private Integer locationState;
+
     @ApiModelProperty("创建人名称")
     private String createName;
 

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/WarningNoticeLogMapper.xml

@@ -34,6 +34,7 @@
         <result column="holder" property="holder"/>
         <result column="voice_broadcast" property="voiceBroadcast"/>
         <result column="remark" property="remark"/>
+        <result column="location_state" property="locationState"/>
         <result column="dispose" property="dispose"/>
         <result column="create_name" property="createName" />
         <result column="create_by" property="createBy" />
@@ -46,7 +47,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, key_id, warning_content, warning_type, warning_sub_type, warning_way, sub_id, sub_name, build_name, floor_name, room_num, warning_time, name, margin, specification, apply_user, apply_time, deposit, record_video, record_photo, risk_duration, responder, indoor_user, start_time, end_time, expiration_time, entry_time, holder, voice_broadcast, remark, dispose, create_name, create_by, create_time, update_name, update_by, update_time, is_deleted
+        id, key_id, warning_content, warning_type, warning_sub_type, warning_way, sub_id, sub_name, build_name, floor_name, room_num, warning_time, name, margin, specification, apply_user, apply_time, deposit, record_video, record_photo, risk_duration, responder, indoor_user, start_time, end_time, expiration_time, entry_time, holder, voice_broadcast, remark, dispose, location_state, create_name, create_by, create_time, update_name, update_by, update_time, is_deleted
     </sql>
 
     <select id="selectWarningNoticelist"