From 7ae1456345209704248fd184e0218b0c0f677a84 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 06 一月 2026 15:26:17 +0800
Subject: [PATCH] 最新版本541200007最新版本541200007
---
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/JiandaoyunCloudController.java | 4 ++--
admin/src/components/business/OperaDeviceDuanluqiWindow.vue | 3 ++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 36 +++++++++++++++++++++++++++++++-----
3 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/admin/src/components/business/OperaDeviceDuanluqiWindow.vue b/admin/src/components/business/OperaDeviceDuanluqiWindow.vue
index d1ec282..9cd78ab 100644
--- a/admin/src/components/business/OperaDeviceDuanluqiWindow.vue
+++ b/admin/src/components/business/OperaDeviceDuanluqiWindow.vue
@@ -35,7 +35,8 @@
2.鎺у埗寮�鍏冲簭鍙凤細绯荤粺鏍规嵁閰嶇疆瑙勫垯锛屽垽鏂紑鍏冲綋鍓嶇┖闂蹭腑杩涜銆愯嚜鍔ㄥ垎闂搞��,澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑锛屽 1,2;<br>
3.鑷姩鍒嗛椄瑙勫垯锛氶拡瀵规帶鍒跺紑鍏冲簭鍙风殑閰嶇疆锛屽畾鏃舵娴嬨�愮┖闂叉椂闀裤�戝唴婊¤冻寮�鍏崇數娴佸�奸兘鍦ㄣ�愮┖闂茬數娴侀槇鍊笺�戣寖鍥村唴锛屽垯杩涜鑷姩鍒嗛椄鎺у埗;<br>
4.绌洪棽鏃堕暱: 璇疯缃嚦灏戠┖闂叉椂闀垮ぇ浜庣瓑浜�300绉掞紙5鍒嗛挓锛夈��<br>
- 5.濡傞渶杩滅▼鎺у埗寮�鍏筹紝璇锋纭～鍐欎笅杩板叏閮ㄥ弬鏁颁俊鎭��
+ 5.淇敼閲嶅惎: 淇敼閰嶇疆鍙傛暟鍚庯紝杩斿洖鍒楄〃椤碉紝鐐瑰嚮閲嶅惎銆愬惎鐢ㄣ�戯紝鏄弬鏁扮敓鏁堬紒<br>
+ 6.濡傞渶杩滅▼鎺у埗寮�鍏筹紝璇锋纭～鍐欎笅杩板叏閮ㄥ弬鏁颁俊鎭��
</p>
<div style="display: flex">
<el-form-item label="鍏ㄩ儴寮�鍏冲簭鍙�" prop="channelNo" style="display: inline-block;width:300px;">
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/JiandaoyunCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/JiandaoyunCloudController.java
index b4c0182..e783c90 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/JiandaoyunCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/JiandaoyunCloudController.java
@@ -167,8 +167,8 @@
String url = "https://lcdp.ahyc.com.cn:30443/api/v1/automation/tenant/61b6fb6080e9de2aa1df94d7/hooks/6954aca3cdf86954d2657433fb470ca1aabd108246925eca";
JSONObject object = new JSONObject();
object.put("status",0);
- object.put("username","20251104160000" );
- object.put("info", "杩欐槸澶囨敞");
+ object.put("username","15345690849" );
+ object.put("info", "杩欐槸澶囨敞111");
String result = HttpsUtil.postJson(url,JSONObject.toJSONString(object));
System.out.println(result);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
index c30157f..e8b905c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -118,7 +118,32 @@
if(device.getDoorNameObj()!=null && Constants.equalsInteger(device.getType(),Constants.DEVICE_TYPE.duanluqi)){
device.setDoorName(JSONObject.toJSONString(device.getDoorNameObj()));
}
+ Device model = deviceMapper.selectById(device.getId());
+ if(model ==null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(Constants.equalsInteger(model.getType(),Constants.DEVICE_TYPE.duanluqi)){
+ //濡傛灉鏄柗璺櫒
+ if( Constants.equalsInteger(model.getIsUsed(),Constants.ZERO)
+ && StringUtils.equals(device.getDoorName(),model.getDoorName())){
+ //濡傛灉閰嶇疆鍙傛暟鍙戠敓浜嗗彉鍖�,璁剧疆鐘舵�佹湭鍚敤
+ device.setIsUsed(Constants.ONE);
+ try {
+ MqttClient mqttClient = MqttClientCache.clientMapCache.get("device"+device.getId());
+ if(mqttClient !=null){
+ if(mqttClient.isConnected()){
+ mqttClient.disconnect();
+ }
+ mqttClient.close();
+ MqttClientCache.clientMapCache.remove("device"+device.getId());
+ }
+ }catch (Exception e){
+ log.error("==============绔彛mqtt閾炬帴澶辫触锛�"+model.getName()+e.getMessage());
+ }
+ }
+ }
deviceMapper.updateById(device);
+
}
@Override
@@ -349,11 +374,12 @@
//濡傛灉绯荤粺涓嶇敤浜嗭紝绔彛mqtt杩炴帴
try {
mqttClient = mqttBizService.unsubscribe(mqttClient,config ,topics);
- if(mqttClient ==null){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"寤虹珛杩炴帴澶辫触锛�");
- }
- if(mqttClient.isConnected()){
- mqttClient.disconnect();
+ if(mqttClient !=null){
+ if(mqttClient.isConnected()){
+ mqttClient.disconnect();
+ }
+ mqttClient.close();
+ MqttClientCache.clientMapCache.remove("device"+param.getId());
}
}catch (Exception e){
log.error("==============绔彛mqtt閾炬帴澶辫触锛�"+model.getName()+e.getMessage());
--
Gitblit v1.9.3