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 | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 160 insertions(+), 5 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 eb65882..168052f 100644
--- a/src/main/java/com/fzzy/protocol/zldz/service/ZldzGatewayGrainService.java
+++ b/src/main/java/com/fzzy/protocol/zldz/service/ZldzGatewayGrainService.java
@@ -12,9 +12,7 @@
import com.fzzy.protocol.ProtocolUtils;
import com.fzzy.protocol.bhzn.cmd.CommandBuild;
import com.fzzy.protocol.bhzn.server.BhznGrainV2ServerEngine;
-import com.fzzy.protocol.zldz.cmd.CommandBuilder1115;
-import com.fzzy.protocol.zldz.cmd.CommandBuilder8815;
-import com.fzzy.protocol.zldz.cmd.CommandBuilder8817;
+import com.fzzy.protocol.zldz.cmd.*;
import com.fzzy.protocol.zldz.data.Message;
import com.fzzy.protocol.zldz.server.ZldzServerEngine;
import com.fzzy.protocol.zldz.server.ZldzServerUtil;
@@ -92,6 +90,163 @@
return resp;
}
+ @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();
+
+ GatewayDevice device = reqData.getDevice();
+ BaseRequest request = new BaseRequest();
+ request.setIp(device.getIp());
+ request.setPort(device.getPort());
+ request.setSerName(device.getDeviceName());
+
+ request.setCompanyId(ZldzServerUtil.DEFAULT_COMPANY);
+
+ // Step1 鐢熸垚鍛戒护
+ Message message = CommandBuilder1116_0.getInstance().buildMessage(request);
+ // 鍙戦�佸懡浠�
+ InvokeResult result = ZldzServerEngine.push(device.getIp(), device.getPort(), message.getByteMsg());
+
+ log.info("骞冲彴------>>>鍒嗘満锛�" + request.getSerName() + "-璇诲彇閰嶇疆鍛戒护=" + message);
+
+ //濡傛灉鍛戒护鍙戦�佸け璐ワ紝鐩存帴韪㈡帀杩炴帴
+ if (!InvokeResult.SUCCESS.getCode().equals(result.getCode())) {
+ resp.setCode(500);
+ resp.setMsg(result.getMessage());
+ }
+ return resp;
+ }
+
+ @Override
+ public BaseResp writeConf(BaseReqData reqData) {
+ BaseResp resp = new BaseResp();
+
+ GatewayDevice device = reqData.getDevice();
+ BaseRequest request = new BaseRequest();
+ request.setIp(device.getIp());
+ request.setPort(device.getPort());
+ request.setCompanyId(device.getOrgId());
+ request.setSerName(device.getDeviceName());
+
+ // Step1 鐢熸垚鍛戒护
+ Message message = CommandBuilder1116_1.getInstance().buildMessage(request, device);
+ // 鍙戦�佸懡浠�
+ InvokeResult result = ZldzServerEngine.push(device.getIp(), device.getPort(), message.getByteMsg());
+
+ log.info("骞冲彴------>>>鍒嗘満锛�" + request.getSerName() + "-鍐欏叆閰嶇疆鍛戒护=" + message);
+
+ //濡傛灉鍛戒护鍙戦�佸け璐ワ紝鐩存帴韪㈡帀杩炴帴
+ if (!InvokeResult.SUCCESS.getCode().equals(result.getCode())) {
+ resp.setCode(500);
+ resp.setMsg(result.getMessage());
+ }
+ return resp;
+ }
+
+ @Override
+ public BaseResp initCable(BaseReqData reqData) {
+ BaseResp resp = new BaseResp();
+
+ GatewayDevice device = reqData.getDevice();
+ BaseRequest request = new BaseRequest();
+ request.setIp(device.getIp());
+ request.setPort(device.getPort());
+ request.setCompanyId(device.getOrgId());
+ request.setSerName(device.getDeviceName());
+
+ // Step1
+ Message message = CommandBuilder1122.getInstance().buildMessage(request);
+ // 鍙戦�佸懡浠�
+ InvokeResult result = ZldzServerEngine.push(device.getIp(), device.getPort(), message.getByteMsg());
+
+ log.info("骞冲彴------>>>鍒嗘満锛�" + request.getSerName() + "-鍒濆鍖栫數缂嗗懡浠�=" + message);
+
+ //濡傛灉鍛戒护鍙戦�佸け璐ワ紝鐩存帴韪㈡帀杩炴帴
+ if (!InvokeResult.SUCCESS.getCode().equals(result.getCode())) {
+ resp.setCode(500);
+ resp.setMsg(result.getMessage());
+ }
+ return resp;
+ }
+
+ @Override
+ public BaseResp disconnect(BaseReqData reqData) {
+ BaseResp resp = new BaseResp();
+ GatewayDevice device = reqData.getDevice();
+
+ ApiCommonDevice commonDevice = Constant.getCommonDeviceCache(device.getDeviceSn());
+
+ if (null == commonDevice) {
+ resp.setCode(500);
+ resp.setMsg("绯荤粺鏈彂鐜拌繛鎺ヨ澶囷紝鍙栨秷鎵ц");
+ return resp;
+ }
+
+ ZldzServerEngine.disconnect(commonDevice.getIp(), commonDevice.getPort());
+ return resp;
+ }
+
+ @Override
+ public BaseResp transparent(BaseReqData reqData) {
+ BaseResp resp = new BaseResp();
+
+ return resp;
+ }
+
/**
* 鏈嶅姟鍣ㄥ洖澶嶇粓绔殑鏀跺埌璇锋眰
*
@@ -103,7 +258,7 @@
Message message = CommandBuilder8815.getInstance().buildMessage(
request);
- log.debug("骞冲彴------>>>鍒嗘満锛�" +request.getSerName() + "-绮儏鏈嶅姟绔洖澶嶅懡浠�=" + message.toString());
+ log.debug("骞冲彴------>>>鍒嗘満锛�" + request.getSerName() + "-绮儏鏈嶅姟绔洖澶嶅懡浠�=" + message.toString());
// 鍙戦�佸懡浠�
InvokeResult result = ZldzServerEngine.push(request.getIp(), request.getPort(), message.getByteMsg());
@@ -130,7 +285,7 @@
Message message = CommandBuilder8817.getInstance().buildMessage(request);
- log.debug("骞冲彴------>>>鍒嗘満锛�" +request.getSerName() + "-绮儏鏈嶅姟绔洖澶嶆敹鍒扮伯鎯呭寘鍛戒护=" + message.toString());
+ log.debug("骞冲彴------>>>鍒嗘満锛�" + request.getSerName() + "-绮儏鏈嶅姟绔洖澶嶆敹鍒扮伯鎯呭寘鍛戒护=" + message.toString());
// 鍙戦�佸懡浠�
InvokeResult result = ZldzServerEngine.push(request.getIp(), request.getPort(),
--
Gitblit v1.9.3