From caf2599a9869244ded811018811c37a2aabac3fc Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 08 一月 2025 11:29:05 +0800
Subject: [PATCH] 优化测温协议
---
src/main/java/com/fzzy/protocol/zldz/service/ZldzGatewayGrainService.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/fzzy/protocol/zldz/service/ZldzGatewayGrainService.java b/src/main/java/com/fzzy/protocol/zldz/service/ZldzGatewayGrainService.java
index 366935a..168052f 100644
--- a/src/main/java/com/fzzy/protocol/zldz/service/ZldzGatewayGrainService.java
+++ b/src/main/java/com/fzzy/protocol/zldz/service/ZldzGatewayGrainService.java
@@ -91,6 +91,60 @@
}
@Override
+ public BaseResp syncGrainTh(BaseReqData reqData) {
+
+ BaseResp resp = new BaseResp();
+
+ GatewayDevice device = reqData.getDevice();
+
+ //鑾峰彇杩炴帴涓殑璁惧淇℃伅
+ ApiCommonDevice apiCommonDevice = Constant.getCommonDeviceCache(device.getDeviceSn());
+
+ if (null == apiCommonDevice) {
+ resp.setCode(500);
+ resp.setMsg("绯荤粺鏈幏鍙栧埌涓嬭杩炴帴璁惧淇℃伅锛屾棤娉曟墽琛�");
+ log.error("----------------绯荤粺鏈幏鍙栧埌涓嬭杩炴帴璁惧淇℃伅,鏃犳硶鎵ц---------");
+ return resp;
+ }
+
+ if (Constant.YN_N.equals(apiCommonDevice.getStatus())) {
+ resp.setCode(500);
+ resp.setMsg("涓嬭璁惧涓嶅湪绾�---鏃犳硶鎵ц----" + device.getDeviceName());
+ log.error("涓嬭璁惧涓嶅湪绾�---鏃犳硶鎵ц----" + device.getDeviceName());
+ return resp;
+ }
+
+ device.setIp(apiCommonDevice.getIp());
+ device.setPort(apiCommonDevice.getPort());
+
+ reqData.setDevice(device);
+
+ try {
+ //鐢熸垚娓╁害鍛戒护
+ Message message = CommandBuilder1128.getInstance().getInstance().buildMessage(reqData, apiCommonDevice);
+
+ log.error("骞冲彴------>>>>鎺у埗鏌滐細鍙戦�佹俯婀垮害妫�娴嬪懡浠�-{}", message);
+ // 鍙戦�佸懡浠�
+ InvokeResult result = ZldzServerEngine.push(apiCommonDevice.getIp(), apiCommonDevice.getPort(), message.getByteMsg());
+
+ // 灏佽杩斿洖淇℃伅
+ if (!InvokeResult.SUCCESS.getCode().equals(result.getCode())) {
+ log.error("骞冲彴------>>>>鎺у埗鏌滐細鍙戦�佹俯婀垮害妫�娴嬪懡浠�-澶辫触{}", result.getMessage());
+ resp.setCode(500);
+ resp.setMsg("骞冲彴------>>>>鎺у埗鏌滐細鍙戦�佹俯婀垮害妫�娴嬪懡浠�-澶辫触锛�" + result.getMessage());
+ }
+
+ } catch (Exception e) {
+ log.error("娓╂箍搴︽娴嬪紓甯革細{}", e);
+ resp.setCode(500);
+ resp.setMsg("骞冲彴------>>>>鎺у埗鏌滐細鍙戦�佹俯婀垮害妫�娴嬪懡浠わ細" + e.getMessage());
+ return resp;
+ }
+
+ return resp;
+ }
+
+ @Override
public BaseResp syncConf(BaseReqData reqData) {
BaseResp resp = new BaseResp();
@@ -129,7 +183,7 @@
request.setSerName(device.getDeviceName());
// Step1 鐢熸垚鍛戒护
- Message message = CommandBuilder1116_1.getInstance().buildMessage(request,device);
+ Message message = CommandBuilder1116_1.getInstance().buildMessage(request, device);
// 鍙戦�佸懡浠�
InvokeResult result = ZldzServerEngine.push(device.getIp(), device.getPort(), message.getByteMsg());
@@ -176,13 +230,13 @@
ApiCommonDevice commonDevice = Constant.getCommonDeviceCache(device.getDeviceSn());
- if(null == commonDevice){
+ if (null == commonDevice) {
resp.setCode(500);
resp.setMsg("绯荤粺鏈彂鐜拌繛鎺ヨ澶囷紝鍙栨秷鎵ц");
return resp;
}
- ZldzServerEngine.disconnect(commonDevice.getIp(),commonDevice.getPort());
+ ZldzServerEngine.disconnect(commonDevice.getIp(), commonDevice.getPort());
return resp;
}
--
Gitblit v1.9.3