From 1cdf314f0e9e1f499906809faf0767bd6e487dea Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Sat, 20 Dec 2025 15:52:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=B1=BB=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SurvIotVirtualDeviceServiceImpl.java       | 13 -------------
 .../java/org/jeecg/modules/mqtt/MqttConfig.java     |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceServiceImpl.java
index dd4a197..aac84d8 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceServiceImpl.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvIotVirtualDeviceServiceImpl.java
@@ -333,19 +333,6 @@ public class SurvIotVirtualDeviceServiceImpl extends ServiceImpl<SurvIotVirtualD
                 } else {
                     log.error("==================未能识别功能码，错误信息：{}：主题：{}===================", res != null ? res.getErrorMsg() : "", ident);
                 }
-                //如果是心跳，更新设备的时间
-                String infoStr = new String(payload);
-                log.error("========{}==========更新心跳：{}===================", infoStr, ident);
-                if ("www.usr.cn".equals(infoStr)) {
-                    //查询网络模块
-                    List<SurvIotVirtualDeviceModule> modules = getModulesByIdent(ident);
-                    if (!modules.isEmpty()) {
-                        List<String> deviceId = modules.stream().map(SurvIotVirtualDeviceModule::getDeviceId).collect(Collectors.toList());
-                        List<SurvIotVirtualDevice> devices = lambdaQuery().in(SurvIotVirtualDevice::getId, deviceId).list();
-                        List<String> deploys = devices.stream().map(SurvIotVirtualDevice::getIotId).collect(Collectors.toList());
-                        deviceDeployService.refreshLastSyncTimeByDeployCode(deploys);
-                    }
-                }
         }catch (Exception e){
             e.printStackTrace();
             log.error("处理厂家mqtt报文失败，"+e.getMessage());
diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/mqtt/MqttConfig.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/mqtt/MqttConfig.java
index a12fb60..e2a3584 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/mqtt/MqttConfig.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/mqtt/MqttConfig.java
@@ -29,7 +29,7 @@ public class MqttConfig {
     @Value("${mqtt.password}")
     public String password;
 //    @Value("${mqtt.clientId}")
-    public String clientId = "jppApp-" + UUID.fastUUID().toString().replaceAll("-","").substring(0,5);
+    public String clientId = "fxApp-" + UUID.fastUUID().toString().replaceAll("-","").substring(0,5);
     @Value("${mqtt.timeout}")
     public int timeOut;
     @Value("${mqtt.keepalive}")