From 664bb4d0b7799328667ffc47e39da711a77ddbfa Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 28 八月 2023 12:05:33 +0800
Subject: [PATCH] 更新MODBUS-TCP协议，调整配置2
---
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteGasServiceImpl.java | 142 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 138 insertions(+), 4 deletions(-)
diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteGasServiceImpl.java b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteGasServiceImpl.java
index 8862faa..f475b24 100644
--- a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteGasServiceImpl.java
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemoteGasServiceImpl.java
@@ -1,10 +1,26 @@
package com.ld.igds.protocol.modbus.command;
+import com.ld.igds.constant.BizType;
import com.ld.igds.io.RemoteGasService;
+import com.ld.igds.io.constant.OrderRespEnum;
+import com.ld.igds.io.constant.ProtocolEnum;
import com.ld.igds.io.request.CheckGasRequest;
+import com.ld.igds.io.response.DeviceControlResponse;
import com.ld.igds.io.response.GasResponse;
+import com.ld.igds.modbus.service.HModbusService;
+import com.ld.igds.models.DeviceModbus;
+import com.ld.igds.models.GasModbus;
+import com.ld.igds.protocol.modbus.ModbusUtil2;
+import com.ld.igds.protocol.modbus.ServerUtil;
+import com.ld.igds.protocol.modbus.data.ModbusGasResult;
+import com.ld.igds.protocol.modbus.data.ModbusTcp;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
/**
* 褰撳墠鍗忚閽堝鏍囧噯Modbus-TCP鍗忚
@@ -19,23 +35,141 @@
public static final String BEAN_ID = "modbus.remoteGasService";
+ @Resource
+ private HModbusService modbusService;
+ @Resource
+ private AnalysisService analysisService;
+
@Override
public String getProtocol() {
- return null;
+ return ProtocolEnum.TCP_MODBUS.getCode();
}
@Override
public GasResponse checkGas(CheckGasRequest request) {
- return null;
+ String passCode = request.getDepotId();
+
+ try {
+ //鑾峰彇闇�瑕佹墽琛岀殑璁惧閰嶇疆
+ DeviceModbus deviceModbus = modbusService.getCacheDeviceModbus(request.getCompanyId(), passCode, BizType.GAS.getCode());
+
+ ModbusTcp modbusTcp = new ModbusTcp(deviceModbus);
+ modbusTcp.setIp(request.getIp());
+ modbusTcp.setPort(request.getPort());
+ modbusTcp.setBizCode(passCode);
+ modbusTcp.setSerId(request.getSerId());
+ modbusTcp.setCompanyId(request.getCompanyId());
+
+ modbusTcp.setAddrExe(ServerUtil.getAddrExe(deviceModbus.getOpen()));
+
+ boolean exeResult = ModbusUtil2.writeCoilStatus(modbusTcp.getIp(), modbusTcp.getPort(), modbusTcp.getAddrExe(), true);
+ if (exeResult) {
+ //璋冪敤寮傛鑾峰彇缁撴灉
+ progressGasResult(request, modbusTcp);
+ log.debug("--------鍚姩娴嬫皵---{}-{}", modbusTcp.getSerId(), modbusTcp.getBizCode());
+ }
+
+ } catch (Exception e) {
+ return new GasResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鍚庡彴鎵ц寮傚父锛�" + e.getLocalizedMessage());
+ }
+
+ return new GasResponse(OrderRespEnum.ORDER_SUCCESS);
+ }
+
+ /**
+ * 寮傛鎵ц杩涘害鏌ヨ
+ *
+ * @param modbusTcp
+ */
+ @Async
+ public void progressGasResult(CheckGasRequest request, ModbusTcp modbusTcp) {
+
+ log.debug("--------------寮傛鎵ц姘斾綋妫�娴嬭杩囪幏鍙�-------------");
+
+ try {
+ List<GasModbus> list = modbusService.listGasModBus(modbusTcp.getBizCode());
+
+ if (null == list || list.isEmpty()) {
+ log.error("------------鏇存柊姘斾綋妫�娴嬬粨鏋滆繘搴﹀け璐ワ紝娌℃湁鑾峰彇鍒版娴嬮�氶亾閰嶇疆淇℃伅-----{}", modbusTcp.getBizCode());
+ return;
+ }
+
+ //鏍规嵁閫氶亾鏁伴噺绾跨▼绛夊緟锛屾瘡涓�氶亾绛夊緟50绉�
+ Thread.sleep(list.size() * 50 * 1000);
+ log.debug("--------------绛夊緟鏃堕棿瀹屾垚锛屽紑濮嬭幏鍙栨娴嬬粨鏋�-------------{}", modbusTcp.getBizCode());
+
+ ModbusTcp modbusTcpTemp = modbusTcp;
+ List<ModbusGasResult> results = new ArrayList<>();
+ ModbusGasResult gasResult;
+ Number check;
+ for (GasModbus gasModbus : list) {
+ gasResult = new ModbusGasResult();
+ gasResult.setPasscode(gasModbus.getPasscode());
+
+ //浜屾哀鍖栫⒊
+ modbusTcpTemp.setAddrExe(ServerUtil.getAddrExe(gasModbus.getCo2()));
+ check = ModbusUtil2.readHoldingRegister(modbusTcpTemp.getIp(), modbusTcpTemp.getPort(), modbusTcpTemp.getAddrExe());
+ gasResult.setCo2(check);
+
+ //姘ф皵
+ modbusTcpTemp.setAddrExe(ServerUtil.getAddrExe(gasModbus.getO2()));
+ check = ModbusUtil2.readHoldingRegister(modbusTcpTemp.getIp(), modbusTcpTemp.getPort(), modbusTcpTemp.getAddrExe());
+ gasResult.setO2(check);
+
+ //纾峰寲姘�
+ modbusTcpTemp.setAddrExe(ServerUtil.getAddrExe(gasModbus.getPh3()));
+ check = ModbusUtil2.readHoldingRegister(modbusTcpTemp.getIp(), modbusTcpTemp.getPort(), modbusTcpTemp.getAddrExe());
+ gasResult.setPh3(check);
+
+ results.add(gasResult);
+ }
+
+
+ log.debug("----鑾峰彇鐨勬皵浣撴娴嬬粨鏋�---{}--{}", request.getDepotId(), results.toString());
+ //閫氱煡瑙ｆ瀽
+ analysisService.analysisGas(request, results);
+
+ } catch (Exception e) {
+ log.error("------------鏇存柊姘斾綋妫�娴嬬粨鏋滆繘搴﹀け璐ワ紝鎵ц寮傚父-----{}--{}", modbusTcp.getBizCode(), e.getMessage());
+ }
+
}
@Override
public GasResponse checkGasByPoint(CheckGasRequest request) {
- return null;
+ return new GasResponse(OrderRespEnum.ORDER_ERROR.getCode(), "褰撳墠鎺у埗鏌滀笉鏀寔閫夋嫨鐐逛綅閲囬泦");
}
@Override
public GasResponse stopCheckGas(CheckGasRequest request) {
- return null;
+ String passCode = request.getDepotId();
+
+ try {
+ //鑾峰彇闇�瑕佹墽琛岀殑璁惧閰嶇疆
+ DeviceModbus deviceModbus = modbusService.getCacheDeviceModbus(request.getCompanyId(), passCode, BizType.GAS.getCode());
+
+ ModbusTcp modbusTcp = new ModbusTcp(deviceModbus);
+ modbusTcp.setIp(request.getIp());
+ modbusTcp.setPort(request.getPort());
+ modbusTcp.setBizCode(passCode);
+ modbusTcp.setSerId(request.getSerId());
+ modbusTcp.setCompanyId(request.getCompanyId());
+
+ modbusTcp.setAddrExe(ServerUtil.getAddrExe(deviceModbus.getStop()));
+
+ boolean exeResult = ModbusUtil2.writeCoilStatus(modbusTcp.getIp(), modbusTcp.getPort(), modbusTcp.getAddrExe(), true);
+ if (exeResult) {
+ log.debug("--------鍏抽棴娴嬫皵---{}-{}", modbusTcp.getSerId(), modbusTcp.getBizCode());
+
+ //閫氱煡寮傛缁撴潫缁撴灉閲囬泦
+ }
+
+ } catch (Exception e) {
+ return new GasResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鍚庡彴鎵ц寮傚父锛�" + e.getLocalizedMessage());
+ }
+
+ return new GasResponse(OrderRespEnum.ORDER_SUCCESS);
}
+
+
}
--
Gitblit v1.9.3