From 4bd0c2c252df008b98d3e9c7dac708ff642c90d1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 17 七月 2024 16:21:47 +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 | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 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 234a1bf..46c51d7 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
@@ -250,16 +250,16 @@
// 鏋勯�犲懡浠�
Command com = command(comId, commandCode, rtuAddr, protocol, rtuResultSendWebUrl, param);
+ // 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
+ RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
+ rmCommandHistoryMapper.insert(rmCommandHistory);
+ comId = rmCommandHistory.getComId();
+
// 鍙戦�佸懡浠�
JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com));
if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) {
// 璇锋眰鎴愬姛, 澶勭悊鍥炶皟
BaseResponse response_CallBack = dealWithCallBack(comId);
-
- // 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
- RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
- rmCommandHistoryMapper.insert(rmCommandHistory);
- comId = rmCommandHistory.getComId();
// 鍥炶皟寮傚父
if(!response_CallBack.getCode().equals("0001")) {
@@ -288,9 +288,7 @@
// 鍥炶皟鎴愬姛锛屽啀鍒ゆ柇鎵ц鏄惁鎴愬姛
JSONObject job_content = (JSONObject)JSON.toJSON(response_CallBack.getContent());
- System.out.println(job_content);
JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData");
- System.out.println(job_subData);
Boolean dealResult = job_subData.getBoolean("success");
if(!dealResult) {
/**
@@ -301,7 +299,8 @@
rmCommandHistory.setComId(comId);
rmCommandHistory.setResult((byte)0);
rmCommandHistory.setResultTime(new Date());
- rmCommandHistory.setResultText((JSONObject)JSON.toJSON(response_CallBack.getContent()));
+ //rmCommandHistory.setResultText((JSONObject)JSON.toJSON(response_CallBack.getContent()));
+ rmCommandHistory.setResultText(response_CallBack.getContent().toString());
rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
}
@@ -329,12 +328,12 @@
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);
+ //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