feat: 补充预警字段

shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDeviceCheckingRecord.java

@@ -30,6 +30,15 @@ public class DfDeviceCheckingRecord extends SyBaseEntity {
     @TableField("DEVICE_ID")
     private String deviceId;
 
+    @TableField("DEVICE_NAME")
+    private String deviceName;
+
+    @TableField(exist = false)
+    private String adcdStart;
+
+    @TableField(exist = false)
+    private String adcdEnd;
+
     /**
      * 预警类型
      */

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDeviceCheckingRecordDetailDto.java

@@ -30,6 +30,15 @@ public class DfDeviceCheckingRecordDetailDto {
     @ApiModelProperty("设备id")
     private String deviceId;
 
+    @ApiModelProperty("设备名称")
+    private String deviceName;
+
+    @ApiModelProperty("开始区域")
+    private String adcdStart;
+
+    @ApiModelProperty("结束区域")
+    private String adcdEnd;
+
     @ApiModelProperty("预警类型")
     private String warningType;
 
@@ -55,5 +64,4 @@ public class DfDeviceCheckingRecordDetailDto {
     @ApiModelProperty("状态")
     private String status;
 
-
 }

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDeviceCheckingRecordMapper.java

@@ -17,7 +17,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface DfDeviceCheckingRecordMapper extends BaseMapper<DfDeviceCheckingRecord> {
     @Select("<script>"
-            + "SELECT sbr.ID, sbr.DEVICE_ID, sbr.DIKE_CODE, jbxx.DIKE_NAME, sbr.WARNING_TYPE, sbr.WARNING_LEVEL, sbr.WARNING_DATA, sbr.WARNING_TIME FROM bs_sgc_df_dtsbr sbr "
+            + "SELECT sbr.ID, sbr.DEVICE_ID, sbr.DEVICE_NAME, sbr.DIKE_CODE, jbxx.DIKE_NAME, jbxx.ADCD_START, jbxx.ADCD_END, sbr.WARNING_TYPE, sbr.WARNING_LEVEL, sbr.WARNING_DATA, sbr.WARNING_TIME FROM bs_sgc_df_dtsbr sbr "
             + "LEFT JOIN bs_sgc_df_gcda jbxx ON sbr.DIKE_CODE = jbxx.DIKE_CODE AND jbxx.EXPR_DATE is null "
             + "WHERE 1=1 "
             + "<if test='query.dikeName != null and query.dikeName != \"\"'>"

shuili-system/src/main/java/com/kms/yxgh/df/service/DfDeviceCheckingRecordService.java

@@ -56,6 +56,9 @@ public class DfDeviceCheckingRecordService extends BaseService<DfDeviceCheckingR
             dto.setWarningType(item.getWarningType());
             dto.setDikeCode(item.getDikeCode());
             dto.setDikeName(item.getDikeName());
+            dto.setDeviceName(item.getDeviceName());
+            dto.setAdcdStart(item.getAdcdStart());
+            dto.setAdcdEnd(item.getAdcdEnd());
             return dto;
         };
     }

shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDeviceCheckingRecord.java

@@ -30,6 +30,14 @@ public class SzDeviceCheckingRecord extends SyBaseEntity {
     @TableField("DEVICE_ID")
     private String deviceId;
 
+    @TableField("DEVICE_NAME")
+    private String deviceName;
+
+
+    @TableField(exist = false)
+    private String adcd;
+
+
     /**
      * 预警类型
      */

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDeviceCheckingRecordDetailDto.java

@@ -31,6 +31,12 @@ public class SzDeviceCheckingRecordDetailDto {
     @ApiModelProperty("设备id")
     private String deviceId;
 
+    @ApiModelProperty("设备名称")
+    private String deviceName;
+
+    @ApiModelProperty("行政规划")
+    private String adcd;
+
     @ApiModelProperty("预警类型")
     private String warningType;
 

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDeviceCheckingRecordMapper.java

@@ -18,7 +18,7 @@ import org.springframework.stereotype.Repository;
 public interface SzDeviceCheckingRecordMapper extends BaseMapper<SzDeviceCheckingRecord> {
 
     @Select("<script>"
-            + "SELECT sbr.ID, sbr.DEVICE_ID, sbr.WAGA_CODE, jbxx.WAGA_NAME, sbr.WARNING_TYPE, sbr.WARNING_LEVEL, sbr.WARNING_DATA, sbr.WARNING_TIME FROM bs_sgc_sz_dtsbr sbr "
+            + "SELECT sbr.ID, sbr.DEVICE_ID, sbr.DEVICE_NAME, sbr.WAGA_CODE, jbxx.WAGA_NAME, jbxx.ADCD, sbr.WARNING_TYPE, sbr.WARNING_LEVEL, sbr.WARNING_DATA, sbr.WARNING_TIME FROM bs_sgc_sz_dtsbr sbr "
             + "LEFT JOIN bs_sgc_sz_jbxx jbxx ON sbr.WAGA_CODE = jbxx.WAGA_CODE AND jbxx.EXPR_DATE is null "
             + "WHERE 1=1 "
             + "<if test='query.wagaName != null and query.wagaName != \"\"'>"

shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDeviceCheckingRecordService.java

@@ -31,6 +31,9 @@ public class SzDeviceCheckingRecordService extends BaseService<SzDeviceCheckingR
     public SzDeviceCheckingRecordDetailDto add(SzDeviceCheckingRecordDetailDto szDeviceCheckingRecordDetailDto) {
         SzDeviceCheckingRecord szDeviceCheckingRecord = BeanCopyUtils.copy(szDeviceCheckingRecordDetailDto, SzDeviceCheckingRecord.class);
         this.baseMapper.insert(szDeviceCheckingRecord);
+        if (szDeviceCheckingRecord != null) {
+            szDeviceCheckingRecordDetailDto.setId(szDeviceCheckingRecord.getId());
+        }
         return szDeviceCheckingRecordDetailDto;
     }
 
@@ -48,6 +51,7 @@ public class SzDeviceCheckingRecordService extends BaseService<SzDeviceCheckingR
             SzDeviceCheckingRecordDetailDto dto = new SzDeviceCheckingRecordDetailDto();
             dto.setId(item.getId());
             dto.setDeviceId(item.getDeviceId());
+            dto.setDeviceName(item.getDeviceName());
             dto.setWarningData(item.getWarningData());
             dto.setWarningLevel(item.getWarningLevel());
             dto.setWarningTime(item.getWarningTime());

sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql

@@ -413,6 +413,7 @@ CREATE TABLE `bs_sgc_df_dtsbr` (
     `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防动态检测记录编号',
     `DIKE_CODE` varchar(255)  COLLATE utf8mb4_general_ci COMMENT '堤防编码',
     `DEVICE_ID`  varchar(100) DEFAULT NULL COMMENT '设备id',
+    `DEVICE_NAME`  varchar(100) DEFAULT NULL COMMENT '设备名称',
     `WARNING_TYPE` varchar(32) DEFAULT NULL COMMENT '预警类型',
     `WARNING_LEVEL` varchar(32) DEFAULT NULL COMMENT '预警等级',
     `WARNING_TIME` datetime DEFAULT NULL COMMENT '预警时间',
@@ -816,6 +817,7 @@ CREATE TABLE `bs_sgc_sz_dtsbr` (
     `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸动态检测记录编号',
     `WAGA_CODE` varchar(255)  COLLATE utf8mb4_general_ci COMMENT '水闸编码',
     `DEVICE_ID`  varchar(100) DEFAULT NULL COMMENT '设备id',
+    `DEVICE_NAME`  varchar(100) DEFAULT NULL COMMENT '设备名称',
     `WARNING_TYPE` varchar(32) DEFAULT NULL COMMENT '预警类型',
     `WARNING_LEVEL` varchar(32) DEFAULT NULL COMMENT '预警等级',
     `WARNING_TIME` datetime DEFAULT NULL COMMENT '预警时间',
@@ -946,10 +948,10 @@ CREATE TABLE `bs_sgc_sz_bxgcnrgl` (
 
 
 CREATE OR REPLACE VIEW `v_bs_sgc_dtsbr` AS
-SELECT df.`DIKE_CODE` AS `CODE`,gc.`DIKE_NAME` AS `NAME`,'1' AS `TYPE`,df.`STATUS` AS `STATUS`,gc.`ADCD` AS ADCD, df.`WARNING_TYPE` AS `WARNING_TYPE`, df.`WARNING_LEVEL` AS `WARNING_LEVEL`, df.`WARNING_TIME` AS `WARNING_TIME`
+SELECT df.`ID`, df.`DIKE_CODE` AS `CODE`,gc.`DIKE_NAME` AS `NAME`,'1' AS `TYPE`,df.`STATUS` AS `STATUS`,gc.`ADCD` AS ADCD, df.`WARNING_TYPE` AS `WARNING_TYPE`, df.`WARNING_LEVEL` AS `WARNING_LEVEL`, df.`WARNING_TIME` AS `WARNING_TIME`
 FROM `bs_sgc_df_dtsbr` AS df
 LEFT JOIN `bs_sgc_df_gcda` AS gc ON df.`DIKE_CODE` = gc.`DIKE_CODE` AND gc.`EXPR_DATE` is null
 union all
-SELECT sz.`WAGA_CODE` AS `CODE`,jb.`WAGA_NAME` AS `NAME`,'2' AS `TYPE`,sz.`STATUS` AS `STATUS`,jb.`ADCD` AS ADCD, sz.`WARNING_TYPE` AS `WARNING_TYPE`, sz.`WARNING_LEVEL` AS `WARNING_LEVEL`, sz.`WARNING_TIME` AS `WARNING_TIME`
+SELECT sz.`ID`, sz.`WAGA_CODE` AS `CODE`,jb.`WAGA_NAME` AS `NAME`,'2' AS `TYPE`,sz.`STATUS` AS `STATUS`,jb.`ADCD` AS ADCD, sz.`WARNING_TYPE` AS `WARNING_TYPE`, sz.`WARNING_LEVEL` AS `WARNING_LEVEL`, sz.`WARNING_TIME` AS `WARNING_TIME`
 FROM `bs_sgc_sz_dtsbr` AS sz
 LEFT JOIN `bs_sgc_sz_jbxx` AS jb ON sz.`WAGA_CODE` = jb.`WAGA_CODE` and jb.`EXPR_DATE` is null

sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql

@@ -382,6 +382,7 @@ CREATE TABLE `bs_sgc_sz_dtsbr` (
     `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸动态检测记录编号',
     `WAGA_CODE` varchar(255)  COLLATE utf8mb4_general_ci COMMENT '水闸编码',
     `DEVICE_ID`  varchar(100) DEFAULT NULL COMMENT '设备id',
+    `DEVICE_NAME`  varchar(100) DEFAULT NULL COMMENT '设备名称',
     `WARNING_TYPE` varchar(32) DEFAULT NULL COMMENT '预警类型',
     `WARNING_LEVEL` varchar(32) DEFAULT NULL COMMENT '预警等级',
     `WARNING_TIME` datetime DEFAULT NULL COMMENT '预警时间',
@@ -416,6 +417,7 @@ CREATE TABLE `bs_sgc_df_dtsbr` (
     `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防动态检测记录编号',
     `DIKE_CODE` varchar(255)  COLLATE utf8mb4_general_ci COMMENT '堤防编码',
     `DEVICE_ID`  varchar(100) DEFAULT NULL COMMENT '设备id',
+    `DEVICE_NAME`  varchar(100) DEFAULT NULL COMMENT '设备名称',
     `WARNING_TYPE` varchar(32) DEFAULT NULL COMMENT '预警类型',
     `WARNING_LEVEL` varchar(32) DEFAULT NULL COMMENT '预警等级',
     `WARNING_TIME` datetime DEFAULT NULL COMMENT '预警时间',
@@ -487,7 +489,7 @@ CREATE TABLE `bs_sgc_sz_bxgcxmnr` (
 CREATE TABLE `bs_sgc_sz_bxgcfz` (
     `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程核查分组编号',
     `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '小组名称',
-		`DEPT_ID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '单位id',
+	`DEPT_ID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '单位id',
     `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注',
     `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
     `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
@@ -544,11 +546,11 @@ CREATE TABLE `bs_sgc_sz_bxgcnrgl` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸病险工程项目任务关联表';
 
 CREATE OR REPLACE VIEW `v_bs_sgc_dtsbr` AS
-SELECT df.`DIKE_CODE` AS `CODE`,gc.`DIKE_NAME` AS `NAME`,'1' AS `TYPE`,df.`STATUS` AS `STATUS`,gc.`ADCD` AS ADCD, df.`WARNING_TYPE` AS `WARNING_TYPE`, df.`WARNING_LEVEL` AS `WARNING_LEVEL`, df.`WARNING_TIME` AS `WARNING_TIME`
+SELECT df.`ID`, df.`DIKE_CODE` AS `CODE`,gc.`DIKE_NAME` AS `NAME`,'1' AS `TYPE`,df.`STATUS` AS `STATUS`,gc.`ADCD` AS ADCD, df.`WARNING_TYPE` AS `WARNING_TYPE`, df.`WARNING_LEVEL` AS `WARNING_LEVEL`, df.`WARNING_TIME` AS `WARNING_TIME`
 FROM `bs_sgc_df_dtsbr` AS df
 LEFT JOIN `bs_sgc_df_gcda` AS gc ON df.`DIKE_CODE` = gc.`DIKE_CODE` AND gc.`EXPR_DATE` is null
 union all
-SELECT sz.`WAGA_CODE` AS `CODE`,jb.`WAGA_NAME` AS `NAME`,'2' AS `TYPE`,sz.`STATUS` AS `STATUS`,jb.`ADCD` AS ADCD, sz.`WARNING_TYPE` AS `WARNING_TYPE`, sz.`WARNING_LEVEL` AS `WARNING_LEVEL`, sz.`WARNING_TIME` AS `WARNING_TIME`
+SELECT sz.`ID`, sz.`WAGA_CODE` AS `CODE`,jb.`WAGA_NAME` AS `NAME`,'2' AS `TYPE`,sz.`STATUS` AS `STATUS`,jb.`ADCD` AS ADCD, sz.`WARNING_TYPE` AS `WARNING_TYPE`, sz.`WARNING_LEVEL` AS `WARNING_LEVEL`, sz.`WARNING_TIME` AS `WARNING_TIME`
 FROM `bs_sgc_sz_dtsbr` AS sz
 LEFT JOIN `bs_sgc_sz_jbxx` AS jb ON sz.`WAGA_CODE` = jb.`WAGA_CODE` and jb.`EXPR_DATE` is null