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 | 111 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 82 insertions(+), 29 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 644f9b7..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
@@ -5,16 +5,18 @@
import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.CommandType;
import com.dy.common.mw.protocol.Data;
-import com.dy.common.mw.protocol.p206V202404.CodeV202404;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pipIrrGlobal.command.dto.Param;
+import com.dy.pipIrrGlobal.command.enums.LastOperateENUM;
import com.dy.pipIrrGlobal.command.result.CommandResultCode;
import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
import com.dy.pipIrrGlobal.daoRm.RmCommandHistoryMapper;
+import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
+import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard;
import jakarta.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
@@ -42,10 +44,9 @@
* @Description 鍛戒护鏀拺绫�
*/
-//@Component
-//@DependsOn({"baSettingsMapper", "prControllerMapper"})
public class ComSupport {
- protected static String mwUrlSendCom = "http://127.0.0.1:8070/rtuMw/com/send" ;
+ //@Value("${mw.comSendUrl}")
+ protected String comSendUrl;
protected static String controllerType = null;
protected static Integer projectNo = null;
@@ -64,13 +65,16 @@
@Autowired
private PrControllerMapper prControllerMapper;
- //@Autowired
- //private CommandSv commandSv;
-
@Autowired
private RmCommandHistoryMapper rmCommandHistoryMapper;
+ @Autowired
+ private SeVirtualCardMapper seVirtualCardMapper;
+
public static ComSupport comSupport;
+
+ public ComSupport() {
+ }
/**
* 寮曞叆BaSettingsMapper
@@ -122,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;
}
@@ -138,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);
@@ -209,7 +214,7 @@
* @return
*/
protected BaseResponse sendCom2Mw(Command com){
- String url = UriComponentsBuilder.fromUriString(mwUrlSendCom)
+ String url = UriComponentsBuilder.fromUriString(comSendUrl)
.build()
.toUriString();
HttpHeaders headers = new HttpHeaders();
@@ -225,16 +230,19 @@
}
/**
- * 鍙戦�佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
* @param po
* @return
*/
- protected BaseResponse dealWithCommandResult(Param po) {
+ protected BaseResponse<Boolean> dealWithCommandResult(Param po) {
Long comId = po.getComId();
+ Byte comType = po.getComType();
String commandCode = po.getCommandCode();
+ String commandName = po.getCommandName();
Long intakeId = po.getIntakeId();
String rtuAddr = po.getRtuAddr();
String protocol = po.getProtocol();
+ Long vcId = po.getVcId();
Object param = po.getParam();
String rtuResultSendWebUrl = po.getRtuResultSendWebUrl();
Long operator = po.getOperator();
@@ -245,28 +253,37 @@
// 鍙戦�佸懡浠�
JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com));
if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) {
- //if(1 > 0) {
- // 璇锋眰鎴愬姛
-
- // 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
- String commandName = CodeV202404.getCodeName(commandCode);
- RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
- //commandSv.insert(rmCommandHistory);
- rmCommandHistoryMapper.insert(rmCommandHistory);
-
- // 澶勭悊鍥炶皟
+ // 璇锋眰鎴愬姛, 澶勭悊鍥炶皟
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")) {
// 鍛戒护鏃ュ織鎵ц缁撴灉鏀逛负澶辫触
rmCommandHistory = new RmCommandHistory();
- rmCommandHistory.setId(comId);
+ rmCommandHistory.setComId(comId);
rmCommandHistory.setResult((byte)0);
- //commandSv.updateCommandResult(rmCommandHistory);
rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
- return BaseResponseUtils.buildFail(response_CallBack.getMsg());
- //return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
+ return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
+ }
+
+ // 鍥炶皟瓒呮椂
+ if (response_CallBack.getContent().toString().equals(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage())) {
+ /**
+ * 鍥炶皟瓒呮椂锛屾殏鏃惰涓烘墽琛屽け璐�
+ * 鍛戒护缃负澶辫触
+ * 铏氭嫙鍗′緷鏃т繚鎸佷娇鐢ㄤ腑鐨勭姸鎬�
+ */
+
+ rmCommandHistory = new RmCommandHistory();
+ rmCommandHistory.setComId(comId);
+ rmCommandHistory.setResult((byte) 0);
+ rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
+ return BaseResponseUtils.buildErrorMsg(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
}
// 鍥炶皟鎴愬姛锛屽啀鍒ゆ柇鎵ц鏄惁鎴愬姛
@@ -276,18 +293,54 @@
System.out.println(job_subData);
Boolean dealResult = job_subData.getBoolean("success");
if(!dealResult) {
- return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
+ /**
+ * 鎵ц澶辫触
+ * 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
+ */
+ 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();
+ virtualCard.setId(vcId);
+ if(comType == 1) {
+ virtualCard.setInUse((byte) 1);
+ }else {
+ virtualCard.setInUse((byte) 0);
+ }
+ virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
+ virtualCard.setLastOperateTime(new Date());
+ seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+ }
+
+ // 鍥炶皟杩斿洖鐨勫唴瀹�
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 {
// 璇锋眰澶辫触
JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
- return BaseResponseUtils.buildFail(job_param.getString("message"));
+ return BaseResponseUtils.buildErrorMsg(job_param.getString("message"));
}
}
}
--
Gitblit v1.8.0