From 33e53de5a1fb438f8c6bef6a9fb496c10148a52b Mon Sep 17 00:00:00 2001
From: daiyongfei <974332738@qq.com>
Date: Tue, 22 Jul 2025 16:13:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=B8=BB=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customer/service/impl/CustomerServiceImpl.java |  1 +
 .../com/fuyuanshen/equipment/domain/Device.java    | 14 +++++++++++++-
 .../equipment/service/impl/DeviceServiceImpl.java  |  4 ++++
 .../resources/mapper/equipment/DeviceMapper.xml    |  2 +-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/impl/CustomerServiceImpl.java b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/impl/CustomerServiceImpl.java
index 10e1e7f..85cffbf 100644
--- a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/impl/CustomerServiceImpl.java
+++ b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/impl/CustomerServiceImpl.java
@@ -107,6 +107,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
 
     /**
      * 修改客户
+     * 不是因为寂寞才想你，只是因为想你才寂寞。
      *
      * @param customer /
      */
diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java
index 9ec8bc1..52b05c9 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java
@@ -105,7 +105,6 @@ public class Device extends TenantEntity {
     @Schema(name = "设备状态")
     private Integer deviceStatus;
 
-
     /**
      * 绑定状态
      * 0 未绑定
@@ -127,4 +126,17 @@ public class Device extends TenantEntity {
     private Date bindingTime;
 
     private String sendMsg;
+
+    /**
+     * 发布主题（格式：A/{device_id}）
+     * pub_topic
+     */
+    private String pubTopic;
+
+    /**
+     * 订阅主题（格式：B/{device_id}）
+     * sub_topic
+     */
+    private String subTopic;
+
 }
diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
index 5534d9d..60cbc58 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
@@ -186,6 +186,10 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
         device.setCreateByName(loginUser.getNickname());
         device.setTypeName(deviceTypes.getTypeName());
         device.setDeviceType(deviceTypes.getId());
+        if (device.getDeviceImei() != null) {
+            device.setPubTopic("A/" + device.getDeviceImei());
+            device.setSubTopic("B/" + device.getDeviceImei());
+        }
 
         deviceMapper.insert(device);
 
diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
index 06fe6bc..dc60b8b 100644
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
@@ -39,7 +39,7 @@
     <!-- 分页查询设备 -->
     <select id="findAll" resultType="com.fuyuanshen.equipment.domain.Device">
         select
-        da.id AS id,d.device_name,d.bluetooth_name,
+        da.id AS id,d.device_name,d.bluetooth_name,d.pub_topic,d.sub_topic,
         d.device_pic, d.device_mac, d.device_sn, d.update_by,d.device_imei,
         d.update_time, dg.id AS device_type, d.remark, d.binding_status,t.type_name AS typeName,
         da.assignee_id AS customerId, da.assignee_name AS customerName, da.active AS deviceStatus,