From 400af57e240a4c0d74c81ffc8b3417226b51345a Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 06 六月 2024 08:19:13 +0800
Subject: [PATCH] 2024-06-06 朱宝民 生产环境版本
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java | 197 +++++++++++++++++++++++-------------------------
1 files changed, 94 insertions(+), 103 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java
index a0fe3bd..5afe421 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java
@@ -5,20 +5,21 @@
import com.dy.common.aop.SsoAop;
import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.Data;
+import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
+import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com97Vo;
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
import com.dy.common.mw.protocol.p206V202404.downVos.ComCd10Vo;
import com.dy.common.mw.protocol.p206V202404.downVos.ComCdXyVo;
import com.dy.common.util.IDLongGenerator;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
-import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.command.ComSupport;
+import com.dy.pipIrrGlobal.command.dto.Param;
import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
-import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import com.dy.pipIrrRemote.common.CommandSv;
import com.dy.pipIrrRemote.common.dto.Addr;
import com.dy.pipIrrRemote.common.dto.DtoBase;
-import com.dy.pipIrrRemote.common.qo.OnLineIntakesQO;
+import com.dy.pipIrrRemote.result.RemoteResultCode;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -27,12 +28,7 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
/**
* @author ZhuBaoMin
@@ -50,58 +46,7 @@
protected static String controllerType = "57";
private final IDLongGenerator idLongGenerator;
-
- /**
- * 鏌ヨ鎵�鏈塕TU鍦ㄧ嚎鎯呭喌锛堜粎娴嬭瘯鐢級
- * @return
- */
- @GetMapping(path = "get_online")
- @SsoAop()
- public BaseResponse<Boolean> get_online() {
- Command com = new Command() ;
- com.id = Command.defaultId;
- com.code = "LCD0001";
- com.type = "innerCommand";
-
- JSONObject response = (JSONObject)JSON.toJSON(sendCom2Mw(com));
- JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
-
- return BaseResponseUtils.buildSuccess(attachment) ;
- }
-
- /**
- * 鑾峰彇鍙栨按鍙ｅ垪琛紙鍦ㄧ嚎鍜屼笉鍦ㄧ嚎锛�
- * @param qo
- * @return
- */
- @GetMapping(path = "get_online_intakes")
- @SsoAop()
- public BaseResponse<QueryResultVo<List<VoOnLineIntake>>> getOnLineIntakes(OnLineIntakesQO qo) {
- try {
- QueryResultVo<List<VoOnLineIntake>> res = commandSv.selectOnLineIntakes(qo);
- return BaseResponseUtils.buildSuccess(res);
- } catch (Exception e) {
- log.error("鏌ヨ鍙栨按鍙ｅ紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
- }
-
- /**
- * 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛
- * @param operator
- * @return
- */
- @GetMapping(path = "used_intakes")
- @SsoAop()
- public BaseResponse<List<VoOnLineIntake>> getUsedIntakes(Long operator) {
- try {
- List<VoOnLineIntake> res = commandSv.getUsedIntakes(operator);
- return BaseResponseUtils.buildSuccess(res);
- } catch (Exception e) {
- log.error("鏌ヨ鍙栨按鍙ｅ紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
- }
+ private String rtuResultSendWebUrl = "http://127.0.0.1:8081/remote/comRes/receive" ;
/**
* 璁剧疆璁惧缁堢鍦板潃
@@ -120,55 +65,101 @@
Long intakeId = addr.getIntakeId();
String newRtuAddr = addr.getNewRtuAddr();
Long operator = addr.getOperator();
- String commandCode = CodeV202404.cd_10;
Long comId = idLongGenerator.generate();
- // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
- //PrController prController = commandSv.getControllerByIntakeId(intakeId);
- //if(prController == null) {
- // return BaseResponseUtils.buildError(RemoteResultCode.RTU_NOT_EXIST.getMessage());
- //}
- //String rtuAddr = prController.getRtuAddr();
- //String protocol = prController.getProtocol();
-
- // 鍒涘缓瑙嗗浘
- ComCd10Vo param = new ComCd10Vo() ;
- param.controllerType = controllerType;
- param.projectNo =projectNo;
- param.rtuNewAddr = newRtuAddr;
-
- // 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
- //RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, intakeId, rtuAddr, protocol, param, operator);
- //comId = commandSv.insert(rmCommandHistory);
- //System.out.println(comId);
-
- // 鏋勯�犲懡浠�
- //Command com = command(comId, commandCode, rtuAddr, protocol, param);
- //sendCom2Mw(com);
-
- CompletableFuture<Data> featureObject = new CompletableFuture<>();
- features.put(comId, featureObject);
- try {
- CompletableFuture<Data> feature = (CompletableFuture<Data>) features.get(comId);
- Data resultData = feature.get(30, TimeUnit.SECONDS);
- features.remove(comId);
- String commandId = resultData.getCommandId();
- if(commandId.equals(comId)) {
- //futureValue = new CompletableFuture<>();
- return BaseResponseUtils.buildSuccess((JSONObject)JSON.toJSON(resultData.subData));
- }
- } catch (InterruptedException e) {
- e.printStackTrace();
- } catch (ExecutionException e) {
- e.printStackTrace();
- } catch (TimeoutException e) {
- return BaseResponseUtils.buildFail("1鍒嗛挓鍚庡幓鏌ョ湅缁撴灉");
+ // 鑾峰彇绯荤粺鍙傛暟
+ if(!setuped) {
+ setUp();
}
+ // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
+ JSONObject job_rtu = getRtu(intakeId, null);
+ if(job_rtu == null) {
+ return BaseResponseUtils.buildError(RemoteResultCode.RTU_NOT_EXIST.getMessage());
+ }
+ String rtuAddr = job_rtu.getString("rtuAddr");
+ String protocol = job_rtu.getString("protocol");
- //return BaseResponseUtils.buildSuccess(resultData.toJson());
+ String commandCode = null;
+ if(protocol.equals("p206V202404")) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV202404.cd_10;
- return BaseResponseUtils.buildSuccess() ;
+ // 鍒涘缓瑙嗗浘
+ ComCd10Vo param = new ComCd10Vo() ;
+ param.controllerType = controllerType;
+ param.projectNo =projectNo;
+ param.rtuNewAddr = newRtuAddr;
+
+ // 鍙戦�佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ Param po = new Param();
+ po.setComId(comId);
+ po.setCommandCode(commandCode);
+ po.setIntakeId(intakeId);
+ po.setRtuAddr(rtuAddr);
+ po.setProtocol(protocol);
+ po.setParam(param);
+ po.setRtuResultSendWebUrl(rtuResultSendWebUrl);
+ po.setOperator(operator);
+ return dealWithCommandResult(po);
+ } else if(protocol.equals("p206V1_0_1")) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV1_0_1.cd_10;
+
+ // 鍒涘缓瑙嗗浘
+ Com97Vo param = new Com97Vo() ;
+
+ // 鏋勯�犲懡浠�
+ 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")) {
+ //if(1 > 0) {
+ // 璇锋眰鎴愬姛
+
+ // 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
+ String commandName = CodeV1_0_1.getCodeName(commandCode);
+ RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
+ commandSv.insert(rmCommandHistory);
+
+ // 澶勭悊鍥炶皟
+ BaseResponse response_CallBack = dealWithCallBack(comId);
+
+ //鍥炶皟澶辫触
+ if(!response_CallBack.getCode().equals("0001")) {
+ // 鍛戒护鏃ュ織鎵ц缁撴灉鏀逛负澶辫触
+ rmCommandHistory = new RmCommandHistory();
+ rmCommandHistory.setId(comId);
+ rmCommandHistory.setResult((byte)0);
+ commandSv.updateCommandResult(rmCommandHistory);
+ return BaseResponseUtils.buildFail(response_CallBack.getMsg());
+ //return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
+ }
+
+ // 鍥炶皟鎴愬姛锛屽啀鍒ゆ柇鎵ц鏄惁鎴愬姛
+ 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.buildFail(response_CallBack.getContent().toString());
+ }
+
+ /**
+ * 鎵ц鎴愬姛锛岃繑鍥炲洖璋冨唴瀹�
+ */
+ Data myData = (Data)response_CallBack.getContent();
+ return BaseResponseUtils.buildSuccess(myData) ;
+ } else {
+ // 璇锋眰澶辫触
+ JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
+ return BaseResponseUtils.buildFail(job_param.getString("message"));
+ }
+ } else {
+ return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ }
}
/**
--
Gitblit v1.8.0