From ee711d38f66222915bc81332c98af677fa5cd96c Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 16 七月 2024 22:17:02 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java | 18 +++++++++++-------
1 files changed, 11 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 d1171e2..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
@@ -46,7 +46,7 @@
public class ComSupport {
//@Value("${mw.comSendUrl}")
- private String comSendUrl;
+ protected String comSendUrl;
protected static String controllerType = null;
protected static Integer projectNo = null;
@@ -72,6 +72,9 @@
private SeVirtualCardMapper seVirtualCardMapper;
public static ComSupport comSupport;
+
+ public ComSupport() {
+ }
/**
* 寮曞叆BaSettingsMapper
@@ -123,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;
}
@@ -139,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);
@@ -255,13 +259,13 @@
// 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
rmCommandHistoryMapper.insert(rmCommandHistory);
- comId = rmCommandHistory.getId();
+ 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());
@@ -294,7 +298,7 @@
* 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
*/
rmCommandHistory = new RmCommandHistory();
- rmCommandHistory.setId(comId);
+ rmCommandHistory.setComId(comId);
rmCommandHistory.setResult((byte)0);
rmCommandHistory.setResultTime(new Date());
rmCommandHistory.setResultText((JSONObject)JSON.toJSON(response_CallBack.getContent()));
@@ -326,7 +330,7 @@
// 鏇存柊鍛戒护鏃ュ織锛氭墽琛岀粨鏋溿�佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
rmCommandHistory = new RmCommandHistory();
- rmCommandHistory.setId(comId);
+ rmCommandHistory.setComId(comId);
rmCommandHistory.setResult((byte)1);
rmCommandHistory.setResultTime(new Date());
rmCommandHistory.setResultText((JSONObject)JSON.toJSON(myData));
--
Gitblit v1.8.0