From 6e1095e946997e406926c204ceeb5c820dbd07c1 Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期二, 13 八月 2024 23:51:47 +0800
Subject: [PATCH] 1. 修复文件扩展名获取错误问题 2. 调试完善设备信息相关接口

---
 src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DustDataResult.java |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DustDataResult.java b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DustDataResult.java
index e3e174d..b6b9ab4 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DustDataResult.java
+++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DustDataResult.java
@@ -19,7 +19,13 @@
      * 鍦烘櫙鍚嶇О
      */
     @Column(name = "DR_Scene_Name")
-    private Integer drSceneName;
+    private String drSceneName;
+
+    /**
+     * 璁惧缂栧彿
+     */
+    @Column(name = "DR_Device_Code")
+    private String drDeviceCode;
 
     /**
      * 璁板綍鏈堜唤
@@ -106,7 +112,7 @@
      *
      * @return DR_Scene_Name - 鍦烘櫙鍚嶇О
      */
-    public Integer getDrSceneName() {
+    public String getDrSceneName() {
         return drSceneName;
     }
 
@@ -115,8 +121,26 @@
      *
      * @param drSceneName 鍦烘櫙鍚嶇О
      */
-    public void setDrSceneName(Integer drSceneName) {
-        this.drSceneName = drSceneName;
+    public void setDrSceneName(String drSceneName) {
+        this.drSceneName = drSceneName == null ? null : drSceneName.trim();
+    }
+
+    /**
+     * 鑾峰彇璁惧缂栧彿
+     *
+     * @return DR_Device_Code - 璁惧缂栧彿
+     */
+    public String getDrDeviceCode() {
+        return drDeviceCode;
+    }
+
+    /**
+     * 璁剧疆璁惧缂栧彿
+     *
+     * @param drDeviceCode 璁惧缂栧彿
+     */
+    public void setDrDeviceCode(String drDeviceCode) {
+        this.drDeviceCode = drDeviceCode == null ? null : drDeviceCode.trim();
     }
 
     /**

--
Gitblit v1.9.3