From 89d7bf273815013c3e4bd518b77dfd35a749d592 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 31 五月 2024 16:55:10 +0800
Subject: [PATCH] 田间灌溉项目管理 优化代码 修改轮罐组绑定的灌溉单元接口
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java | 148 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 124 insertions(+), 24 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 32f9a91..5ffa204 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
@@ -1,30 +1,40 @@
package com.dy.pipIrrRemote.rtu;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
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.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.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
+import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import com.dy.pipIrrRemote.common.ComSupport;
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 com.dy.pipIrrRemote.rtu.dto.Addr;
-import com.dy.pipIrrRemote.rtu.dto.DtoBase;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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
@@ -41,6 +51,59 @@
private final CommandSv commandSv;
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());
+ }
+ }
/**
* 璁剧疆璁惧缁堢鍦板潃
@@ -56,32 +119,66 @@
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- String commandCode = CodeV202404.cd_10;
Long intakeId = addr.getIntakeId();
String newRtuAddr = addr.getNewRtuAddr();
Long operator = addr.getOperator();
+ String commandCode = CodeV202404.cd_10;
+ Long comId = idLongGenerator.generate();
- // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃
- String rtuAddr = commandSv.getRtuAddrByIntakeId(intakeId);
- if(rtuAddr == null || rtuAddr.length() == 0) {
- return BaseResponseUtils.buildError(RemoteResultCode.RTU_ADDR_CANNOT_BE_NULL.getMessage());
+ // 鍙栨按鍙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 = Integer.parseInt(commandCode);
+ param.projectNo =projectNo;
param.rtuNewAddr = newRtuAddr;
// 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
- RmCommandHistory rmCommandHistory = getComHistory(commandCode, rtuAddr, param, operator);
- String comId = commandSv.insert(rmCommandHistory);
+ RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, intakeId, rtuAddr, protocol, param, operator);
+ comId = commandSv.insert(rmCommandHistory);
+ System.out.println(comId);
// 鏋勯�犲懡浠�
- Command com = command(comId, commandCode, rtuAddr, param);
- return sendCom2Mw(com);
+ 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鍒嗛挓鍚庡幓鏌ョ湅缁撴灉");
+ }
+
+
+ //return BaseResponseUtils.buildSuccess(resultData.toJson());
+
+ return BaseResponseUtils.buildSuccess() ;
}
+ /**
+ * 娓呴櫎璁惧缁堢鐢ㄦ按璁板綍
+ * @param po
+ * @param bindingResult
+ * @return
+ */
@PostMapping(path = "clear_usage_record", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
@@ -93,24 +190,27 @@
String commandCode = CodeV202404.cd_97;
Long intakeId = po.getIntakeId();
Long operator = po.getOperator();
+ Long comId = idLongGenerator.generate();
- // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃
- String rtuAddr = commandSv.getRtuAddrByIntakeId(intakeId);
- if(rtuAddr == null || rtuAddr.length() == 0) {
- return BaseResponseUtils.buildError(RemoteResultCode.RTU_ADDR_CANNOT_BE_NULL.getMessage());
+ // 鍙栨按鍙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();
// 鍒涘缓瑙嗗浘
ComCdXyVo param = new ComCdXyVo();
param.controllerType = controllerType;
- param.projectNo = Integer.parseInt(commandCode);
+ param.projectNo = projectNo;
// 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
- RmCommandHistory rmCommandHistory = getComHistory(commandCode, rtuAddr, param, operator);
- String comId = commandSv.insert(rmCommandHistory);
+ RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, intakeId, rtuAddr, protocol, param, operator);
+ comId = commandSv.insert(rmCommandHistory);
// 鏋勯�犲懡浠�
- Command com = command(comId, commandCode, rtuAddr, param);
+ Command com = command(comId, commandCode, rtuAddr, protocol, param);
return sendCom2Mw(com);
}
}
--
Gitblit v1.8.0