From 61cfa0d30461a8020f4e54330ea049ac6efb07c9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 17 七月 2024 16:21:41 +0800
Subject: [PATCH] 1、完善代码； 2、修改上行命令结果匹配命令的bug;
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
index c4931dc..234a1bf 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
@@ -19,7 +19,6 @@
import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard;
import jakarta.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -46,8 +45,8 @@
*/
public class ComSupport {
- @Value("${mw.comSendUrl}")
- private String comSendUrl;
+ //@Value("${mw.comSendUrl}")
+ protected String comSendUrl;
protected static String controllerType = null;
protected static Integer projectNo = null;
@@ -73,6 +72,9 @@
private SeVirtualCardMapper seVirtualCardMapper;
public static ComSupport comSupport;
+
+ public ComSupport() {
+ }
/**
* 寮曞叆BaSettingsMapper
@@ -124,6 +126,7 @@
job_rtu.put("rtuAddr", prController.getRtuAddr());
job_rtu.put("protocol", prController.getProtocol());
job_rtu.put("intakeId", prController.getIntakeId());
+ job_rtu.put("orgTag", prController.getOrgTag());
return job_rtu;
}
@@ -140,7 +143,7 @@
*/
protected RmCommandHistory getComHistory(Long comId, String commandCode, String commandName, Long intakeId, String rtuAddr, String protocol, Object param, Long operator ) {
RmCommandHistory rmCommandHistory = new RmCommandHistory();
- rmCommandHistory.setId(comId);
+ rmCommandHistory.setComId(comId);
rmCommandHistory.setCommandCode(commandCode);
//rmCommandHistory.setCommandName(CodeV202404.getCodeName(commandCode));
rmCommandHistory.setCommandName(commandName);
@@ -256,12 +259,13 @@
// 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
rmCommandHistoryMapper.insert(rmCommandHistory);
+ comId = rmCommandHistory.getComId();
// 鍥炶皟寮傚父
if(!response_CallBack.getCode().equals("0001")) {
// 鍛戒护鏃ュ織鎵ц缁撴灉鏀逛负澶辫触
rmCommandHistory = new RmCommandHistory();
- rmCommandHistory.setId(comId);
+ rmCommandHistory.setComId(comId);
rmCommandHistory.setResult((byte)0);
rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
@@ -276,7 +280,7 @@
*/
rmCommandHistory = new RmCommandHistory();
- rmCommandHistory.setId(comId);
+ rmCommandHistory.setComId(comId);
rmCommandHistory.setResult((byte) 0);
rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
return BaseResponseUtils.buildErrorMsg(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
@@ -289,12 +293,24 @@
System.out.println(job_subData);
Boolean dealResult = job_subData.getBoolean("success");
if(!dealResult) {
+ /**
+ * 鎵ц澶辫触
+ * 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
+ */
+ rmCommandHistory = new RmCommandHistory();
+ rmCommandHistory.setComId(comId);
+ rmCommandHistory.setResult((byte)0);
+ rmCommandHistory.setResultTime(new Date());
+ rmCommandHistory.setResultText((JSONObject)JSON.toJSON(response_CallBack.getContent()));
+ rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
}
/**
- * 鎵ц鎴愬姛锛岃繑鍥炲洖璋冨唴瀹�
+ * 鎵ц鎴愬姛
* 濡傛灉鏄紑鍏抽榾锛氭洿鏀硅櫄鎷熷崱鐘舵�侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
+ * 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
+ * 杩斿洖鍥炶皟鍐呭
*/
if(comType != null) {
SeVirtualCard virtualCard = new SeVirtualCard();
@@ -311,6 +327,15 @@
// 鍥炶皟杩斿洖鐨勫唴瀹�
Data myData = (Data)response_CallBack.getContent();
+
+ // 鏇存柊鍛戒护鏃ュ織锛氭墽琛岀粨鏋溿�佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
+ rmCommandHistory = new RmCommandHistory();
+ rmCommandHistory.setComId(comId);
+ rmCommandHistory.setResult((byte)1);
+ rmCommandHistory.setResultTime(new Date());
+ rmCommandHistory.setResultText((JSONObject)JSON.toJSON(myData));
+ rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
+
return BaseResponseUtils.buildSuccess(myData) ;
} else {
// 璇锋眰澶辫触
--
Gitblit v1.8.0