From 18f9dc6d0f15cad4a74e68fcf87b1a9aa83b5e66 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 18 七月 2024 14:28:28 +0800 Subject: [PATCH] 实现协议中各种命令结果日志数据库永久更新保存功能 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java | 50 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 37 insertions(+), 13 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..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 @@ -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); @@ -247,21 +250,22 @@ // 鏋勯�犲懡浠� 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); - // 鍥炶皟寮傚父 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()); @@ -284,17 +288,28 @@ // 鍥炶皟鎴愬姛锛屽啀鍒ゆ柇鎵ц鏄惁鎴愬姛 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) { + /** + * 鎵ц澶辫触 + * 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹� + */ + rmCommandHistory = new RmCommandHistory(); + rmCommandHistory.setComId(comId); + rmCommandHistory.setResult((byte)0); + rmCommandHistory.setResultTime(new Date()); + //rmCommandHistory.setResultText((JSONObject)JSON.toJSON(response_CallBack.getContent())); + rmCommandHistory.setResultText(response_CallBack.getContent().toString()); + rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory); return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString()); } /** - * 鎵ц鎴愬姛锛岃繑鍥炲洖璋冨唴瀹� + * 鎵ц鎴愬姛 * 濡傛灉鏄紑鍏抽榾锛氭洿鏀硅櫄鎷熷崱鐘舵�侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂� + * 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹� + * 杩斿洖鍥炶皟鍐呭 */ if(comType != null) { SeVirtualCard virtualCard = new SeVirtualCard(); @@ -311,6 +326,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