From ece0a75c9750766477b6c1136b69145612ad9d50 Mon Sep 17 00:00:00 2001
From: hxh <762326930@qq.com>
Date: Mon, 18 Mar 2024 15:59:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kms/yxgh/df/domain/DfDeviceCheckingRecord.java    | 3 +++
 .../com/kms/yxgh/df/dto/DfDeviceCheckingRecordDetailDto.java   | 3 +++
 .../com/kms/yxgh/df/mapper/DfDeviceCheckingRecordMapper.java   | 2 +-
 .../com/kms/yxgh/df/service/DfDeviceCheckingRecordService.java | 1 +
 .../java/com/kms/yxgh/sz/domain/SzDeviceCheckingRecord.java    | 3 +++
 .../com/kms/yxgh/sz/dto/SzDeviceCheckingRecordDetailDto.java   | 3 +++
 .../com/kms/yxgh/sz/mapper/SzDeviceCheckingRecordMapper.java   | 2 +-
 .../com/kms/yxgh/sz/service/SzDeviceCheckingRecordService.java | 2 ++
 8 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDeviceCheckingRecord.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDeviceCheckingRecord.java
index 4bd7d621..05eaf0b6 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDeviceCheckingRecord.java
+++ b/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;
 
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDeviceCheckingRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDeviceCheckingRecordDetailDto.java
index 0318d035..eb7f008d 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDeviceCheckingRecordDetailDto.java
+++ b/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;
 
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDeviceCheckingRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDeviceCheckingRecordMapper.java
index 994d4c23..6393ca2a 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDeviceCheckingRecordMapper.java
+++ b/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 != \"\"'>"
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDeviceCheckingRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDeviceCheckingRecordService.java
index 77cff743..e5c7a739 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDeviceCheckingRecordService.java
+++ b/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;
         };
     }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDeviceCheckingRecord.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDeviceCheckingRecord.java
index f7f86f51..f8b6cce3 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDeviceCheckingRecord.java
+++ b/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;
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDeviceCheckingRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDeviceCheckingRecordDetailDto.java
index 30993b71..b60917aa 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDeviceCheckingRecordDetailDto.java
+++ b/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;
 
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDeviceCheckingRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDeviceCheckingRecordMapper.java
index abe70095..83ca2ac2 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDeviceCheckingRecordMapper.java
+++ b/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 != \"\"'>"
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDeviceCheckingRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDeviceCheckingRecordService.java
index 428c36cb..e700f471 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDeviceCheckingRecordService.java
+++ b/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;
         };
     }