From 67aab76b35f0ddb5c8b71313b81fa8867770a763 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 26 六月 2024 21:08:05 +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 | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 110 insertions(+), 6 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 89ba085..ad83980 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
@@ -7,19 +7,22 @@
import com.dy.common.mw.protocol.Data;
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.context.annotation.DependsOn;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
@@ -41,8 +44,6 @@
* @Description 鍛戒护鏀拺绫�
*/
-@Component
-@DependsOn({"baSettingsMapper", "prControllerMapper"})
public class ComSupport {
protected static String mwUrlSendCom = "http://127.0.0.1:8070/rtuMw/com/send" ;
@@ -59,8 +60,16 @@
@Autowired
private BaSettingsMapper baSettingsMapper;
+
@Autowired
private PrControllerMapper prControllerMapper;
+
+ @Autowired
+ private RmCommandHistoryMapper rmCommandHistoryMapper;
+
+ @Autowired
+ private SeVirtualCardMapper seVirtualCardMapper;
+
public static ComSupport comSupport;
/**
@@ -176,7 +185,7 @@
try {
CompletableFuture<Data> feature = (CompletableFuture<Data>) features.get(comId);
System.out.println("receive result ID:" + comId);
- Data resultData = feature.get(30, TimeUnit.SECONDS);
+ Data resultData = feature.get(180, TimeUnit.SECONDS);
features.remove(comId);
Long commandId = Long.parseLong(resultData.getCommandId());
if(commandId.equals(comId)) {
@@ -191,7 +200,7 @@
e.printStackTrace();
return BaseResponseUtils.buildFail(CommandResultCode.GET_RESULT_ERROR.getMessage());
} catch (TimeoutException e) {
- return BaseResponseUtils.buildFail(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
+ return BaseResponseUtils.buildSuccess(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
}
}
@@ -214,4 +223,99 @@
}
return response.getBody();
}
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * @param po
+ * @return
+ */
+ 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();
+
+ // 鏋勯�犲懡浠�
+ Command com = command(comId, commandCode, rtuAddr, protocol, rtuResultSendWebUrl, param);
+
+ // 鍙戦�佸懡浠�
+ JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com));
+ if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) {
+ // 璇锋眰鎴愬姛
+
+ // 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
+ RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
+ rmCommandHistoryMapper.insert(rmCommandHistory);
+
+ // 澶勭悊鍥炶皟
+ BaseResponse response_CallBack = dealWithCallBack(comId);
+
+ // 鍥炶皟寮傚父
+ if(!response_CallBack.getCode().equals("0001")) {
+ // 鍛戒护鏃ュ織鎵ц缁撴灉鏀逛负澶辫触
+ rmCommandHistory = new RmCommandHistory();
+ rmCommandHistory.setId(comId);
+ rmCommandHistory.setResult((byte)0);
+ rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
+ return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
+ }
+
+ // 鍥炶皟瓒呮椂
+ if (response_CallBack.getContent().toString().equals(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage())) {
+ /**
+ * 鍥炶皟瓒呮椂锛屾殏鏃惰涓烘墽琛屽け璐�
+ * 鍛戒护缃负澶辫触
+ * 铏氭嫙鍗′緷鏃т繚鎸佷娇鐢ㄤ腑鐨勭姸鎬�
+ */
+
+ rmCommandHistory = new RmCommandHistory();
+ rmCommandHistory.setId(comId);
+ rmCommandHistory.setResult((byte) 0);
+ rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
+ return BaseResponseUtils.buildErrorMsg(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
+ }
+
+ // 鍥炶皟鎴愬姛锛屽啀鍒ゆ柇鎵ц鏄惁鎴愬姛
+ 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) {
+ 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();
+ return BaseResponseUtils.buildSuccess(myData) ;
+ } else {
+ // 璇锋眰澶辫触
+ JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
+ return BaseResponseUtils.buildErrorMsg(job_param.getString("message"));
+ }
+ }
}
--
Gitblit v1.8.0