From 2e643b3ff43061e2e280ac805d636b39cbf1d0cd Mon Sep 17 00:00:00 2001
From: "zhczyx@163.com" <zhczyx@163.com>
Date: Wed, 17 Dec 2025 14:57:44 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=95=9C=E5=83=8F?=
 =?UTF-8?q?=E4=B8=BA=E6=9C=80=E6=96=B0=EF=BC=8C=E8=A7=A3=E5=86=B3=E9=95=9C?=
 =?UTF-8?q?=E5=83=8F=E7=BB=B4=E6=8A=A4=E8=BF=87=E6=9C=9F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-center-business-controller/dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/data-center-business-controller/dockerfile b/data-center-business-controller/dockerfile
index 5cff86d..3f1777e 100644
--- a/data-center-business-controller/dockerfile
+++ b/data-center-business-controller/dockerfile
@@ -1,4 +1,7 @@
-FROM registry.ap-northeast-1.aliyuncs.com/southwave/jdk17-template:latest
+# FROM registry.ap-northeast-1.aliyuncs.com/southwave/jdk17-template:latest
+FROM amazoncorretto:17-alpine
+# 安装 fontconfig 和 DejaVu 字体 (这是一个通用且免费的字体包)
+RUN apk --no-cache add fontconfig ttf-dejavu
 # FROM openjdk:17-jdk
 ENV TZ=Asia/Tokyo
 WORKDIR /home/data-center-business

From b36b66c374acbac2521f96781b96956a215c140c Mon Sep 17 00:00:00 2001
From: "zhczyx@163.com" <zhczyx@163.com>
Date: Fri, 19 Dec 2025 18:37:56 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1null?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/SyncTrendsStatsService.java       | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/SyncTrendsStatsService.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/SyncTrendsStatsService.java
index cd23a06..4ec667c 100644
--- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/SyncTrendsStatsService.java
+++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/SyncTrendsStatsService.java
@@ -291,11 +291,31 @@ public class SyncTrendsStatsService {
             if (resultDTO != null) {
                 AuroraTrendsStatsTotal auroraTrendsStatsTotal = new AuroraTrendsStatsTotal();
                 auroraTrendsStatsTotal.setReceiverDeviceId(0L);
-                auroraTrendsStatsTotal.setSenderDeviceId(resultDTO.getSenderDeviceIdDelta());
-                auroraTrendsStatsTotal.setDispatch(resultDTO.getSenderDispatchDelta());
-                auroraTrendsStatsTotal.setAlert(Long.valueOf(resultDTO.getSenderAlertDelta()));
-                auroraTrendsStatsTotal.setAlertCancel(Long.valueOf(resultDTO.getSenderAlertCancelDelta()));
-                auroraTrendsStatsTotal.setSenderBuilding(Long.valueOf(resultDTO.getBuildingIdCount()));
+                if (resultDTO.getRecieverDeviceIdDelta() != null){
+                    auroraTrendsStatsTotal.setSenderDeviceId(resultDTO.getSenderDeviceIdDelta());
+                }else {
+                    auroraTrendsStatsTotal.setSenderDeviceId(0L);
+                }
+                if (resultDTO.getSenderDispatchDelta() != null){
+                    auroraTrendsStatsTotal.setDispatch(resultDTO.getSenderDispatchDelta());
+                }else {
+                    auroraTrendsStatsTotal.setDispatch(0L);
+                }
+                if (resultDTO.getSenderAlertDelta() != null){
+                    auroraTrendsStatsTotal.setAlert(Long.valueOf(resultDTO.getSenderAlertDelta()));
+                }else {
+                    auroraTrendsStatsTotal.setAlert(0L);
+                }
+                if (resultDTO.getSenderAlertCancelDelta() != null){
+                    auroraTrendsStatsTotal.setAlertCancel(Long.valueOf(resultDTO.getSenderAlertCancelDelta()));
+                }else{
+                    auroraTrendsStatsTotal.setAlertCancel(0L);
+                }
+                if (resultDTO.getBuildingIdCount() != null){
+                    auroraTrendsStatsTotal.setSenderBuilding(Long.valueOf(resultDTO.getBuildingIdCount()));
+                }else{
+                    auroraTrendsStatsTotal.setSenderBuilding(0L);
+                }
                 auroraTrendsStatsTotal.setCreatedDate(Date.from(yesterdayMidnight.toInstant()));
                 this.auroraTrendsStatsTotalMapper.insert(auroraTrendsStatsTotal);
             }

From 46706a66b9d36bd027a88321a7967dcc8e964b33 Mon Sep 17 00:00:00 2001
From: "zhczyx@163.com" <zhczyx@163.com>
Date: Sun, 21 Dec 2025 22:28:20 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-center-business-controller/buildPush-prod.sh | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 data-center-business-controller/buildPush-prod.sh

diff --git a/data-center-business-controller/buildPush-prod.sh b/data-center-business-controller/buildPush-prod.sh
new file mode 100644
index 0000000..b1bec43
--- /dev/null
+++ b/data-center-business-controller/buildPush-prod.sh
@@ -0,0 +1,7 @@
+aws configure set aws_access_key_id AKIAR26KHSVRUEAKRBPZ
+aws configure set aws_secret_access_key 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
+aws configure set default.region ap-northeast-1
+aws ecr get-login-password --region ap-northeast-1 | docker login --username AWS --password-stdin 126588786019.dkr.ecr.ap-northeast-1.amazonaws.com
+docker build -t 126588786019.dkr.ecr.ap-northeast-1.amazonaws.com/aeon-prod/spf-business:latest --build-arg JAR_FILE=target/data-center-business-controller-0.0.1-SNAPSHOT.jar  --build-arg LIB_DIR=target/lib  --build-arg CONFIG_DIR=target/config .
+docker push 126588786019.dkr.ecr.ap-northeast-1.amazonaws.com/aeon-prod/spf-business:latest
+

From 139e804ecc7038fe27b3f399405ab7a7a6d2d1b0 Mon Sep 17 00:00:00 2001
From: "zhczyx@163.com" <zhczyx@163.com>
Date: Sun, 28 Dec 2025 00:30:27 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=BA=E6=B0=B8=E6=97=BA=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/config/application.properties | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/data-center-business-controller/src/main/resources/config/application.properties b/data-center-business-controller/src/main/resources/config/application.properties
index 737b7f9..a4afd4c 100644
--- a/data-center-business-controller/src/main/resources/config/application.properties
+++ b/data-center-business-controller/src/main/resources/config/application.properties
@@ -71,12 +71,12 @@ mail.smtp.host=email-smtp.ap-northeast-1.amazonaws.com
 mail.smtp.port=465
 mail.smtp.auth=true
 mail.smtp.ssl=true
-mail.sender.username=AKIAVRXFMB43Z4Q6WGZN
-mail.sender.password_encrypted=true
-mail.sender.password=a/52R0rao7ksRMvl1j17fVEmPCw7gC9OreHDqWOE+S7sgmoQT0YgoLRJqOlJqX7e
-mail.sender.sendername=datacenter-info
-mail.sender.from=alert@ttkdatatechbuild.com
-#邮件通知服务开关
+mail.sender.username=AKIAR26KHSVR3E7N7V3X
+mail.sender.password_encrypted=false
+mail.sender.password=BFe3PePmvmKJKF/cwVxKq2C3EG10IcYQ+fNq0Eccl0PU
+mail.sender.sendername=smbil-support@ifmservice.jp
+mail.sender.from=smbil-support@ifmservice.jp
+#\u90AE\u4EF6\u901A\u77E5\u670D\u52A1\u5F00\u5173
 mail.send.switch=true
 
 Spring.mvc.hiddenmethod.filter.enabled=true

From e0805c3d00aa84f57f47c17bcdcfa12959d3ca76 Mon Sep 17 00:00:00 2001
From: "zhczyx@163.com" <zhczyx@163.com>
Date: Sun, 28 Dec 2025 22:40:06 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E7=BD=91=E5=85=B3=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=92=8C=E6=A5=BC=E5=AE=87?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migration/V64__getewayclients_update.sql  |   3 +
 .../dao/ex/GatewayClientsMapperExt.java       |   3 +-
 .../mappers/auto/GatewayClientsMapper.xml     |  42 +++++-
 .../mappers/ex/GatewayClientsMapperExt.xml    |  21 ++-
 .../dto/gateway/GatewayClientsAddParam.java   |   6 +
 .../dto/gateway/GatewayClientsEditParam.java  |   6 +
 .../gateway/GatewayClientsQueryResponse.java  |  37 ++++++
 .../business/model/GatewayClients.java        |  68 ++++++++++
 .../business/model/GatewayClientsExample.java | 120 ++++++++++++++++++
 .../service/GatewayClientsService.java        |   2 +-
 .../impl/GatewayClientsServiceImpl.java       |   8 +-
 11 files changed, 304 insertions(+), 12 deletions(-)
 create mode 100644 data-center-business-controller/src/main/resources/db/migration/V64__getewayclients_update.sql
 create mode 100644 data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/gateway/GatewayClientsQueryResponse.java

diff --git a/data-center-business-controller/src/main/resources/db/migration/V64__getewayclients_update.sql b/data-center-business-controller/src/main/resources/db/migration/V64__getewayclients_update.sql
new file mode 100644
index 0000000..c758be2
--- /dev/null
+++ b/data-center-business-controller/src/main/resources/db/migration/V64__getewayclients_update.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `gateway_clients`
+ADD COLUMN `project_id` BIGINT NULL DEFAULT 0 AFTER `alert_switch`,
+ADD COLUMN `building_id` BIGINT NULL DEFAULT 0 AFTER `project_id`;
\ No newline at end of file
diff --git a/data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/ex/GatewayClientsMapperExt.java b/data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/ex/GatewayClientsMapperExt.java
index 662ac69..bcb0dbd 100644
--- a/data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/ex/GatewayClientsMapperExt.java
+++ b/data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/ex/GatewayClientsMapperExt.java
@@ -4,6 +4,7 @@ import com.techsor.datacenter.business.dao.auto.DeviceInfoMapper;
 import com.techsor.datacenter.business.dao.auto.GatewayClientsMapper;
 import com.techsor.datacenter.business.dto.device.DeviceSearchParams;
 import com.techsor.datacenter.business.dto.gateway.GatewayClientsQueryParam;
+import com.techsor.datacenter.business.dto.gateway.GatewayClientsQueryResponse;
 import com.techsor.datacenter.business.model.DeviceInfo;
 import com.techsor.datacenter.business.model.GatewayClients;
 import com.techsor.datacenter.business.vo.asset.ApiDeviceInfoVO;
@@ -21,6 +22,6 @@ import java.util.Map;
 @Mapper
 public interface GatewayClientsMapperExt extends GatewayClientsMapper {
 
-    List<GatewayClients> getListPage(@Param("param") GatewayClientsQueryParam param,@Param("companyId") Long companyId);
+    List<GatewayClientsQueryResponse> getListPage(@Param("param") GatewayClientsQueryParam param, @Param("companyId") Long companyId);
 
 }
diff --git a/data-center-business-dao/src/main/resources/mappers/auto/GatewayClientsMapper.xml b/data-center-business-dao/src/main/resources/mappers/auto/GatewayClientsMapper.xml
index 66cd365..f86f604 100644
--- a/data-center-business-dao/src/main/resources/mappers/auto/GatewayClientsMapper.xml
+++ b/data-center-business-dao/src/main/resources/mappers/auto/GatewayClientsMapper.xml
@@ -19,6 +19,8 @@
     <result column="data_amount_threshold_alarm" jdbcType="INTEGER" property="dataAmountThresholdAlarm" />
     <result column="data_accumulated_totals" jdbcType="INTEGER" property="dataAccumulatedTotals" />
     <result column="alert_switch" jdbcType="INTEGER" property="alertSwitch" />
+    <result column="project_id" jdbcType="BIGINT" property="projectId" />
+    <result column="building_id" jdbcType="BIGINT" property="buildingId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -93,7 +95,7 @@
     -->
     id, client_id, client_name, address, online_status, last_updata_ts, create_ts, flag, 
     company_id, data_amount_threshold, data_amount_threshold_alarm, data_accumulated_totals, 
-    alert_switch
+    alert_switch, project_id, building_id
   </sql>
   <select id="selectByExample" parameterType="com.techsor.datacenter.business.model.GatewayClientsExample" resultMap="BaseResultMap">
     <!--
@@ -154,12 +156,14 @@
       online_status, last_updata_ts, create_ts, 
       flag, company_id, data_amount_threshold, 
       data_amount_threshold_alarm, data_accumulated_totals, 
-      alert_switch)
+      alert_switch, project_id, building_id
+      )
     values (#{clientId,jdbcType=VARCHAR}, #{clientName,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, 
       #{onlineStatus,jdbcType=INTEGER}, #{lastUpdataTs,jdbcType=BIGINT}, #{createTs,jdbcType=BIGINT}, 
       #{flag,jdbcType=INTEGER}, #{companyId,jdbcType=BIGINT}, #{dataAmountThreshold,jdbcType=INTEGER}, 
       #{dataAmountThresholdAlarm,jdbcType=INTEGER}, #{dataAccumulatedTotals,jdbcType=INTEGER}, 
-      #{alertSwitch,jdbcType=INTEGER})
+      #{alertSwitch,jdbcType=INTEGER}, #{projectId,jdbcType=BIGINT}, #{buildingId,jdbcType=BIGINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.techsor.datacenter.business.model.GatewayClients">
     <!--
@@ -207,6 +211,12 @@
       <if test="alertSwitch != null">
         alert_switch,
       </if>
+      <if test="projectId != null">
+        project_id,
+      </if>
+      <if test="buildingId != null">
+        building_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="clientId != null">
@@ -245,6 +255,12 @@
       <if test="alertSwitch != null">
         #{alertSwitch,jdbcType=INTEGER},
       </if>
+      <if test="projectId != null">
+        #{projectId,jdbcType=BIGINT},
+      </if>
+      <if test="buildingId != null">
+        #{buildingId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.techsor.datacenter.business.model.GatewayClientsExample" resultType="java.lang.Long">
@@ -303,6 +319,12 @@
       <if test="record.alertSwitch != null">
         alert_switch = #{record.alertSwitch,jdbcType=INTEGER},
       </if>
+      <if test="record.projectId != null">
+        project_id = #{record.projectId,jdbcType=BIGINT},
+      </if>
+      <if test="record.buildingId != null">
+        building_id = #{record.buildingId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -326,7 +348,9 @@
       data_amount_threshold = #{record.dataAmountThreshold,jdbcType=INTEGER},
       data_amount_threshold_alarm = #{record.dataAmountThresholdAlarm,jdbcType=INTEGER},
       data_accumulated_totals = #{record.dataAccumulatedTotals,jdbcType=INTEGER},
-      alert_switch = #{record.alertSwitch,jdbcType=INTEGER}
+      alert_switch = #{record.alertSwitch,jdbcType=INTEGER},
+      project_id = #{record.projectId,jdbcType=BIGINT},
+      building_id = #{record.buildingId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -374,6 +398,12 @@
       <if test="alertSwitch != null">
         alert_switch = #{alertSwitch,jdbcType=INTEGER},
       </if>
+      <if test="projectId != null">
+        project_id = #{projectId,jdbcType=BIGINT},
+      </if>
+      <if test="buildingId != null">
+        building_id = #{buildingId,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -394,7 +424,9 @@
       data_amount_threshold = #{dataAmountThreshold,jdbcType=INTEGER},
       data_amount_threshold_alarm = #{dataAmountThresholdAlarm,jdbcType=INTEGER},
       data_accumulated_totals = #{dataAccumulatedTotals,jdbcType=INTEGER},
-      alert_switch = #{alertSwitch,jdbcType=INTEGER}
+      alert_switch = #{alertSwitch,jdbcType=INTEGER},
+      project_id = #{projectId,jdbcType=BIGINT},
+      building_id = #{buildingId,jdbcType=BIGINT}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>
\ No newline at end of file
diff --git a/data-center-business-dao/src/main/resources/mappers/ex/GatewayClientsMapperExt.xml b/data-center-business-dao/src/main/resources/mappers/ex/GatewayClientsMapperExt.xml
index 3e2baa2..07c1300 100644
--- a/data-center-business-dao/src/main/resources/mappers/ex/GatewayClientsMapperExt.xml
+++ b/data-center-business-dao/src/main/resources/mappers/ex/GatewayClientsMapperExt.xml
@@ -1,12 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.techsor.datacenter.business.dao.ex.GatewayClientsMapperExt">
-  <select id="getListPage" resultType="com.techsor.datacenter.business.model.GatewayClients">
+  <select id="getListPage" resultType="com.techsor.datacenter.business.dto.gateway.GatewayClientsQueryResponse">
     select
-      id as id,client_id as clientId,client_name as clientName,online_status as onlineStatus,last_updata_ts as lastUpdataTs,create_ts as createTs,address as address,
-      data_amount_threshold, data_amount_threshold_alarm,company_id as companyId,alert_switch as alertSwitch
+      gateway_clients.id as id,
+      gateway_clients.client_id as clientId,
+      gateway_clients.client_name as clientName,
+      gateway_clients.online_status as onlineStatus,
+      gateway_clients.last_updata_ts as lastUpdataTs,
+      gateway_clients.create_ts as createTs,
+      gateway_clients.address as address,
+      gateway_clients.data_amount_threshold,
+      gateway_clients.data_amount_threshold_alarm,
+      gateway_clients.company_id as companyId,
+      gateway_clients.alert_switch as alertSwitch,
+      gateway_clients.project_id as projectId,
+      gateway_clients.building_id as buildingId,
+      basic_project.project_name as projectName,
+      basic_building.name as buildingName
     from
       gateway_clients
+    left join basic_project on gateway_clients.project_id = basic_project.id
+    left join basic_building on gateway_clients.building_id = basic_building.building_id
     <where>
       <if test="param.clientId != null and param.clientId != ''">
         and gateway_clients.client_id = #{param.clientId}
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/gateway/GatewayClientsAddParam.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/gateway/GatewayClientsAddParam.java
index be38547..4ecc2d1 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/gateway/GatewayClientsAddParam.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/gateway/GatewayClientsAddParam.java
@@ -24,4 +24,10 @@ public class GatewayClientsAddParam {
 
 	@Schema(description ="alert switch", example = "1")
 	private Integer alertSwitch;
+
+	@Schema(description ="project id", example = "1")
+	private Long projectId;
+
+	@Schema(description ="building id", example = "1")
+	private Long buildingId;
 }
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/gateway/GatewayClientsEditParam.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/gateway/GatewayClientsEditParam.java
index 3c71609..2c391eb 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/gateway/GatewayClientsEditParam.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/gateway/GatewayClientsEditParam.java
@@ -23,4 +23,10 @@ public class GatewayClientsEditParam {
 
 	@Schema(description ="alert switch", example = "1")
 	private Integer alertSwitch;
+
+	@Schema(description ="project id", example = "1")
+	private Long projectId;
+
+	@Schema(description ="building id", example = "1")
+	private Long buildingId;
 }
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/gateway/GatewayClientsQueryResponse.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/gateway/GatewayClientsQueryResponse.java
new file mode 100644
index 0000000..b22707e
--- /dev/null
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/gateway/GatewayClientsQueryResponse.java
@@ -0,0 +1,37 @@
+package com.techsor.datacenter.business.dto.gateway;
+
+import lombok.Data;
+
+@Data
+public class GatewayClientsQueryResponse {
+
+    private Long id;
+
+    private String clientId;
+
+    private String clientName;
+
+    private Integer onlineStatus;
+
+    private Long lastUpdataTs;
+
+    private Long createTs;
+
+    private String address;
+
+    private Integer dataAmountThreshold;
+
+    private Boolean dataAmountThresholdAlarm;
+
+    private String companyId;
+
+    private Boolean alertSwitch;
+
+    private String projectId;
+
+    private String buildingId;
+
+    private String projectName;
+
+    private String buildingName;
+}
\ No newline at end of file
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/model/GatewayClients.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/model/GatewayClients.java
index cab6bd7..b9dbdce 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/model/GatewayClients.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/model/GatewayClients.java
@@ -120,6 +120,24 @@ public class GatewayClients implements Serializable {
      */
     private Integer alertSwitch;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gateway_clients.project_id
+     *
+     * @mbg.generated
+     */
+    private Long projectId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gateway_clients.building_id
+     *
+     * @mbg.generated
+     */
+    private Long buildingId;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table gateway_clients
@@ -440,6 +458,54 @@ public class GatewayClients implements Serializable {
         this.alertSwitch = alertSwitch;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gateway_clients.project_id
+     *
+     * @return the value of gateway_clients.project_id
+     *
+     * @mbg.generated
+     */
+    public Long getProjectId() {
+        return projectId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gateway_clients.project_id
+     *
+     * @param projectId the value for gateway_clients.project_id
+     *
+     * @mbg.generated
+     */
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gateway_clients.building_id
+     *
+     * @return the value of gateway_clients.building_id
+     *
+     * @mbg.generated
+     */
+    public Long getBuildingId() {
+        return buildingId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gateway_clients.building_id
+     *
+     * @param buildingId the value for gateway_clients.building_id
+     *
+     * @mbg.generated
+     */
+    public void setBuildingId(Long buildingId) {
+        this.buildingId = buildingId;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table gateway_clients
@@ -465,6 +531,8 @@ public class GatewayClients implements Serializable {
         sb.append(", dataAmountThresholdAlarm=").append(dataAmountThresholdAlarm);
         sb.append(", dataAccumulatedTotals=").append(dataAccumulatedTotals);
         sb.append(", alertSwitch=").append(alertSwitch);
+        sb.append(", projectId=").append(projectId);
+        sb.append(", buildingId=").append(buildingId);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/model/GatewayClientsExample.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/model/GatewayClientsExample.java
index 9a854ad..6be9baf 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/model/GatewayClientsExample.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/model/GatewayClientsExample.java
@@ -1003,6 +1003,126 @@ public class GatewayClientsExample {
             addCriterion("alert_switch not between", value1, value2, "alertSwitch");
             return (Criteria) this;
         }
+
+        public Criteria andProjectIdIsNull() {
+            addCriterion("project_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIsNotNull() {
+            addCriterion("project_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdEqualTo(Long value) {
+            addCriterion("project_id =", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotEqualTo(Long value) {
+            addCriterion("project_id <>", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdGreaterThan(Long value) {
+            addCriterion("project_id >", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("project_id >=", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLessThan(Long value) {
+            addCriterion("project_id <", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLessThanOrEqualTo(Long value) {
+            addCriterion("project_id <=", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIn(List<Long> values) {
+            addCriterion("project_id in", values, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotIn(List<Long> values) {
+            addCriterion("project_id not in", values, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdBetween(Long value1, Long value2) {
+            addCriterion("project_id between", value1, value2, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotBetween(Long value1, Long value2) {
+            addCriterion("project_id not between", value1, value2, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdIsNull() {
+            addCriterion("building_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdIsNotNull() {
+            addCriterion("building_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdEqualTo(Long value) {
+            addCriterion("building_id =", value, "buildingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdNotEqualTo(Long value) {
+            addCriterion("building_id <>", value, "buildingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdGreaterThan(Long value) {
+            addCriterion("building_id >", value, "buildingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("building_id >=", value, "buildingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdLessThan(Long value) {
+            addCriterion("building_id <", value, "buildingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdLessThanOrEqualTo(Long value) {
+            addCriterion("building_id <=", value, "buildingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdIn(List<Long> values) {
+            addCriterion("building_id in", values, "buildingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdNotIn(List<Long> values) {
+            addCriterion("building_id not in", values, "buildingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdBetween(Long value1, Long value2) {
+            addCriterion("building_id between", value1, value2, "buildingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdNotBetween(Long value1, Long value2) {
+            addCriterion("building_id not between", value1, value2, "buildingId");
+            return (Criteria) this;
+        }
     }
 
     /**
diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/GatewayClientsService.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/GatewayClientsService.java
index dbdf751..b0abbe4 100644
--- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/GatewayClientsService.java
+++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/GatewayClientsService.java
@@ -18,7 +18,7 @@ import java.util.List;
  */
 public interface GatewayClientsService {
 
-	PageInfo<GatewayClients> query(GatewayClientsQueryParam param, Long userId, Long companyId, Integer languageType);
+	PageInfo<GatewayClientsQueryResponse> query(GatewayClientsQueryParam param, Long userId, Long companyId, Integer languageType);
 
 	SimpleDataResponse add(GatewayClientsAddParam param, Long userId, Long companyId, Integer languageType);
 
diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/GatewayClientsServiceImpl.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/GatewayClientsServiceImpl.java
index b87042e..e5c7e93 100644
--- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/GatewayClientsServiceImpl.java
+++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/GatewayClientsServiceImpl.java
@@ -82,9 +82,9 @@ public class GatewayClientsServiceImpl implements GatewayClientsService {
 
 
 	@Override
-	public PageInfo<GatewayClients> query(GatewayClientsQueryParam param, Long userId, Long companyId, Integer languageType) {
+	public PageInfo<GatewayClientsQueryResponse> query(GatewayClientsQueryParam param, Long userId, Long companyId, Integer languageType) {
 		PageHelper.startPage(param.getPageNum() == null ? 1 : param.getPageNum(), param.getPageSize() == null ? 20 : param.getPageSize());
-		List<GatewayClients> resultList = gatewayClientsMapperExt.getListPage(param,companyId);
+		List<GatewayClientsQueryResponse> resultList = gatewayClientsMapperExt.getListPage(param,companyId);
 
 		return new PageInfo<>(resultList);
 	}
@@ -138,6 +138,8 @@ public class GatewayClientsServiceImpl implements GatewayClientsService {
 			insertObj.setCompanyId(companyId);
 			insertObj.setAlertSwitch(param.getAlertSwitch());
 			insertObj.setDataAmountThreshold(param.getDataAmountThreshold());
+			insertObj.setBuildingId(param.getBuildingId());
+			insertObj.setProjectId(param.getProjectId());
 			this.gatewayClientsMapperExt.insert(insertObj);
 
 			//Record log
@@ -178,6 +180,8 @@ public class GatewayClientsServiceImpl implements GatewayClientsService {
 			insertObj.setAddress(param.getAddress());
 			insertObj.setDataAmountThreshold(param.getDataAmountThreshold());
 			insertObj.setAlertSwitch(param.getAlertSwitch());
+			insertObj.setBuildingId(param.getBuildingId());
+			insertObj.setProjectId(param.getProjectId());
 			this.gatewayClientsMapperExt.updateByPrimaryKeySelective(insertObj);
 
 			//Record log

From d63db1cdff19e8d64205cab6ce83a3050d5e3484 Mon Sep 17 00:00:00 2001
From: "zhczyx@163.com" <zhczyx@163.com>
Date: Sun, 28 Dec 2025 22:44:53 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E7=BD=91=E5=85=B3=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=92=8C=E6=A5=BC=E5=AE=87?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/controller/GatewayClientsController.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/GatewayClientsController.java b/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/GatewayClientsController.java
index f4e3b8c..0dab79a 100644
--- a/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/GatewayClientsController.java
+++ b/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/GatewayClientsController.java
@@ -38,7 +38,7 @@ public class GatewayClientsController {
 
     @Operation(summary = "Get Gateway clients list by param", description = "")
     @PostMapping(path = "/getListPage")
-    public PageResponse<PageInfo<GatewayClients>> getBuildInFunctionList(
+    public PageResponse<PageInfo<GatewayClientsQueryResponse>> getBuildInFunctionList(
             @Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required = true) String LoginName,
             @Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required = true) String AccessToken,
             @Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required = true) Long UserId,
@@ -46,7 +46,7 @@ public class GatewayClientsController {
             @Parameter(name = "LanguageType", description = "Language type 0: Chinese 1: English 2: Japanese", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required = true) Integer LanguageType,
             @Parameter(name = "UTCOffset", description = "Offset between GMT and local time in minutes, e.g., -480 for GMT+8") @RequestHeader(required = true) Integer UTCOffset,
             @RequestBody GatewayClientsQueryParam param){
-        PageResponse<PageInfo<GatewayClients>> pageResponse = new PageResponse<>();
+        PageResponse<PageInfo<GatewayClientsQueryResponse>> pageResponse = new PageResponse<>();
         try {
             pageResponse.setData(gatewayClientsService.query(param, UserId, CompanyId, LanguageType));
             pageResponse.setCode(ResponseCode.SUCCESS);

From 14f8dcb5ddcb7638f0bd6395a37608baf3439e4e Mon Sep 17 00:00:00 2001
From: "zhczyx@163.com" <zhczyx@163.com>
Date: Mon, 29 Dec 2025 20:43:32 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DeviceConfigInfoImpl.java    | 64 ++++++++++---------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceConfigInfoImpl.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceConfigInfoImpl.java
index 444d687..f4cf363 100644
--- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceConfigInfoImpl.java
+++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceConfigInfoImpl.java
@@ -166,37 +166,36 @@ public class DeviceConfigInfoImpl implements IDeviceTypeService {
     public SimpleDataResponse addDeviceInfos(DeviceConfigParams deviceAddParams, Long userId, Long companyId, Integer languageType) {
 
         String deviceDataSrc=deviceAddParams.getDeviceDataSrc();
-        if (StringUtils.isBlank(deviceDataSrc)) {
-            return new SimpleDataResponse(SERVER_ERROR,  msgLanguageChange.getParameterMapByCode(languageType, "dataSrcNotExist"));
-        }
-        if (StringUtils.isBlank(deviceAddParams.getDeviceType())) {
-            return new SimpleDataResponse(SERVER_ERROR,  msgLanguageChange.getParameterMapByCode(languageType, "deviceTypeNotExist"));
-        }
-
-        if(MapUtils.isEmpty(deviceAddParams.getExpressionMap())){
-            return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "expressionMapNotExist"));
-        }
-
-        if(MapUtils.isEmpty(deviceAddParams.getExpressionMap())){
-            return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "expressionVariableMapNotExist"));
-        }
+//        if (StringUtils.isBlank(deviceDataSrc)) {
+//            return new SimpleDataResponse(SERVER_ERROR,  msgLanguageChange.getParameterMapByCode(languageType, "dataSrcNotExist"));
+//        }
+//        if (StringUtils.isBlank(deviceAddParams.getDeviceType())) {
+//            return new SimpleDataResponse(SERVER_ERROR,  msgLanguageChange.getParameterMapByCode(languageType, "deviceTypeNotExist"));
+//        }
+//
+//        if(MapUtils.isEmpty(deviceAddParams.getExpressionMap())){
+//            return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "expressionMapNotExist"));
+//        }
+//
+//        if(MapUtils.isEmpty(deviceAddParams.getExpressionMap())){
+//            return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "expressionVariableMapNotExist"));
+//        }
         if (MapUtils.isEmpty(deviceAddParams.getExpressionVariableMap())) {
             return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "deviceNameNotExist"));
         }
 //        if (!deviceAddParams.getExpressionMap().containsKey("$.deviceId")) {
 //            return new SimpleDataResponse(SERVER_ERROR, msgLanguageChange.getParameterMapByCode(languageType, "deviceIdNotExist"));
 //        }
-        DataSourceConfigExample dataSourceConfigExample=new DataSourceConfigExample();
-        dataSourceConfigExample.createCriteria().andCompanyIdEqualTo(companyId).andCodeEqualTo(deviceDataSrc).andFlagEqualTo(0);
-        long cnt = this.dataSourceConfigMapperExt.countByExample(dataSourceConfigExample);
-        if (cnt==0){
-            return new SimpleDataResponse(SERVER_ERROR,  msgLanguageChange.getParameterMapByCode(languageType, "dataSrcNotExist"));
-        }
+//        DataSourceConfigExample dataSourceConfigExample=new DataSourceConfigExample();
+//        dataSourceConfigExample.createCriteria().andCompanyIdEqualTo(companyId).andNameEqualTo(deviceAddParams.getName()).andFlagEqualTo(0);
+//        long cnt = this.dataSourceConfigMapperExt.countByExample(dataSourceConfigExample);
+//        if (cnt==0){
+//            return new SimpleDataResponse(SERVER_ERROR,  msgLanguageChange.getParameterMapByCode(languageType, "dataSrcNotExist"));
+//        }
 
         DeviceConfigInfoExample deviceConfigInfoExample=new DeviceConfigInfoExample();
-        deviceConfigInfoExample.createCriteria().andCompanyIdEqualTo(companyId).andFlagEqualTo(0).andDeviceDataSrcEqualTo(deviceDataSrc).andDeviceTypeEqualTo(deviceAddParams.getDeviceType());
+        deviceConfigInfoExample.createCriteria().andCompanyIdEqualTo(companyId).andFlagEqualTo(0).andNameEqualTo(deviceAddParams.getName());
         long result=this.deviceConfigInfoExtMapper.countByExample(deviceConfigInfoExample);
-
         if (result>0){
             return new SimpleDataResponse(SERVER_ERROR,  msgLanguageChange.getParameterMapByCode(languageType, "deviceConfigInfoExist"));
         }
@@ -207,15 +206,18 @@ public class DeviceConfigInfoImpl implements IDeviceTypeService {
         deviceConfigInfo.setCreatedTimestamp(new Date());
         deviceConfigInfo.setUpdatedTimestamp(new Date());
         deviceConfigInfo.setCreatedBy(userId);
-        if (languageType==0){
-            deviceConfigInfo.setNameZh(deviceAddParams.getName());
-        }
-        if (languageType==1){
-            deviceConfigInfo.setNameEn(deviceAddParams.getName());
-        }
-        if (languageType==2){
-            deviceConfigInfo.setName(deviceAddParams.getName());
-        }
+        deviceConfigInfo.setNameZh(deviceAddParams.getName());
+        deviceConfigInfo.setNameEn(deviceAddParams.getName());
+        deviceConfigInfo.setName(deviceAddParams.getName());
+//        if (languageType==0){
+//            deviceConfigInfo.setNameZh(deviceAddParams.getName());
+//        }
+//        if (languageType==1){
+//            deviceConfigInfo.setNameEn(deviceAddParams.getName());
+//        }
+//        if (languageType==2){
+//            deviceConfigInfo.setName(deviceAddParams.getName());
+//        }
         deviceConfigInfo.setUpdatedBy(userId);
         deviceConfigInfo.setExpressionMap(JSON.toJSONString(deviceAddParams.getExpressionMap()));
         deviceConfigInfo.setExpressionVariableMap(JSON.toJSONString(deviceAddParams.getExpressionVariableMap()));

From 5b266065742cce52ac45979d11c17b4d6a3d287b Mon Sep 17 00:00:00 2001
From: "zhczyx@163.com" <zhczyx@163.com>
Date: Tue, 30 Dec 2025 21:04:53 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E3=80=81=E6=9F=A5=E8=AF=A2=E9=83=BD=E5=A2=9E=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?gateway=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/config/language/msg/msg_cn.yml  |  1 +
 .../resources/config/language/msg/msg_en.yml  |  3 +-
 .../resources/config/language/msg/msg_jp.yml  |  1 +
 .../db/migration/V65__device_update.sql       |  2 +
 .../mappers/auto/DeviceInfoMapper.xml         | 49 ++++++++++-----
 .../mappers/ex/DeviceInfoMapperExt.xml        |  7 ++-
 .../business/dto/device/DeviceAddParams.java  |  3 +
 .../dto/device/DeviceUpdateParams.java        |  3 +
 .../deviceinfo/DeviceInfoExcel.java           |  3 +
 .../datacenter/business/model/DeviceInfo.java | 34 +++++++++++
 .../business/model/DeviceInfoExample.java     | 60 +++++++++++++++++++
 .../business/vo/device/DeviceVO.java          |  2 +
 .../service/impl/DeviceServiceImpl.java       | 28 +++++++++
 13 files changed, 179 insertions(+), 17 deletions(-)
 create mode 100644 data-center-business-controller/src/main/resources/db/migration/V65__device_update.sql

diff --git a/data-center-business-common/src/main/resources/config/language/msg/msg_cn.yml b/data-center-business-common/src/main/resources/config/language/msg/msg_cn.yml
index e3679f4..519632e 100644
--- a/data-center-business-common/src/main/resources/config/language/msg/msg_cn.yml
+++ b/data-center-business-common/src/main/resources/config/language/msg/msg_cn.yml
@@ -18,6 +18,7 @@ msgcn:
         buildingNameDoesNotExist: 楼宇名称不存在
         floorNameHasExisted: 楼层名称已存在
         floorNameDoesNotExist: 楼层名称不存在
+        gatewayClientDoesNotExist: 网关不存在
         buildingNotFound: 不存在该楼宇
         fbNotSameCompany: 需与楼宇归属于同一企业
         spaceNameHasExisted: 房间名称已存在
diff --git a/data-center-business-common/src/main/resources/config/language/msg/msg_en.yml b/data-center-business-common/src/main/resources/config/language/msg/msg_en.yml
index 2303bda..2390b0f 100644
--- a/data-center-business-common/src/main/resources/config/language/msg/msg_en.yml
+++ b/data-center-business-common/src/main/resources/config/language/msg/msg_en.yml
@@ -26,7 +26,8 @@ msgen:
         assetNameHasExisted: Asset name already exists.
         assetSymbolHasExisted: Asset symbol already exists.
         assetNameDoesNotExist: Asset name does not exist.
-        assetSymbolDoesNotExist: 资产记号不存在
+        gatewayClientDoesNotExist: Gateway client does not exist.
+        assetSymbolDoesNotExist: Asset symbol does not exist.
         spaceNotFound: Room not found.
         faNotSameCompany: Must belong to the same company as the room.
         bindedDevice: Device is bound.
diff --git a/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml b/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml
index 21bf390..0317610 100644
--- a/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml
+++ b/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml
@@ -27,6 +27,7 @@ msgjp:
         assetSymbolHasExisted: 記号はすでに存在します
         assetNameDoesNotExist: 該当資産名がない
         assetSymbolDoesNotExist: 資産記号が存在しません
+        gatewayClientDoesNotExist: 該当ゲートウェイが存在しません
         spaceNotFound: 該当空間がない
         faNotSameCompany: 空間と同じ会社に所属してください
         bindedDevice: 登録されたデバイスは存在しています
diff --git a/data-center-business-controller/src/main/resources/db/migration/V65__device_update.sql b/data-center-business-controller/src/main/resources/db/migration/V65__device_update.sql
new file mode 100644
index 0000000..6ed449d
--- /dev/null
+++ b/data-center-business-controller/src/main/resources/db/migration/V65__device_update.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `device_info`
+ADD COLUMN `gateway_client_id` INT NULL DEFAULT NULL AFTER `asset_id`;
diff --git a/data-center-business-dao/src/main/resources/mappers/auto/DeviceInfoMapper.xml b/data-center-business-dao/src/main/resources/mappers/auto/DeviceInfoMapper.xml
index 06fb28f..d96da25 100644
--- a/data-center-business-dao/src/main/resources/mappers/auto/DeviceInfoMapper.xml
+++ b/data-center-business-dao/src/main/resources/mappers/auto/DeviceInfoMapper.xml
@@ -16,6 +16,7 @@
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="building_id" jdbcType="BIGINT" property="buildingId" />
     <result column="asset_id" jdbcType="BIGINT" property="assetId" />
+    <result column="gateway_client_id" jdbcType="INTEGER" property="gatewayClientId" />
     <result column="flag" jdbcType="INTEGER" property="flag" />
     <result column="company_id" jdbcType="BIGINT" property="companyId" />
     <result column="created_by" jdbcType="BIGINT" property="createdBy" />
@@ -111,9 +112,9 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, device_id, device_sn, type_id, wsclient_id, space_id, device_name, remark, building_id, 
-    asset_id, flag, company_id, created_by, created_timestamp, updated_by, updated_timestamp, 
-    project_id, floor_id, monitoring_point_name, monitoring_point_category_id, data_provider_id, 
-    gateway_info_id, alarm_level, retain_alert, unit
+    asset_id, gateway_client_id, flag, company_id, created_by, created_timestamp, updated_by, 
+    updated_timestamp, project_id, floor_id, monitoring_point_name, monitoring_point_category_id, 
+    data_provider_id, gateway_info_id, alarm_level, retain_alert, unit
   </sql>
   <sql id="Blob_Column_List">
     <!--
@@ -203,21 +204,23 @@
     insert into device_info (device_id, device_sn, type_id, 
       wsclient_id, space_id, device_name, 
       remark, building_id, asset_id, 
-      flag, company_id, created_by, 
-      created_timestamp, updated_by, updated_timestamp, 
-      project_id, floor_id, monitoring_point_name, 
-      monitoring_point_category_id, data_provider_id, 
-      gateway_info_id, alarm_level, retain_alert, 
-      unit, data_mapping)
+      gateway_client_id, flag, company_id, 
+      created_by, created_timestamp, updated_by, 
+      updated_timestamp, project_id, floor_id, 
+      monitoring_point_name, monitoring_point_category_id, 
+      data_provider_id, gateway_info_id, alarm_level, 
+      retain_alert, unit, data_mapping
+      )
     values (#{deviceId,jdbcType=VARCHAR}, #{deviceSn,jdbcType=VARCHAR}, #{typeId,jdbcType=INTEGER}, 
       #{wsclientId,jdbcType=INTEGER}, #{spaceId,jdbcType=BIGINT}, #{deviceName,jdbcType=VARCHAR}, 
       #{remark,jdbcType=VARCHAR}, #{buildingId,jdbcType=BIGINT}, #{assetId,jdbcType=BIGINT}, 
-      #{flag,jdbcType=INTEGER}, #{companyId,jdbcType=BIGINT}, #{createdBy,jdbcType=BIGINT}, 
-      #{createdTimestamp,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=BIGINT}, #{updatedTimestamp,jdbcType=BIGINT}, 
-      #{projectId,jdbcType=BIGINT}, #{floorId,jdbcType=BIGINT}, #{monitoringPointName,jdbcType=VARCHAR}, 
-      #{monitoringPointCategoryId,jdbcType=BIGINT}, #{dataProviderId,jdbcType=BIGINT}, 
-      #{gatewayInfoId,jdbcType=BIGINT}, #{alarmLevel,jdbcType=INTEGER}, #{retainAlert,jdbcType=INTEGER}, 
-      #{unit,jdbcType=VARCHAR}, #{dataMapping,jdbcType=LONGVARCHAR})
+      #{gatewayClientId,jdbcType=INTEGER}, #{flag,jdbcType=INTEGER}, #{companyId,jdbcType=BIGINT}, 
+      #{createdBy,jdbcType=BIGINT}, #{createdTimestamp,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=BIGINT}, 
+      #{updatedTimestamp,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{floorId,jdbcType=BIGINT}, 
+      #{monitoringPointName,jdbcType=VARCHAR}, #{monitoringPointCategoryId,jdbcType=BIGINT}, 
+      #{dataProviderId,jdbcType=BIGINT}, #{gatewayInfoId,jdbcType=BIGINT}, #{alarmLevel,jdbcType=INTEGER}, 
+      #{retainAlert,jdbcType=INTEGER}, #{unit,jdbcType=VARCHAR}, #{dataMapping,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.techsor.datacenter.business.model.DeviceInfo">
     <!--
@@ -256,6 +259,9 @@
       <if test="assetId != null">
         asset_id,
       </if>
+      <if test="gatewayClientId != null">
+        gateway_client_id,
+      </if>
       <if test="flag != null">
         flag,
       </if>
@@ -333,6 +339,9 @@
       <if test="assetId != null">
         #{assetId,jdbcType=BIGINT},
       </if>
+      <if test="gatewayClientId != null">
+        #{gatewayClientId,jdbcType=INTEGER},
+      </if>
       <if test="flag != null">
         #{flag,jdbcType=INTEGER},
       </if>
@@ -430,6 +439,9 @@
       <if test="record.assetId != null">
         asset_id = #{record.assetId,jdbcType=BIGINT},
       </if>
+      <if test="record.gatewayClientId != null">
+        gateway_client_id = #{record.gatewayClientId,jdbcType=INTEGER},
+      </if>
       <if test="record.flag != null">
         flag = #{record.flag,jdbcType=INTEGER},
       </if>
@@ -499,6 +511,7 @@
       remark = #{record.remark,jdbcType=VARCHAR},
       building_id = #{record.buildingId,jdbcType=BIGINT},
       asset_id = #{record.assetId,jdbcType=BIGINT},
+      gateway_client_id = #{record.gatewayClientId,jdbcType=INTEGER},
       flag = #{record.flag,jdbcType=INTEGER},
       company_id = #{record.companyId,jdbcType=BIGINT},
       created_by = #{record.createdBy,jdbcType=BIGINT},
@@ -535,6 +548,7 @@
       remark = #{record.remark,jdbcType=VARCHAR},
       building_id = #{record.buildingId,jdbcType=BIGINT},
       asset_id = #{record.assetId,jdbcType=BIGINT},
+      gateway_client_id = #{record.gatewayClientId,jdbcType=INTEGER},
       flag = #{record.flag,jdbcType=INTEGER},
       company_id = #{record.companyId,jdbcType=BIGINT},
       created_by = #{record.createdBy,jdbcType=BIGINT},
@@ -588,6 +602,9 @@
       <if test="assetId != null">
         asset_id = #{assetId,jdbcType=BIGINT},
       </if>
+      <if test="gatewayClientId != null">
+        gateway_client_id = #{gatewayClientId,jdbcType=INTEGER},
+      </if>
       <if test="flag != null">
         flag = #{flag,jdbcType=INTEGER},
       </if>
@@ -654,6 +671,7 @@
       remark = #{remark,jdbcType=VARCHAR},
       building_id = #{buildingId,jdbcType=BIGINT},
       asset_id = #{assetId,jdbcType=BIGINT},
+      gateway_client_id = #{gatewayClientId,jdbcType=INTEGER},
       flag = #{flag,jdbcType=INTEGER},
       company_id = #{companyId,jdbcType=BIGINT},
       created_by = #{createdBy,jdbcType=BIGINT},
@@ -687,6 +705,7 @@
       remark = #{remark,jdbcType=VARCHAR},
       building_id = #{buildingId,jdbcType=BIGINT},
       asset_id = #{assetId,jdbcType=BIGINT},
+      gateway_client_id = #{gatewayClientId,jdbcType=INTEGER},
       flag = #{flag,jdbcType=INTEGER},
       company_id = #{companyId,jdbcType=BIGINT},
       created_by = #{createdBy,jdbcType=BIGINT},
diff --git a/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml b/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
index 58971d9..816896f 100644
--- a/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
+++ b/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
@@ -53,7 +53,8 @@
         device_info.data_provider_id, data_provider.name dataProviderName, device_info.retain_alert,
         device_info.gateway_info_id, data_provider_gateway_info.name gatewayInfoName, device_info.alarm_level,
         device_info.unit,device_info.data_mapping,
-        dashboard_device_group.id deviceGroupId, dashboard_device_group.name deviceGroupName
+        dashboard_device_group.id deviceGroupId, dashboard_device_group.name deviceGroupName,
+        gateway_clients.client_name gatewayClientName
         from
         device_info
         left join basic_project on device_info.project_id = basic_project.id
@@ -69,6 +70,7 @@
         left join device_alert_config dac on device_info.id=dac.device_config_id and dac.flag = 0
         left join dashboard_device_group_relation on dashboard_device_group_relation.device_info_id = device_info.id
         left join dashboard_device_group on dashboard_device_group_relation.device_group_id = dashboard_device_group.id
+        left join gateway_clients on gateway_clients.client_id = device_info.gateway_client_id
         <if test="deviceVO.targetIdValue != null ">
             left join target_id_check tic on dac.id = tic.alert_config_id
         </if>
@@ -103,6 +105,9 @@
             <if test="deviceVO.floorId != null ">
                 and basic_floor.floor_id = #{deviceVO.floorId}
             </if>
+            <if test="deviceVO.gatewayClientName != null ">
+                and gateway_clients.client_name like concat('%', #{deviceVO.gatewayClientName}, '%')
+            </if>
             <if test="deviceVO.targetIdValue != null ">
                 and tic.target_id_value = #{deviceVO.targetIdValue}
             </if>
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/device/DeviceAddParams.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/device/DeviceAddParams.java
index a03bf98..6e61bf4 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/device/DeviceAddParams.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/device/DeviceAddParams.java
@@ -37,6 +37,9 @@ public class DeviceAddParams {
     @Schema(description = "Asset ID", example = "Asset-ID")
     private Long assetId;
 
+    @Schema(description = "gatewayClientId", example = "1")
+    private Integer gatewayClientId;
+
     @Schema(description = "Floor ID", example = "Floor-ID")
     private Long floorId;
     
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/device/DeviceUpdateParams.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/device/DeviceUpdateParams.java
index c1c9d53..44294a0 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/device/DeviceUpdateParams.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/device/DeviceUpdateParams.java
@@ -38,6 +38,9 @@ public class DeviceUpdateParams {
     @Schema(description = "Asset ID", example = "Asset ID")
     private Long assetId;
 
+    @Schema(description = "gatewayClientId", example = "gatewayClientId")
+    private Integer gatewayClientId;
+
     @Schema(description = "Floor ID", example = "Floor ID")
     private Long floorId;
     
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcel.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcel.java
index d2a0534..93a3976 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcel.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcel.java
@@ -27,6 +27,9 @@ public class DeviceInfoExcel {
     @ExcelProperty(value ="资产记号")
     private String assetSymbol;
 
+    @ExcelProperty(value ="网关ID")
+    private String gatewayClientId;
+
     @ExcelProperty(value ="设备ID")
     private String deviceId;
 
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/model/DeviceInfo.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/model/DeviceInfo.java
index 93441ee..1842518 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/model/DeviceInfo.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/model/DeviceInfo.java
@@ -94,6 +94,15 @@ public class DeviceInfo implements Serializable {
      */
     private Long assetId;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column device_info.gateway_client_id
+     *
+     * @mbg.generated
+     */
+    private Integer gatewayClientId;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -486,6 +495,30 @@ public class DeviceInfo implements Serializable {
         this.assetId = assetId;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column device_info.gateway_client_id
+     *
+     * @return the value of device_info.gateway_client_id
+     *
+     * @mbg.generated
+     */
+    public Integer getGatewayClientId() {
+        return gatewayClientId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column device_info.gateway_client_id
+     *
+     * @param gatewayClientId the value for device_info.gateway_client_id
+     *
+     * @mbg.generated
+     */
+    public void setGatewayClientId(Integer gatewayClientId) {
+        this.gatewayClientId = gatewayClientId;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column device_info.flag
@@ -892,6 +925,7 @@ public class DeviceInfo implements Serializable {
         sb.append(", remark=").append(remark);
         sb.append(", buildingId=").append(buildingId);
         sb.append(", assetId=").append(assetId);
+        sb.append(", gatewayClientId=").append(gatewayClientId);
         sb.append(", flag=").append(flag);
         sb.append(", companyId=").append(companyId);
         sb.append(", createdBy=").append(createdBy);
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/model/DeviceInfoExample.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/model/DeviceInfoExample.java
index 570e8b8..a10b10b 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/model/DeviceInfoExample.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/model/DeviceInfoExample.java
@@ -835,6 +835,66 @@ public class DeviceInfoExample {
             return (Criteria) this;
         }
 
+        public Criteria andGatewayClientIdIsNull() {
+            addCriterion("gateway_client_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGatewayClientIdIsNotNull() {
+            addCriterion("gateway_client_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGatewayClientIdEqualTo(Integer value) {
+            addCriterion("gateway_client_id =", value, "gatewayClientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGatewayClientIdNotEqualTo(Integer value) {
+            addCriterion("gateway_client_id <>", value, "gatewayClientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGatewayClientIdGreaterThan(Integer value) {
+            addCriterion("gateway_client_id >", value, "gatewayClientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGatewayClientIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("gateway_client_id >=", value, "gatewayClientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGatewayClientIdLessThan(Integer value) {
+            addCriterion("gateway_client_id <", value, "gatewayClientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGatewayClientIdLessThanOrEqualTo(Integer value) {
+            addCriterion("gateway_client_id <=", value, "gatewayClientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGatewayClientIdIn(List<Integer> values) {
+            addCriterion("gateway_client_id in", values, "gatewayClientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGatewayClientIdNotIn(List<Integer> values) {
+            addCriterion("gateway_client_id not in", values, "gatewayClientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGatewayClientIdBetween(Integer value1, Integer value2) {
+            addCriterion("gateway_client_id between", value1, value2, "gatewayClientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGatewayClientIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("gateway_client_id not between", value1, value2, "gatewayClientId");
+            return (Criteria) this;
+        }
+
         public Criteria andFlagIsNull() {
             addCriterion("flag is null");
             return (Criteria) this;
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java
index 4546b7f..d7a7d3f 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java
@@ -65,6 +65,8 @@ public class DeviceVO {
 
     private String assetSymbol;
 
+    private String gatewayClientName;
+
     private Integer flag;
 
     private Long companyId;
diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceServiceImpl.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceServiceImpl.java
index 2211544..f582b27 100644
--- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceServiceImpl.java
+++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceServiceImpl.java
@@ -147,6 +147,9 @@ public class DeviceServiceImpl implements IDeviceService {
     @Resource
     private NotificationService notificationService;
 
+    @Resource
+    private GatewayClientsMapperExt gatewayClientsMapperExt;
+
     @Resource
     private DeviceAlertTemplateMapperExt deviceAlertTemplateMapperExt;
     
@@ -844,6 +847,12 @@ public class DeviceServiceImpl implements IDeviceService {
                     errorList.add(msgLanguageChange.getParameterMapByCode(languageType, "assetSymbolDoesNotExist"));
                 }
 
+                // Floor Check
+                boolean gatewayClientExist = checkGatewayClient(deviceInfoExcel.getGatewayClientId(), companyId, deviceInfo);
+                if (!floorExists) {
+                    errorList.add(msgLanguageChange.getParameterMapByCode(languageType, "floorNameDoesNotExist"));
+                }
+
                 // Device Type Check
                 boolean deviceExists  = checkDeviceType(deviceInfoExcel.getDeviceType(), companyId);
                 if (!deviceExists) {
@@ -2087,6 +2096,25 @@ public class DeviceServiceImpl implements IDeviceService {
         }
     }
 
+
+    private boolean checkGatewayClient(String gatewayClientName, long companyId, DeviceInfo deviceInfo) {
+        if (StringUtils.isBlank(gatewayClientName)) {
+            return true;
+        } else {
+            GatewayClientsExample gatewayClientsExample = new GatewayClientsExample();
+            gatewayClientsExample.createCriteria().andClientNameEqualTo(gatewayClientName).andCompanyIdEqualTo(companyId).andFlagEqualTo(0);
+            List<GatewayClients> assetList = this.gatewayClientsMapperExt.selectByExample(gatewayClientsExample);
+            if (CollectionUtils.isEmpty(assetList)) {
+                return false;
+            } else {
+                deviceInfo.setGatewayClientId(assetList.get(assetList.size()-1).getId());
+                return true;
+            }
+        }
+    }
+
+
+
     private boolean checkDeviceType(String deviceType, long companyId) {
         if (StringUtils.isBlank(deviceType)) {
             return false;

From e5960d9c56c316066dbc48352a5522f8747ffd4f Mon Sep 17 00:00:00 2001
From: "zhczyx@163.com" <zhczyx@163.com>
Date: Tue, 30 Dec 2025 22:38:37 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20/gateway/clients/get?=
 =?UTF-8?q?All=20=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/GatewayClientsController.java      | 15 +++++++++++++++
 .../business/dao/ex/GatewayClientsMapperExt.java  |  1 +
 .../resources/mappers/ex/DeviceInfoMapperExt.xml  |  3 ++-
 .../datacenter/business/vo/device/DeviceVO.java   |  2 ++
 .../business/service/GatewayClientsService.java   |  1 +
 .../service/impl/GatewayClientsServiceImpl.java   |  6 ++++++
 6 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/GatewayClientsController.java b/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/GatewayClientsController.java
index 0dab79a..e767ba9 100644
--- a/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/GatewayClientsController.java
+++ b/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/GatewayClientsController.java
@@ -11,6 +11,7 @@ import com.techsor.datacenter.business.model.GatewayClients;
 import com.techsor.datacenter.business.service.GatewayClientsService;
 import com.techsor.datacenter.business.vo.device.BuildInFunctionVO;
 import com.techsor.datacenter.business.vo.device.DeviceVO;
+import com.techsor.datacenter.business.vo.floor.FloorPageVO;
 import com.techsor.datacenter.business.vo.gateway.GatewayClientsStatisticsCount;
 import com.techsor.datacenter.business.vo.gateway.GatewayClientsStatisticsVO;
 
@@ -59,6 +60,20 @@ public class GatewayClientsController {
         return pageResponse;
     }
 
+    @Operation(summary = "Get Gateway clients ", description = "")
+    @PostMapping(path = "/getAll")
+    public SimpleDataResponse<List<GatewayClientsQueryResponse>> getBuildInFunctionList(
+            @Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required = true) String LoginName,
+            @Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required = true) String AccessToken,
+            @Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required = true) Long UserId,
+            @Parameter(name = "CompanyId", description = "User's company ID", required = false, schema = @Schema(defaultValue = "1")) @RequestHeader(required = false) Long CompanyId,
+            @Parameter(name = "LanguageType", description = "Language type 0: Chinese 1: English 2: Japanese", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required = true) Integer LanguageType,
+            @Parameter(name = "UTCOffset", description = "Offset between GMT and local time in minutes, e.g., -480 for GMT+8") @RequestHeader(required = true) Integer UTCOffset
+            ){
+        SimpleDataResponse dataResponse =SimpleDataResponse.success(gatewayClientsService.getAll(CompanyId, UserId, LanguageType));
+        return dataResponse;
+    }
+
     @Operation(summary = "add", description = "")
     @PostMapping(path = "/add")
     public SimpleDataResponse add(
diff --git a/data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/ex/GatewayClientsMapperExt.java b/data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/ex/GatewayClientsMapperExt.java
index bcb0dbd..eb62a34 100644
--- a/data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/ex/GatewayClientsMapperExt.java
+++ b/data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/ex/GatewayClientsMapperExt.java
@@ -22,6 +22,7 @@ import java.util.Map;
 @Mapper
 public interface GatewayClientsMapperExt extends GatewayClientsMapper {
 
+    List<GatewayClientsQueryResponse> getAll(@Param("companyId") Long companyId);
     List<GatewayClientsQueryResponse> getListPage(@Param("param") GatewayClientsQueryParam param, @Param("companyId") Long companyId);
 
 }
diff --git a/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml b/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
index 816896f..288c30b 100644
--- a/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
+++ b/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
@@ -54,7 +54,8 @@
         device_info.gateway_info_id, data_provider_gateway_info.name gatewayInfoName, device_info.alarm_level,
         device_info.unit,device_info.data_mapping,
         dashboard_device_group.id deviceGroupId, dashboard_device_group.name deviceGroupName,
-        gateway_clients.client_name gatewayClientName
+        gateway_clients.client_name gatewayClientName,
+        device_category.category_name_jp categoryName
         from
         device_info
         left join basic_project on device_info.project_id = basic_project.id
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java
index d7a7d3f..05d6dfc 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java
@@ -44,6 +44,7 @@ public class DeviceVO {
     private Long typeId;
 
     private Long categoryId;
+    private Long categoryName;
 
     private String typeName;
 
@@ -65,6 +66,7 @@ public class DeviceVO {
 
     private String assetSymbol;
 
+    private String gatewayId;
     private String gatewayClientName;
 
     private Integer flag;
diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/GatewayClientsService.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/GatewayClientsService.java
index b0abbe4..dad7173 100644
--- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/GatewayClientsService.java
+++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/GatewayClientsService.java
@@ -18,6 +18,7 @@ import java.util.List;
  */
 public interface GatewayClientsService {
 
+	List<GatewayClientsQueryResponse> getAll(Long userId, Long companyId, Integer languageType);
 	PageInfo<GatewayClientsQueryResponse> query(GatewayClientsQueryParam param, Long userId, Long companyId, Integer languageType);
 
 	SimpleDataResponse add(GatewayClientsAddParam param, Long userId, Long companyId, Integer languageType);
diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/GatewayClientsServiceImpl.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/GatewayClientsServiceImpl.java
index e5c7e93..4384528 100644
--- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/GatewayClientsServiceImpl.java
+++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/GatewayClientsServiceImpl.java
@@ -89,6 +89,12 @@ public class GatewayClientsServiceImpl implements GatewayClientsService {
 		return new PageInfo<>(resultList);
 	}
 
+	@Override
+	public List<GatewayClientsQueryResponse> getAll(Long userId, Long companyId, Integer languageType) {
+		List<GatewayClientsQueryResponse> resultList = gatewayClientsMapperExt.getListPage(null,companyId);
+		return resultList;
+	}
+
 
 	@Override
 	public SimpleDataResponse count(Long userId, Long companyId, Integer languageType) {

From 2d255c4b649b080e969451354ee7b385927583bd Mon Sep 17 00:00:00 2001
From: "zhczyx@163.com" <zhczyx@163.com>
Date: Wed, 31 Dec 2025 14:46:57 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=94=AF=E6=8C=81GatewayClientId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/controller/DeviceController.java |   1 -
 .../controller/GatewayClientsController.java  |   2 +-
 .../resources/template/deviceInfo_zh.xlsx     | Bin 11083 -> 11118 bytes
 .../resources/template/en/deviceInfo_en.xlsx  | Bin 10927 -> 10951 bytes
 .../resources/template/jp/deviceInfo_jp.xlsx  | Bin 11266 -> 11249 bytes
 .../mappers/ex/DeviceInfoMapperExt.xml        |   3 ++-
 .../mappers/ex/GatewayClientsMapperExt.xml    |  24 ++++++++++++++++++
 .../dto/device/DeviceSearchParams.java        |   3 +++
 .../deviceinfo/DeviceInfoExcelCn.java         |   3 +++
 .../deviceinfo/DeviceInfoExcelEn.java         |   3 +++
 .../deviceinfo/DeviceInfoExcelJp.java         |   3 +++
 .../business/vo/device/DeviceVO.java          |   2 +-
 .../service/impl/DeviceServiceImpl.java       |  10 ++++----
 .../impl/GatewayClientsServiceImpl.java       |   2 +-
 14 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/DeviceController.java b/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/DeviceController.java
index c5870bb..f8f2350 100644
--- a/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/DeviceController.java
+++ b/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/DeviceController.java
@@ -366,7 +366,6 @@ public class DeviceController {
             @Parameter(name = "UTCOffset", description = "Offset between GMT and local time in minutes, e.g., -480 for GMT+8") @RequestHeader(required = true) Integer UTCOffset,
             @RequestBody MultipartFile files,
             HttpServletResponse response) {
-
         return this.deviceExcelService.importDeviceInfosExcelFiles(wsClientId, files, UserId, CompanyId, LanguageType);
     }
 
diff --git a/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/GatewayClientsController.java b/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/GatewayClientsController.java
index e767ba9..6145cd7 100644
--- a/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/GatewayClientsController.java
+++ b/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/GatewayClientsController.java
@@ -70,7 +70,7 @@ public class GatewayClientsController {
             @Parameter(name = "LanguageType", description = "Language type 0: Chinese 1: English 2: Japanese", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required = true) Integer LanguageType,
             @Parameter(name = "UTCOffset", description = "Offset between GMT and local time in minutes, e.g., -480 for GMT+8") @RequestHeader(required = true) Integer UTCOffset
             ){
-        SimpleDataResponse dataResponse =SimpleDataResponse.success(gatewayClientsService.getAll(CompanyId, UserId, LanguageType));
+        SimpleDataResponse dataResponse =SimpleDataResponse.success(gatewayClientsService.getAll(UserId, CompanyId, LanguageType));
         return dataResponse;
     }
 
diff --git a/data-center-business-controller/src/main/resources/template/deviceInfo_zh.xlsx b/data-center-business-controller/src/main/resources/template/deviceInfo_zh.xlsx
index 0a73421c70182770a35f768ded20084898a8ac96..7cfd4211b6907549bb0ae7941645ae311f8cfc64 100644
GIT binary patch
delta 4032
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

delta 3929
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
Z@0XwqKugrof84cD3W9=UWxT(Q{sDorP>BEl

diff --git a/data-center-business-controller/src/main/resources/template/en/deviceInfo_en.xlsx b/data-center-business-controller/src/main/resources/template/en/deviceInfo_en.xlsx
index 025f49fac5118caf01b270615ed0888814028d73..b9a9b448b0c950aee527bce44ac9af7ad49a359a 100644
GIT binary patch
delta 3894
zcmeHKXEYq_x}6CUz4uNK#zgOl7TxGXh&DrXLPT^KoeY8*5uMR{Cptlh8Z{WAOo;v|
ziQbNUXRY&{`>ngqTIbjObKf8Dul>C1U3)+KDV2}=9#<6t3GDD>RWyMBfHkTL$OyN9
zbPG{O?BZQ3^#`WCmU@NW>FnR@3Wloe3vk(+)oUmrXAc+C8q9X|TD2A=bu*cf0;D+y
z?Fwl%NeqY(a$k1SVMx>PD5UzpEx{iAF5S33jJO^;%GuGXp2Au7buZ5u50eCasD_LX
zdWX)aM?hU>NO8r3oz>}{JKZmO1&6eKLe%Is<1t4ri_=2+3X`y;>!k@%Z`DUs^DtW_
zcibb;w}9h}%y<-68&5~OE_}0fd9?L0#!ZqeuL@m8BHUfrw4`a%3J6m3rrob7UYp6w
z9qS%KW`_~L0mBje2?f{kpK%3;v9A2;`_De4K~-WcT3~LPOWv+mRfQf+Fq{<ZVhYaD
z6%I|~TFmDqxTYm)HL&`TFLQ4-+rr6yE54h$$UWG}f<>TLyC}0nkNy%II}~Rv{|2#+
z;1We@y}75b;GcDkxM0$Q;NVgN004YIqz+a=Hni`h;tk8;C=DEDxY=)(gBE|Y?4LG>
zY<k<!UBD7Wh8Ss!6#GW#YLMzF({ug&hlF4yLU1|k<;jRQ5(TzwmY6C2D4|*iP{YU7
zgcyqZp+X9$MACyhWzhU%jO7MZPiVn4gV8Imh1wX+b6u7wFa^*pbNR^8f%46;*np?!
zTCNc~Qg9Xt_~_)TyN_WjGkiPjiVlRU4jCI=S5$Z2ww{h$(wZ{(R@H7zwI4T|dW7tT
zHow$<7cw2Pp975w&x`Smq8RD+p|lEjh#>DLu<D&&Wx_vG5(Wm-X0TmGRLVN9{cyc@
z`4<04OaNj@JHZ#nhvw?5>q!)35U8NHe;904Pw?=;h2of<M?+I!>rW-)T+h>)x~Zom
z@+<h(Ts>S}6lezznd?tcnX!!yt22aak{d9WDg8n;!<oZY=x!W<Ox|-oYnvsW5!H^X
zNVxGeDT5pr06-I=*a#Tl!U8_7F7?LR9&-}Z3*H6ZOHdgLX)Z<0NnLJR%2_AozBg1K
zHW+z02yEh^fYG`Zt;%r=va#+H&OmlN4KAA53>`Wy;GREx(I2p|vKly$@c=|aHA@Yf
zRwEs@PN;GbSLwK_@ex*jJI)2cr(?*-xl=MaID5RPt;yjwm1+Rr35w9t9(%eKu<Z-7
zoJiz-vLY5L58*J(fq|Z64sdg8a3^{Q?p=O{5De;-!@ya&O5pe4f<jIKgVc?uZ}QR|
z_N>ZHE6N(qS4__+H8i89&T7}Nj+geOWXCdB`QW5SZ}Pot68!3&zwxRq6j9hSdQ-Eo
z^K&0Ge6|Y0GKauhVCfr?AoDHqsRy#Qrp>k$^HOs@)oSFdK1N@N@>Tpa#T08b-Uah-
z4D%4+&}wh8XuLQ4MHp8p9CApwpE72!6U(Cgyn?T=x_}^&(4+42;#hvB;YgtaDNzB>
z^RPy7<XX^vY_(=rGJCb1cb%%$FLYVEktz(IwynJXvRWM8QB<<7DMMg^4B2X0>Zn$(
zEOZFl#@y3yN4wO2T{2rCjU6{}9|gGGvn^;&Kq1dJ&AyKNtVh5m$s*hEyP47v{5cW>
z`~nTwkE+b=#;v=gS@&6=_bfYqx+{t3!qoY))i2CNbx$MW=GlMU8FTn42O=FPoe37?
zzj7<Hk)ne;{h^iWd=S#!vMVd)7530&RureS(|f-?;yWQ2?xO~!Zw&oj27{zAxC|Wy
zNCs#QjoTuvPZ=9^XAodDp_y=cJl!agGJ4{&`|1<IBFlOewbc;&rIy92m8rRG4D<(X
zvUVOXixdmTJG&3t7ju8G&7?~UN6N5%r*Of}bXviI3*e8vS)6#K-lA~qw~w!5C8MS-
zaG!Gy@d0JBZ#T$<@L=nr@zbJe1#+g9!OgFKrA1}6L>0a9nNT54jru8IJ)_)OPH{f=
zHZ>|*;MNEAKySdf_2B^^Pi5;IC!V&Fja1=jk0nb`UGk+5U_9q&0;nEs));|#72>_(
zr`HKTN-g4-32wg9k_xSK#7#G$W-v0re~h_UB_B~aO+{@tfNbk&SACP{&X6D#<I!dM
z!73k~{P@^UXU%@+IIP{@k0UM>SIj$!Gl#c{?bf{P1hSJ{FXKajBZ;clvvFilqD+iP
zm?L9(2-U;$eF(=d-QD5Xe%%oR(38<o*>w02_XL<{-juwTNJCe^u?yiTX`2%7WxSQ_
zW0p@<$uMxuh*85Q$#e@pIyv0!tAxv4?bFH4l7`y*%o74-LYXOFYpfs?Ke?|z%eHy3
zOrG?LPCpjiS8TjY+(E(U$NRuci663T6gG$}4dJNEP{714IG04v_iN~^il4KLlM1QT
z#}lW1Em1Dyr89tZ)fJ<j&gP8YGIX0W|8fQVpY@nm!R%!dijhDRE{Bwgr>2&O@zQ5^
zI5U|TSLf97F!7+~zC1H9T4{8rGj(Leer)T8y*PIe^9Qg|V~~|K>7rHQ5(8e`*ZYCq
zFNRIo9hr*99`$Fj@6B!Qq**J&@nr$k>Q(3!*@PAf&PiE%1`$uFO`(b#*QZHuPARe)
zjmQ|<-Gd7Q`eHCVi$L;9oY=+eaX0PO$Dn)$tRe()rc`Ne;t)4n>J$6k=2!E&bV6gs
z1GR<C?i9IPr#PV5fRmVYlGh&|_rG4Bh#fMl%Xf>6v)%Tl_$ZJ%$6vnAH*0|lY;*5@
zF{DaYgOMwhVi?`j1h_^hI5Z%+DiNMI-j+rxxmfDLQhQc71_^(<Z=$u6McC_3S-a7G
z92Hr-pU>wj7p$NptDV_@;u}QbkiiSSkOLy_R)Z|D;q4G6k2O=Aa%M4Cy=w!KLvE{|
z`9~yuU$UDsu?S1MX|;DKbkR&dX}jhkA5(IK#ML|dC+VlB$_N6BlGiIPan$zJ&jQUg
zqDqnWyVCN`6pk91O~(qMHaaqU$D6tVKz$lNn)iY`=KU;w2L@wYP7ynl+y&SZ^^%VN
zO+!MW|JU&USVQoCqhUO2Egs3#ZMeUu>RZ8^iKy-t0PuTG@^KM-=>YSveP-zC;rQJC
z<?mkZiu|T?OPD--S34k5V>f?2T)(!ZN1co3kx&;7aSM*ox&4FaKjzFj9nAe^e+~~x
zOFIgmi7<Lm=Xf+wzYj$NYU-U6za?5X`Ls4tkTbZ3VoX6QYWguHKWjPRsu6Y0Hhc|3
zS2_bGZv9YZDP4(#dZOFXvfZkxZ1`!7+}63PQ|><ZNkIJBUgfJR{`}eXo4NUsR%lR8
z31LNmyPJ`yiI|ak1!2>4oXZrbEiN_OdB^-Sa=p3${E_|*hnL-|=VBQ;qhzDFf2*>#
zm300THQ#4Ai_7%vtcMitRQ_3{h^l2{&>C2)#lTU|ws6i@Faq*|S&h#ZdkTM$ITdEP
zdv_>wt~lb6*MX&t(4N)<nT@qY5Bc5`Jyxv{=fJG{hF$GmQW7e=hI{fn6P2aye=Bkz
zm`L-*4aKfEBNEv^DfV{raJF`Ha~6Q#&>L%H;f4{S4$P{%hMuydldS_NKn799#YQx?
zp8ly?Sn|?0EVFj7)T2f3jQBdLiNr$x-TnRjOU)l2);QJVlgG^wfEJ}YcX_N+++Psy
zy|)lchUSsb5De!-fmi)v?G^zSLX~-bvg)S@1%-8heQ%=ZBhU2ekWDl=1s;SlDhXl4
zpGsIa5Kdi>5jI@ud6~{+peNv-D`Xfb_AK=vx%^oGC|M{r%34}HzJ0`}*sOj<Pkz$T
zcw4AUQ#J+<c9gk>B*GK?!S`jheFK<dd#X-U^ef#a(a`lPfh3rqiVR&g!z9$Jo-wf3
z^HM6~>}_O!j`JWYr1QxB3*0n+(VZy=5v^=2_)yq1sI7QQVVY@M^n2e>CwqWB)<pI|
zC$|E>&M8_sW3|?`kVv%Vh?Np(H7q5yDfgnhi)PNh?{<gH^r=-fdRvF-;_c4#?37x(
zf!5Cx4G!l`u52DRCx&eo*1F>RGJLE{R?9w=GFOvKF`SZ&G4sWu`0(zuF=#8|V*j4^
zs}HPd9dp8&<<=PO>TeYxeVR@wsW33nIQY}l>n19LMZ3v#>arc{g`#0Fqs1tx7Sq!B
z*ACWX*C!2$gFDw0S<AKkrn(+=yBe+j^V<@#O=Mf&j^7sv`Zf_f8N9k!^=i3jFoU~h
zv0uCJ2B&mm8&LOlvhG;#-}zlmQD|PqS|_?*QlKA7m`4FPiSpnP1)iV^cu@bg8a}!w
z!St^c=Eks8H`(<200HbbHzf*nPvK73O_tr57!}ROj2h)31+t^?cqM>psE54wnf`9}
zzhW_{FkVIAGgL3H4Db*I<dXn0qonwFnEsx-e?>e%`SLvk=A#<;IGF!h0002`-;kU0
t&p(afqTnDJ6h4TC`OjW|V*^K=zk}!q{sig#N6>Ae8xZI=E6?x8{{i`b3H$&6

delta 3781
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

diff --git a/data-center-business-controller/src/main/resources/template/jp/deviceInfo_jp.xlsx b/data-center-business-controller/src/main/resources/template/jp/deviceInfo_jp.xlsx
index 8c93e20161af5afea01c89f019927a0d1006367e..edeedaa41a948f00d91063adf5de2282af1d6546 100644
GIT binary patch
delta 4154
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
W1qwx=Z2ulq0t}0YT+|W#P5&<tg_02f

delta 4156
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

diff --git a/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml b/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
index 288c30b..57d76fe 100644
--- a/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
+++ b/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
@@ -55,6 +55,7 @@
         device_info.unit,device_info.data_mapping,
         dashboard_device_group.id deviceGroupId, dashboard_device_group.name deviceGroupName,
         gateway_clients.client_name gatewayClientName,
+        gateway_clients.id gatewayId,
         device_category.category_name_jp categoryName
         from
         device_info
@@ -71,7 +72,7 @@
         left join device_alert_config dac on device_info.id=dac.device_config_id and dac.flag = 0
         left join dashboard_device_group_relation on dashboard_device_group_relation.device_info_id = device_info.id
         left join dashboard_device_group on dashboard_device_group_relation.device_group_id = dashboard_device_group.id
-        left join gateway_clients on gateway_clients.client_id = device_info.gateway_client_id
+        left join gateway_clients on gateway_clients.id = device_info.gateway_client_id
         <if test="deviceVO.targetIdValue != null ">
             left join target_id_check tic on dac.id = tic.alert_config_id
         </if>
diff --git a/data-center-business-dao/src/main/resources/mappers/ex/GatewayClientsMapperExt.xml b/data-center-business-dao/src/main/resources/mappers/ex/GatewayClientsMapperExt.xml
index 07c1300..7ededf4 100644
--- a/data-center-business-dao/src/main/resources/mappers/ex/GatewayClientsMapperExt.xml
+++ b/data-center-business-dao/src/main/resources/mappers/ex/GatewayClientsMapperExt.xml
@@ -40,4 +40,28 @@
 
   </select>
 
+  <select id="getAll" resultType="com.techsor.datacenter.business.dto.gateway.GatewayClientsQueryResponse">
+    select
+    gateway_clients.id as id,
+    gateway_clients.client_id as clientId,
+    gateway_clients.client_name as clientName,
+    gateway_clients.online_status as onlineStatus,
+    gateway_clients.last_updata_ts as lastUpdataTs,
+    gateway_clients.create_ts as createTs,
+    gateway_clients.address as address,
+    gateway_clients.data_amount_threshold,
+    gateway_clients.data_amount_threshold_alarm,
+    gateway_clients.company_id as companyId,
+    gateway_clients.alert_switch as alertSwitch,
+    gateway_clients.project_id as projectId,
+    gateway_clients.building_id as buildingId,
+    basic_project.project_name as projectName,
+    basic_building.name as buildingName
+    from
+    gateway_clients
+    left join basic_project on gateway_clients.project_id = basic_project.id
+    left join basic_building on gateway_clients.building_id = basic_building.building_id
+    where gateway_clients.flag = 0 and gateway_clients.company_id = #{companyId}
+  </select>
+
 </mapper>
\ No newline at end of file
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/device/DeviceSearchParams.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/device/DeviceSearchParams.java
index 5ca9de9..fb0dcc0 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/device/DeviceSearchParams.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/device/DeviceSearchParams.java
@@ -45,6 +45,9 @@ public class DeviceSearchParams extends BaseSearchParams {
     @Schema(description = "Asset symbol", example = "asset-01")
     private String assetSymbol;
 
+    @Schema(description = "gatewayClientName", example = "asset-01")
+    private String gatewayClientName;
+
     @Schema(description = "Target ID value", example = "33")
     private Integer targetIdValue;
 
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelCn.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelCn.java
index 83b8cd9..4631878 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelCn.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelCn.java
@@ -65,6 +65,9 @@ public class DeviceInfoExcelCn {
     @ExcelProperty(value ="资产符号")
     private String assetSymbol;
 
+    @ExcelProperty(value ="网关ClientID")
+    private String gatewayClientId;
+
     @ExcelProperty(value ="项目名称")
     private String projectName;
 
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelEn.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelEn.java
index 827c3da..8395a5f 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelEn.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelEn.java
@@ -35,6 +35,9 @@ public class DeviceInfoExcelEn {
     @ExcelProperty(value ="asset symbol")
     private String assetSymbol;
 
+    @ExcelProperty(value ="gateway client id")
+    private String gatewayClientId;
+
     @ExcelProperty(value ="project name")
     private String projectName;
 
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelJp.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelJp.java
index 4e541a5..66c3e18 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelJp.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelJp.java
@@ -37,6 +37,9 @@ public class DeviceInfoExcelJp {
     @ExcelProperty(value ="資産記号")
     private String assetSymbol;
 
+    @ExcelProperty(value ="クライアントID")
+    private String gatewayClientId;
+
 //    @ExcelProperty(value ="DBM ClientID")
 //    private String clientId;
 
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java
index 05d6dfc..0ce7ba8 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java
@@ -66,7 +66,7 @@ public class DeviceVO {
 
     private String assetSymbol;
 
-    private String gatewayId;
+    private Integer gatewayId;
     private String gatewayClientName;
 
     private Integer flag;
diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceServiceImpl.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceServiceImpl.java
index f582b27..cf8d3c9 100644
--- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceServiceImpl.java
+++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceServiceImpl.java
@@ -847,9 +847,9 @@ public class DeviceServiceImpl implements IDeviceService {
                     errorList.add(msgLanguageChange.getParameterMapByCode(languageType, "assetSymbolDoesNotExist"));
                 }
 
-                // Floor Check
+                // gatewayClient Check
                 boolean gatewayClientExist = checkGatewayClient(deviceInfoExcel.getGatewayClientId(), companyId, deviceInfo);
-                if (!floorExists) {
+                if (!gatewayClientExist) {
                     errorList.add(msgLanguageChange.getParameterMapByCode(languageType, "floorNameDoesNotExist"));
                 }
 
@@ -2097,12 +2097,12 @@ public class DeviceServiceImpl implements IDeviceService {
     }
 
 
-    private boolean checkGatewayClient(String gatewayClientName, long companyId, DeviceInfo deviceInfo) {
-        if (StringUtils.isBlank(gatewayClientName)) {
+    private boolean checkGatewayClient(String gatewayClientId, long companyId, DeviceInfo deviceInfo) {
+        if (StringUtils.isBlank(gatewayClientId)) {
             return true;
         } else {
             GatewayClientsExample gatewayClientsExample = new GatewayClientsExample();
-            gatewayClientsExample.createCriteria().andClientNameEqualTo(gatewayClientName).andCompanyIdEqualTo(companyId).andFlagEqualTo(0);
+            gatewayClientsExample.createCriteria().andClientIdEqualTo(gatewayClientId).andCompanyIdEqualTo(companyId).andFlagEqualTo(0);
             List<GatewayClients> assetList = this.gatewayClientsMapperExt.selectByExample(gatewayClientsExample);
             if (CollectionUtils.isEmpty(assetList)) {
                 return false;
diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/GatewayClientsServiceImpl.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/GatewayClientsServiceImpl.java
index 4384528..cfbdb45 100644
--- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/GatewayClientsServiceImpl.java
+++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/GatewayClientsServiceImpl.java
@@ -91,7 +91,7 @@ public class GatewayClientsServiceImpl implements GatewayClientsService {
 
 	@Override
 	public List<GatewayClientsQueryResponse> getAll(Long userId, Long companyId, Integer languageType) {
-		List<GatewayClientsQueryResponse> resultList = gatewayClientsMapperExt.getListPage(null,companyId);
+		List<GatewayClientsQueryResponse> resultList = gatewayClientsMapperExt.getAll(companyId);
 		return resultList;
 	}
 

From 11fe9b9a29da8786d15690966fcab42548b8db6b Mon Sep 17 00:00:00 2001
From: "zhczyx@163.com" <zhczyx@163.com>
Date: Thu, 1 Jan 2026 22:05:42 +0800
Subject: [PATCH 11/13] =?UTF-8?q?referer=E8=BF=87=E6=BB=A4=E6=8E=92?=
 =?UTF-8?q?=E9=99=A4websocket=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../techsor/datacenter/business/configurator/CrosXssFilter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-center-business-controller/src/main/java/com/techsor/datacenter/business/configurator/CrosXssFilter.java b/data-center-business-controller/src/main/java/com/techsor/datacenter/business/configurator/CrosXssFilter.java
index 4f79732..8f011ff 100644
--- a/data-center-business-controller/src/main/java/com/techsor/datacenter/business/configurator/CrosXssFilter.java
+++ b/data-center-business-controller/src/main/java/com/techsor/datacenter/business/configurator/CrosXssFilter.java
@@ -53,7 +53,7 @@ public class CrosXssFilter implements Filter {
                     String requestUri = httpRequest.getRequestURI();
                     // 当 URL 不包含 /common/ 时，校验 Referer
 //                    if (!requestUri.contains("/common/") && !requestUri.contains("swagger")) {
-                    if (!requestUri.contains("/swagger")) {
+                    if (!requestUri.contains("/swagger") && !requestUri.contains("websocket")) {
                         String referer = httpRequest.getHeader("Referer");
                         if (StringUtils.isNotBlank(referer)){
                             if(!"*".equals(accessControlAllowOrigin)){

From dd492aab710992372420d8a58bf46a3377c1c8bc Mon Sep 17 00:00:00 2001
From: "zhczyx@163.com" <zhczyx@163.com>
Date: Thu, 1 Jan 2026 22:09:06 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E9=92=88?=
 =?UTF-8?q?=E5=AF=B9=E6=B0=B8=E6=97=BAioserver=E7=9A=84=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=B8=8D=E8=AE=BE=E7=BD=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=EF=BC=8C=E4=B9=9F=E5=8F=AF=E4=BB=A5=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/ex/DeviceConfigInfoExtMapper.java     |   2 +
 .../mappers/ex/DeviceConfigInfoExtMapper.xml  |  11 ++
 .../ioserver/IoserverDeviceIdEntity.java      | 110 ++++++++++++++++++
 .../business/vo/device/DeviceVO.java          |   3 +-
 .../service/impl/DeviceServiceImpl.java       |  46 +++++---
 5 files changed, 155 insertions(+), 17 deletions(-)
 create mode 100644 data-center-business-model/src/main/java/com/techsor/datacenter/business/entity/ioserver/IoserverDeviceIdEntity.java

diff --git a/data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/ex/DeviceConfigInfoExtMapper.java b/data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/ex/DeviceConfigInfoExtMapper.java
index 0021c09..bdebd2b 100644
--- a/data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/ex/DeviceConfigInfoExtMapper.java
+++ b/data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/ex/DeviceConfigInfoExtMapper.java
@@ -14,6 +14,8 @@ public interface DeviceConfigInfoExtMapper extends DeviceConfigInfoMapper {
 
     List<DeviceConfigVO> getListPage(DeviceConfigSearchParams pageSearchParam);
 
+    List<DeviceConfigVO> getAll();
+
     List<DeviceTypeVO> getDeviceCategoryListByTypeName(String deviceTypeName, Long companyId);
 
     DeviceConfigVO selectByDeviceId(String deviceId);
diff --git a/data-center-business-dao/src/main/resources/mappers/ex/DeviceConfigInfoExtMapper.xml b/data-center-business-dao/src/main/resources/mappers/ex/DeviceConfigInfoExtMapper.xml
index 56f62e5..32c3b3b 100644
--- a/data-center-business-dao/src/main/resources/mappers/ex/DeviceConfigInfoExtMapper.xml
+++ b/data-center-business-dao/src/main/resources/mappers/ex/DeviceConfigInfoExtMapper.xml
@@ -48,4 +48,15 @@
     <select id="selectByDeviceId" resultType="com.techsor.datacenter.business.vo.device.DeviceConfigVO">
         select * from type,device_info where type.id=device_info.type_id and device_info.device_id=#{deviceId} and device_info.flag!=1
     </select>
+
+    <select id="getAll" resultType="com.techsor.datacenter.business.vo.device.DeviceConfigVO" >
+        select
+        id, `name`, description, device_type, device_data_src, origin_json_format, expression_map,
+        expression_variable_map, target_json_format, target_forward_id, target_foward_code, company_id,dbm_id,name_zh,name_en,
+        device_category_id,`unit`
+        from `type`
+        <where>
+            and flag = 0
+        </where>
+    </select>
 </mapper>
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/entity/ioserver/IoserverDeviceIdEntity.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/entity/ioserver/IoserverDeviceIdEntity.java
new file mode 100644
index 0000000..617c858
--- /dev/null
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/entity/ioserver/IoserverDeviceIdEntity.java
@@ -0,0 +1,110 @@
+package com.techsor.datacenter.business.entity.ioserver;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class IoserverDeviceIdEntity {
+    // 定义正则表达式模式
+    private static final String DEVICE_ID_PATTERN = "^([A-Z]+)_([A-Z]+)_(\\d{4})_(\\w+)_(\\d+)(?:_S)?$";
+    private static final Pattern PATTERN = Pattern.compile(DEVICE_ID_PATTERN);
+
+    /**
+     * 解析设备ID格式
+     * 格式: [物件Initial]_[设备分类]_[BA Device Instance]_[ObjectType, Instance]_[Property][_S(sub, 备份用)]
+     */
+    public static DeviceInfo parseDeviceId(String deviceId) {
+        if (deviceId == null) {
+            return null;
+        }
+
+        Matcher matcher = PATTERN.matcher(deviceId);
+        if (!matcher.matches()) {
+            return null;
+        }
+
+        String[] groups = new String[matcher.groupCount()];
+        for (int i = 0; i < groups.length; i++) {
+            groups[i] = matcher.group(i + 1);
+        }
+
+        DeviceInfo info = new DeviceInfo();
+        info.setObjectInitial(groups[0]);
+        info.setDeviceCategory(groups[1]);
+        info.setBaDeviceInstance(groups[2]);
+        info.setObjectTypeInstance(groups[3]);
+        info.setProperty(groups[4]);
+        info.setHasBackup(deviceId.endsWith("_S"));
+
+        return info;
+    }
+
+    /**
+     * 验证设备ID格式是否正确
+     */
+    public static boolean isValidFormat(String deviceId) {
+        if (deviceId == null) {
+            return false;
+        }
+        return PATTERN.matcher(deviceId).matches();
+    }
+
+    /**
+     * 批量验证和解析设备ID
+     */
+    public static void validateAndParse(String[] deviceIds) {
+        System.out.println("设备ID格式验证结果:");
+        System.out.println("=" + "=".repeat(80));
+
+        for (String deviceId : deviceIds) {
+            DeviceInfo info = parseDeviceId(deviceId);
+            if (info != null) {
+                System.out.printf("✓ %-30s - 格式正确\n", deviceId);
+                System.out.println("  - 物件Initial: " + info.getObjectInitial());
+                System.out.println("  - 设备分类: " + info.getDeviceCategory());
+                System.out.println("  - BA Device Instance: " + info.getBaDeviceInstance());
+                System.out.println("  - ObjectType, Instance: " + info.getObjectTypeInstance());
+                System.out.println("  - Property: " + info.getProperty());
+                System.out.println("  - 是否备份: " + (info.isHasBackup() ? "是" : "否"));
+                System.out.println();
+            } else {
+                System.out.printf("✗ %-30s - 格式错误\n", deviceId);
+                System.out.println();
+            }
+        }
+    }
+
+    // 设备信息类
+    public static class DeviceInfo {
+        private String objectInitial;
+        private String deviceCategory;
+        private String baDeviceInstance;
+        private String objectTypeInstance;
+        private String property;
+        private boolean hasBackup;
+
+        // Getters and Setters
+        public String getObjectInitial() { return objectInitial; }
+        public void setObjectInitial(String objectInitial) { this.objectInitial = objectInitial; }
+
+        public String getDeviceCategory() { return deviceCategory; }
+        public void setDeviceCategory(String deviceCategory) { this.deviceCategory = deviceCategory; }
+
+        public String getBaDeviceInstance() { return baDeviceInstance; }
+        public void setBaDeviceInstance(String baDeviceInstance) { this.baDeviceInstance = baDeviceInstance; }
+
+        public String getObjectTypeInstance() { return objectTypeInstance; }
+        public void setObjectTypeInstance(String objectTypeInstance) { this.objectTypeInstance = objectTypeInstance; }
+
+        public String getProperty() { return property; }
+        public void setProperty(String property) { this.property = property; }
+
+        public boolean isHasBackup() { return hasBackup; }
+        public void setHasBackup(boolean hasBackup) { this.hasBackup = hasBackup; }
+
+        @Override
+        public String toString() {
+            return String.format("DeviceInfo{物件Initial='%s', 设备分类='%s', BA Device Instance='%s', ObjectType_Instance='%s', Property='%s', 备份=%s}",
+                    objectInitial, deviceCategory, baDeviceInstance, objectTypeInstance, property, hasBackup);
+        }
+    }
+}
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java
index 0ce7ba8..635370f 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java
@@ -44,7 +44,8 @@ public class DeviceVO {
     private Long typeId;
 
     private Long categoryId;
-    private Long categoryName;
+
+    private String categoryName;
 
     private String typeName;
 
diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceServiceImpl.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceServiceImpl.java
index cf8d3c9..7bbf007 100644
--- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceServiceImpl.java
+++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceServiceImpl.java
@@ -37,6 +37,7 @@ import com.techsor.datacenter.business.dto.device.forward.DeviceForwardBatchPara
 import com.techsor.datacenter.business.dto.device.forward.DeviceForwardQueryParams;
 import com.techsor.datacenter.business.dto.device.forward.DeviceForwardRemoveParmas;
 import com.techsor.datacenter.business.dto.devicegroup.DeviceGroupSearchParams;
+import com.techsor.datacenter.business.entity.ioserver.IoserverDeviceIdEntity;
 import com.techsor.datacenter.business.importexcel.deviceAlertInfo.DeviceAlertInfoExcel;
 import com.techsor.datacenter.business.importexcel.deviceinfo.AlarmLevelMapping;
 import com.techsor.datacenter.business.importexcel.deviceinfo.DeviceGroupRelationExcel;
@@ -57,11 +58,7 @@ import com.techsor.datacenter.business.util.entity.AlertContentExtractParams;
 import com.techsor.datacenter.business.util.redis.RedisUtil;
 import com.techsor.datacenter.business.vo.company.ApikeyInfo2;
 import com.techsor.datacenter.business.vo.data.AuroraDataVO;
-import com.techsor.datacenter.business.vo.device.DeviceAlertCsvVO;
-import com.techsor.datacenter.business.vo.device.DeviceInfoCsvVO;
-import com.techsor.datacenter.business.vo.device.DeviceVO;
-import com.techsor.datacenter.business.vo.device.LambdaEmailResult;
-import com.techsor.datacenter.business.vo.device.MonitoringPointCategoryVO;
+import com.techsor.datacenter.business.vo.device.*;
 import com.techsor.datacenter.business.vo.device.alert.DeviceAlertConfigVO;
 import com.techsor.datacenter.business.vo.device.forward.DeviceForwardConfigVO;
 import com.techsor.datacenter.business.vo.devicegroup.DeviceGroupPageVO;
@@ -141,6 +138,9 @@ public class DeviceServiceImpl implements IDeviceService {
     @Resource
     private BasicFloorMapperExt basicFloorMapperExt;
 
+    @Resource
+    private DeviceConfigInfoExtMapper deviceTypeExtMapper;
+
     @Resource
     private BasicSpaceMapperExt basicSpaceMapperExt;
 
@@ -804,6 +804,8 @@ public class DeviceServiceImpl implements IDeviceService {
             Map<String, DeviceGroup> deviceGroupMapping = deviceGroupList.stream()
                     .collect(Collectors.toMap(DeviceGroup::getName, item -> item));
 
+            //Prepare all device type list for futher  checks
+            List<DeviceConfigVO> allDeviceTypeList = deviceTypeExtMapper.getAll();
 
             List<Long> targetFowardCodeIdListCache = new ArrayList<>();
             for (int dataIndex=0; dataIndex<dataSize; dataIndex++) {
@@ -854,7 +856,7 @@ public class DeviceServiceImpl implements IDeviceService {
                 }
 
                 // Device Type Check
-                boolean deviceExists  = checkDeviceType(deviceInfoExcel.getDeviceType(), companyId);
+                boolean deviceExists  = checkDeviceType(allDeviceTypeList,deviceInfoExcel,deviceInfoExcel.getDeviceType(), companyId);
                 if (!deviceExists) {
                     errorList.add(msgLanguageChange.getParameterMapByCode(languageType, "deviceTypeNotExist"));
                 }
@@ -2115,19 +2117,31 @@ public class DeviceServiceImpl implements IDeviceService {
 
 
 
-    private boolean checkDeviceType(String deviceType, long companyId) {
-        if (StringUtils.isBlank(deviceType)) {
+    private boolean checkDeviceType(List<DeviceConfigVO> allDeviceTypeList, DeviceInfoExcel deviceInfoExcel,String deviceType, long companyId) {
+         IoserverDeviceIdEntity.DeviceInfo baseDeviceInfo = IoserverDeviceIdEntity.parseDeviceId(deviceInfoExcel.getDeviceId());
+         // Return false if not enter type and deviceInfo is null(Means it's not valid eaon's ioserver device, so we cannot auto fill the type)
+         if (StringUtils.isBlank(deviceType) && baseDeviceInfo == null) {
+             return false;
+         }else if (StringUtils.isBlank(deviceType)){
+             // If DeviceType is blank but device is eaon's ioserver device,auto fill the type
+             for (DeviceConfigVO deviceConfigInfo : allDeviceTypeList) {
+                 if (deviceConfigInfo.getName().contains(baseDeviceInfo.getProperty()) && deviceConfigInfo.getName().contains(baseDeviceInfo.getDeviceCategory())) {
+                     deviceInfoExcel.setDeviceType(deviceConfigInfo.getName());
+                     return true;
+                 }
+             }
+         }
+
+        //If deviceType not blank, check if it exists in the database
+        DeviceConfigInfoExample deviceConfigInfoExample = new DeviceConfigInfoExample();
+        deviceConfigInfoExample.createCriteria().andNameEqualTo(deviceType);
+        List deviceConfigInfoList = this.deviceConfigInfoExtMapper.selectByExample(deviceConfigInfoExample);
+        if (CollectionUtils.isEmpty(deviceConfigInfoList)) {
             return false;
         } else {
-            DeviceConfigInfoExample deviceConfigInfoExample = new DeviceConfigInfoExample();
-            deviceConfigInfoExample.createCriteria().andNameEqualTo(deviceType);
-            List deviceConfigInfoList = this.deviceConfigInfoExtMapper.selectByExample(deviceConfigInfoExample);
-            if (CollectionUtils.isEmpty(deviceConfigInfoList)) {
-                return false;
-            } else {
-                return true;
-            }
+            return true;
         }
+
     }
 
     private Integer checkWsClientId(String wsClientId, long companyId) {

From ad8d33ecf695a358ce8c1e69fc0d0f160e59b647 Mon Sep 17 00:00:00 2001
From: "zhczyx@163.com" <zhczyx@163.com>
Date: Thu, 1 Jan 2026 22:14:54 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E6=97=A5=E8=AF=AD=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E4=B8=AD=E7=9A=84=E3=80=90=E8=AE=BE=E5=A4=87=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E3=80=91=E4=B8=BA=E3=80=90=E3=83=97=E3=83=AD=E3=83=91?=
 =?UTF-8?q?=E3=83=86=E3=82=A3=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/config/language/msg/msg_jp.yml  |   2 +-
 .../resources/template/jp/deviceInfo_jp.xlsx  | Bin 11249 -> 11265 bytes
 .../deviceinfo/DeviceInfoExcelJp.java         |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml b/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml
index 0317610..66d326b 100644
--- a/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml
+++ b/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml
@@ -31,7 +31,7 @@ msgjp:
         spaceNotFound: 該当空間がない
         faNotSameCompany: 空間と同じ会社に所属してください
         bindedDevice: 登録されたデバイスは存在しています
-        deviceTypeNotExist: デバイスタイプがない
+        deviceTypeNotExist: プロパティがない
         excelBuildingLineDuplicate: テーブルに同じデータがある
         dbBuildingDuplicate: プラットフォームにすでに該当ビルがない
         dbFloorDuplicate: プラットフォームには既にこのフロアが存在しています。
diff --git a/data-center-business-controller/src/main/resources/template/jp/deviceInfo_jp.xlsx b/data-center-business-controller/src/main/resources/template/jp/deviceInfo_jp.xlsx
index edeedaa41a948f00d91063adf5de2282af1d6546..19b455a87ca5fd9cc41e9e206bbc7c499bc9ac89 100644
GIT binary patch
delta 2801
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
D=4mTW

delta 2807
zcmY*bXH=655=|&lB7_#DNUs4NA@uU74+u3#F_cIZq$6FF5(!8Lkq;@MHxZF0O+=+d
z5D^6F9fComD8VPatnTi4XZQY?Gjq<J`7`&-+!$MmO+yu!_WQ{2m<jL<%#SmVmF0~8
zE_O!uN!=%=z5RkM=>w@-RLoUjk+3%x|4DZi-PhUH6)(;GVEcIQ>lh*}2W1!TRAT1%
zl!lfa|L4_L9PP8B>!R4>ws-Q`@a|+w9Xz+JXP%?e+gD|;#&;?P8JmZ?!_zA+lCR<S
zCNUg0diMqL@?OLTt+bA3+O^@v)vqJZ2Ey+BrF+vB?~b>N$CfxT>4oSrY6{fE%BbC2
z=48w$dDh)6(xv49u_tIjLk6C}gXgTjnTanTu{)YqW>En2?aMmx&~Y!7b5N%rUvWp(
zQM<RtTX1FLa+Z&C>-bmH!a<)BEit@#4&C6~=Re=jrkdCx7NsKFGK-E)rhNYZRzELd
z><Kn#-q#YZAKlQzmMe(3tOM=*GIDZNqj<L6MaQVXH;P-zpN*Drq%{7xXb!jTECVa<
zVFRMP!1gNyPXCDMstGj>&?Uj$Buo7q%p7NUcKVbC1R^tmK%5|8R0@Ve%7pv*w%C~6
zTGiuxBTV6!h6HZRa)}3KX1cYU&Stmz-i8d`*)Szo_&vD&XEhdmEEq>adPf_0<B-L3
z-<Xyv+SDuO^ztkDRU=n*H!DGAN~%ZE{xRi4{<rNWiDoo|IXopoDagB3pLCDOGjhI3
z>nLCoGuLVvvkGRmGrf!3Q#IP2J8fIqxS3j9A*>rm%S~$bco1iZaZqM55b3GzWn=3d
z&Y;jk!pZ&qgaAC9u>_+-J?6&({n+#*H|9`IZ92e^`gu1#P|vmWQ2?7O_^e8pP+>4P
z;|!0YPM1%dIFMf@#V_Wq|CN@EV`Wk?nYpS0PPx8qulPQF4vr&o(ZckDGhr^#a%le;
z5)EFxOc3@(^7<+ZtCfabwyIsGnodCk5)c><O0wmz!t3+cI(IBxgQ+b0cdD0U=-b^*
z0bD-5iN!!QcqU;aK~Xz3`8FC&H4#Au8ZOW^Uy}y62N&O}G4vL_W`bn0qf!eE2Y9>2
zE0CgsX3N?mIIFVJ4yKX`VRw$l&ZC971%*66u*v##^V}JNd<m|F_xZ<SIDc-X`%UsS
z_~wtSJ_IdA(s>T{2~{9xgsVj2%)ZKTGTPGHuXyQO%PqDFMLzB`_0jXIa@^1V8P<#1
z@twt#WajWF7&pJjN$K?@=A$FLD0gL;%USn%m+F1SaJ%gzY9bb@&~nyW^V(Okqyjn9
z4$Ph%x2vSKhreDa;acjhrLFcMlVsOOj{Q0&{mitO;a<;Y%7yl*3Dc@urJ>7dYzd>b
zD0KOKw}BiMQ~+A?j)+%%(&{0){M#XKy`#^-7v1A`vM6*aewK-ZidPSE<q)8|lLC*u
z=<%6|OVnYw#9^FywO>s%xh+n#7pfpiABnxS`*DP7XvY=#FryS-@L4c)(X*cgG$iX>
z$7@r}xe=L3=h-=Ece9&J^(ZG{NTFnaLhXUYlM53uIvNE^Y|(T(K@7t~MTI>ZUY(Pn
z<|{8CK}364Ombpq8tA=gNVq=H0A_&@QmVlv8n8BA`&n+MH(x7sBBbj`SLun>C!%4a
zGD3?}i8G$+`b2+NjIq%|J~iAuw387&b6AqBT}fQ}U7tBKS7aR>2MbirYvoeIMb876
z-3U>a57Y&bBDeW$Jc84W-R-c=?T*vZm4P?H#-w20O$~OEqZpT_tfP+mLzbU#ZIJxR
zknbEyRY{ZZPZ~*QYjitgEu!Fki!cJFs}C6&8+wqQg3VSjFEMBKlJtcn2o6r_UMYS8
z)#7dR6-W2E7FWPEFXT#dNc#s3hr3wp8|*LY)a=wK&JJZmAG;}QFe5iQk3BySBc>2<
zUcY={d*|oim#GJx*gK~)IW`}0xEE&|V^dDJrroKxDK=Wsfj>9*bIcvrOmOFW#}oVr
zMDa<*QcH53`shq(%EOcThYJbsmiKQxbkIEgvHSJMpodoZqk-{`_WpCl^ZaG<H=@bR
z<4aaFg>F=#^Zh5eRB+w(_|nbL<qgtH_G`iGz=Y)WVw9;izyG4a&h5l5`H8E+%gp?8
zVjm#3nRlT{oZ=Wfdk^%hxc222HJnvD{iwzU5Ajq;dUZxxEvB`y+0b0Psg7Zik)i8J
zPH6`i1bPajaq#0-wK<|LpFmv}r$VAK^fTW*7dmL@aowkj3!A(^FxocNUkZ`Y*CEP8
zTep3)91nf;vjZw=eTtl_*amRj$ZJ_5e<QyXM9A!aNJ7eOuC;L4e@^c=-3=7bS9mYy
zIO$>~c38xByp!a4eOlV*i-v)j97>g|@#y&C@cqX(xs;7?=)|6ex*w+LFO~Rr7_;DO
z2{s{qrJ5;LY6y<%Lb9sy{ro99t7^f87G8tqR2$bGkyvk&B-Js|BQh<gP<A)(Aj>6P
z*a{6<@jXuBBTM$l`{Yu{;7BoTeVJn1d0>d}m4!4mUX{NQ+2x)cjnno^KK%ZNH8vK^
zF07^aAbv7#=)e;Z7F2dQ1yUvPy*R35)+8t3MosIK=Cs}cFIqV>_TcD`!f)e)wX<IM
zSVY_04;HKxf|c-|nXHpbi3YiMMn81E7j$_=!g`7|owb$S%Em%*;!(FZd8KYGXO(B^
ze$wvsJ8{{K+9!`{6XxRDqA93@SP=atJ(D~8YpEv|XG~$~vE}Y@MdX7kyj!ip7jAD-
zrcbygJiev^r4&pEC7j>D%W>Mi!Q$J=tkE8!!QrTHeZ#4#2=x0yaezP|dQbwIq%G+p
z_wwY|R{el`mjrRnhr9*Qbr7qhWg@298s;7nK`<q;)FkoF+;k!AE!{56Xl5VFs*3nd
zp-@hZ*V?`ap|o;8T~7ve{6!}$=9(7}cyTAkK_S<<f(gbjROt*p8&G)T5P2e7UvXE%
z@Gx0hdmZG_mnE+oQqYLsD3#8;2UtJFbJI^eT(?9L)^VvwtIx#X0v^k&G6ChXR#6IW
zgx%a)w@Arc*|bDgRmF@q!{OD~md{tU#=S6Gvd@e)QfXcGioRq*Xc24hk27z+g3H_w
z4IxkdF1V3p<u}QoEX~jWEqyl4Bim<K_<n~NtWtQCo-k16GYH_j_B=k?RW1ealqIL=
zVGw^J?Qr*AS8r-h@odSj_J8OSi1Z-YYV4xR>*$-kQ}hbSO@37n`R99lY+$D$6_pLm
zz}g<zTtxqc&KpyQPK~8oXr7bw?WvgwREDMLj{_q?pAC@`v0L6;TfThF)qkkL`Ienl
z!r9c$#(7eOl(|#qtL5o?^GBUuC7)2lZ-=(=p>UmZ$f8=;S+mB4I()yecOJn-8uCf{
z?L>4tyXDf&@dA!#+pddGhNQV2Mwm@`mOo8)^5y#3v}O%%pR*RPG!5992Q_~;dKEFh
zrKHgg-CWqud4jmp&R{cmc0vy8IBCV={E7w6eI;V@dP%K-_;#@?h3<d!&{WMi!%S5n
z3XF)tfIM+Ysxu+rt+*Um2sjW2{%aRAB&@;g09ittF7cPK3HL<+3zAm=LpU?o7_fmW
zfdheb_#Zs~91Cg?=(pH@0}K-Q6~lo^xDGfS;FMGY1AvvJ68I&MEGfqGj}U)Nh5n}h
z!hbs4fkDYX!PNl0l;D;BH&p-2nxOe@uK;@~1XT;ezta*a1h@hik&?P#DE^!IFFFb}
A1ONa4

diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelJp.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelJp.java
index 66c3e18..78324d7 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelJp.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelJp.java
@@ -13,7 +13,7 @@ public class DeviceInfoExcelJp {
     @ExcelProperty(value ="デバイスSN")
     private String deviceSn;
 
-    @ExcelProperty(value ="デバイスのタイプ")
+    @ExcelProperty(value ="プロパティ")
     private String deviceType;
 
     @ExcelProperty(value ="デバイス名")