feat: 补充设备类型字段

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

@@ -33,6 +33,9 @@ public class DfDeviceCheckingRecord extends SyBaseEntity {
     @TableField("DEVICE_NAME")
     private String deviceName;
 
+    @TableField("DEVICE_TYPE")
+    private String deviceType;
+
     @TableField(exist = false)
     private String adcdStart;
 

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

@@ -33,6 +33,9 @@ public class DfDeviceCheckingRecordDetailDto {
     @ApiModelProperty("设备名称")
     private String deviceName;
 
+    @ApiModelProperty("设备类型")
+    private String deviceType;
+
     @ApiModelProperty("开始区域")
     private String adcdStart;
 

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.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 "
+            + "SELECT sbr.ID, sbr.DEVICE_ID, sbr.DEVICE_NAME, sbr.DEVICE_TYPE, 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

@@ -59,6 +59,7 @@ public class DfDeviceCheckingRecordService extends BaseService<DfDeviceCheckingR
             dto.setDeviceName(item.getDeviceName());
             dto.setAdcdStart(item.getAdcdStart());
             dto.setAdcdEnd(item.getAdcdEnd());
+            dto.setDeviceType(item.getDeviceType());
             return dto;
         };
     }

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

@@ -33,6 +33,9 @@ public class SzDeviceCheckingRecord extends SyBaseEntity {
     @TableField("DEVICE_NAME")
     private String deviceName;
 
+    @TableField("DEVICE_TYPE")
+    private String deviceType;
+
 
     @TableField(exist = false)
     private String adcd;

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

@@ -34,6 +34,9 @@ public class SzDeviceCheckingRecordDetailDto {
     @ApiModelProperty("设备名称")
     private String deviceName;
 
+    @ApiModelProperty("设备类型")
+    private String deviceType;
+
     @ApiModelProperty("行政规划")
     private String adcd;
 

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.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 "
+            + "SELECT sbr.ID, sbr.DEVICE_ID, sbr.DEVICE_NAME, sbr.DEVICE_TYPE, 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

@@ -59,6 +59,8 @@ public class SzDeviceCheckingRecordService extends BaseService<SzDeviceCheckingR
             dto.setWagaCode(item.getWagaCode());
             dto.setWagaName(item.getWagaName());
             dto.setStatus(item.getStatus());
+            dto.setAdcd(item.getAdcd());
+            dto.setDeviceType(item.getDeviceType());
             return dto;
         };
     }