From cdbf5aeade2d18adf96657e51bfb9a3dcc471b3e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 09 七月 2025 10:46:34 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/DeviceConfigMapper.xml           |    1 +
 src/main/webapp/views/admin/deviceConfig/deviceConfig.html |    6 ++++++
 src/main/java/com/zy/asrs/entity/DeviceConfig.java         |    7 +++++++
 src/main/webapp/static/js/deviceConfig/deviceConfig.js     |    1 +
 4 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/DeviceConfig.java b/src/main/java/com/zy/asrs/entity/DeviceConfig.java
index fe103c6..05edb04 100644
--- a/src/main/java/com/zy/asrs/entity/DeviceConfig.java
+++ b/src/main/java/com/zy/asrs/entity/DeviceConfig.java
@@ -77,6 +77,13 @@
     @TableField("fake_init_status")
     private String fakeInitStatus;
 
+    /**
+     * 缃戝叧缂栧彿
+     */
+    @ApiModelProperty(value= "缃戝叧缂栧彿")
+    @TableField("gateway_id")
+    private Integer gatewayId;
+
     public DeviceConfig() {}
 
     public DeviceConfig(String ip,Integer port,String threadImpl,Date createTime,String deviceType,Integer deviceNo) {
diff --git a/src/main/resources/mapper/DeviceConfigMapper.xml b/src/main/resources/mapper/DeviceConfigMapper.xml
index a7ca89e..b3952bc 100644
--- a/src/main/resources/mapper/DeviceConfigMapper.xml
+++ b/src/main/resources/mapper/DeviceConfigMapper.xml
@@ -13,6 +13,7 @@
         <result column="device_no" property="deviceNo" />
         <result column="fake" property="fake" />
         <result column="fake_init_status" property="fakeInitStatus" />
+        <result column="gateway_id" property="gatewayId" />
 
     </resultMap>
 
diff --git a/src/main/webapp/static/js/deviceConfig/deviceConfig.js b/src/main/webapp/static/js/deviceConfig/deviceConfig.js
index e514c91..bc11605 100644
--- a/src/main/webapp/static/js/deviceConfig/deviceConfig.js
+++ b/src/main/webapp/static/js/deviceConfig/deviceConfig.js
@@ -27,6 +27,7 @@
             ,{field: 'ip', align: 'center',title: '璁惧ip'}
             ,{field: 'port', align: 'center',title: '璁惧绔彛'}
             ,{field: 'threadImpl', align: 'center',title: '瀹炵幇绫�'}
+            ,{field: 'gatewayId', align: 'center',title: '缃戝叧缂栧彿'}
             ,{field: 'fake$', align: 'center',title: '铏氭嫙璁惧'}
             ,{field: 'fakeInitStatus', align: 'center',title: '铏氭嫙璁惧鍒濆鍖栬澶囩姸鎬�'}
             ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
diff --git a/src/main/webapp/views/admin/deviceConfig/deviceConfig.html b/src/main/webapp/views/admin/deviceConfig/deviceConfig.html
index e636e18..b70d899 100644
--- a/src/main/webapp/views/admin/deviceConfig/deviceConfig.html
+++ b/src/main/webapp/views/admin/deviceConfig/deviceConfig.html
@@ -103,6 +103,12 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
+                    <label class="layui-form-label">缃戝叧缂栧彿: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="gatewayId" placeholder="璇疯緭鍏ョ綉鍏崇紪鍙�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
                     <label class="layui-form-label">铏氭嫙璁惧: </label>
                     <div class="layui-input-block">
                         <select name="fake">

--
Gitblit v1.9.1