From 0230c8b9866083341749d51393046053ab978a7e Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 05 七月 2024 16:25:53 +0800
Subject: [PATCH] 2024-07-05 朱宝民 1.多数据源配置，2.注销、挂失、冲正、解锁优化返回值
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java | 396 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 381 insertions(+), 15 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 381fadb..961b3f0 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,19 @@
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.mw.protocol.p206V202404.downVos.*;
import com.dy.common.util.IDLongGenerator;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pipIrrGlobal.command.ComSupport;
import com.dy.pipIrrGlobal.command.dto.Param;
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.dto.*;
import com.dy.pipIrrRemote.result.RemoteResultCode;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
@@ -28,6 +27,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.Objects;
+import java.util.Optional;
/**
* @author ZhuBaoMin
@@ -42,10 +42,79 @@
@RequiredArgsConstructor
public class RtuCtrl extends ComSupport {
private final CommandSv commandSv;
-
- protected static String controllerType = "57";
private final IDLongGenerator idLongGenerator;
- private String rtuResultSendWebUrl = "http://127.0.0.1:8081/remote/comRes/receive" ;
+
+ @Value("${mw.rtuCallbackUrl_rm}")
+ private String rtuCallbackUrl_rm;
+
+ /**
+ * 閫氱敤澶勭悊鎺ュ彛
+ * 97 娓呴櫎鐢ㄦ按璁板綍
+ * 98 娓呴櫎鍏呭�艰褰�
+ * 99 娓呴櫎鏃ヨ褰�
+ * 9A 娓呴櫎骞寸敤姘撮噺
+ * 50 鏌ヨ缁堢鍦板潃
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "common_deal", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> commonDeal(@RequestBody @Valid CommandDeal po, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ Long intakeId = po.getIntakeId();
+ Long operator = po.getOperator();
+ Long comId = idLongGenerator.generate();
+
+ // 鑾峰彇绯荤粺鍙傛暟
+ if(!setuped) {
+ setUp();
+ }
+
+ // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
+ JSONObject job_rtu = getRtu(intakeId, null);
+ if(job_rtu == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_EXIST.getMessage());
+ }
+ String rtuAddr = job_rtu.getString("rtuAddr");
+ String protocol = job_rtu.getString("protocol");
+
+ // 鑾峰彇鍔熻兘鐮�
+ String commandCode = po.getCommandCode();
+ if(protocol.equals("p206V202404")) {
+ // 鍒涘缓瑙嗗浘
+ ComCdXyVo param = new ComCdXyVo();
+ param.controllerType = controllerType;
+ param.projectNo = projectNo;
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setCommandCode(commandCode);
+ myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+ myParam.setIntakeId(intakeId);
+ myParam.setRtuAddr(rtuAddr);
+ myParam.setProtocol(protocol);
+ myParam.setParam(param);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
+ myParam.setOperator(operator);
+ return dealWithCommandResult(myParam);
+ } else if(protocol.equals("p206V1_0_1")) {
+ // 鍒涘缓瑙嗗浘
+ Com97Vo param = new Com97Vo() ;
+ return BaseResponseUtils.buildSuccess("");
+ } else {
+ return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ }
+ }
/**
* 璁剧疆璁惧缁堢鍦板潃
@@ -103,7 +172,7 @@
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
myParam.setParam(param);
- myParam.setRtuResultSendWebUrl(rtuResultSendWebUrl);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
} else if(protocol.equals("p206V1_0_1")) {
@@ -119,21 +188,22 @@
}
/**
- * 娓呴櫎璁惧缁堢鐢ㄦ按璁板綍
+ * 璁剧疆璁惧缁堢鍓╀綑姘撮噺鍜屽墿浣欓噾棰濇姤璀﹀��
* @param po
* @param bindingResult
* @return
*/
- @PostMapping(path = "clear_usage_record", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @PostMapping(path = "set_alarm", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> clearUsageRecord(@RequestBody @Valid DtoBase po, BindingResult bindingResult) {
+ public BaseResponse<Boolean> setAlarm(@RequestBody @Valid Alarm po, BindingResult bindingResult) {
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- //String commandCode = CodeV202404.cd_97;
Long intakeId = po.getIntakeId();
+ Integer waterAlarm = Optional.ofNullable(po.getWaterAlarm()).orElse(0);
+ Integer moneyAlarm = Optional.ofNullable(po.getMoneyAlarm()).orElse(0);
Long operator = po.getOperator();
Long comId = idLongGenerator.generate();
@@ -153,12 +223,14 @@
String commandCode = null;
if(protocol.equals("p206V202404")) {
// 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV202404.cd_97;
+ commandCode = CodeV202404.cd_16;
// 鍒涘缓瑙嗗浘
- ComCdXyVo param = new ComCdXyVo();
+ ComCd16Vo param = new ComCd16Vo();
param.controllerType = controllerType;
param.projectNo = projectNo;
+ param.waterAlarm = waterAlarm;
+ param.moneyAlarm = moneyAlarm;
/**
* 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
@@ -173,7 +245,301 @@
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
myParam.setParam(param);
- myParam.setRtuResultSendWebUrl(rtuResultSendWebUrl);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
+ myParam.setOperator(operator);
+ return dealWithCommandResult(myParam);
+ } else if(protocol.equals("p206V1_0_1")) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV1_0_1.cd_10;
+
+ // 鍒涘缓瑙嗗浘
+ Com97Vo param = new Com97Vo() ;
+ return BaseResponseUtils.buildSuccess("");
+ } else {
+ return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ }
+ }
+
+ /**
+ * 璁剧疆鏈轰簳骞存渶澶у紑閲囬噺鍜屾按浣嶄笅闄�
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "set_well", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> setWell(@RequestBody @Valid DrivenWell po, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ Long intakeId = po.getIntakeId();
+ Integer maxAmountYear = Optional.ofNullable(po.getMaxAmountYear()).orElse(0);
+ Double limitLevel = Optional.ofNullable(po.getLimitLevel()).orElse(0.0);
+ Long operator = po.getOperator();
+ Long comId = idLongGenerator.generate();
+
+ // 鑾峰彇绯荤粺鍙傛暟
+ if(!setuped) {
+ setUp();
+ }
+
+ // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
+ JSONObject job_rtu = getRtu(intakeId, null);
+ if(job_rtu == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_EXIST.getMessage());
+ }
+ String rtuAddr = job_rtu.getString("rtuAddr");
+ String protocol = job_rtu.getString("protocol");
+
+ String commandCode = null;
+ if(protocol.equals("p206V202404")) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV202404.cd_22;
+
+ // 鍒涘缓瑙嗗浘
+ ComCd22Vo param = new ComCd22Vo();
+ param.controllerType = controllerType;
+ param.projectNo = projectNo;
+ param.maxAmountYear = maxAmountYear;
+ param.limitLevel = limitLevel;
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setCommandCode(commandCode);
+ myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+ myParam.setIntakeId(intakeId);
+ myParam.setRtuAddr(rtuAddr);
+ myParam.setProtocol(protocol);
+ myParam.setParam(param);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
+ myParam.setOperator(operator);
+ return dealWithCommandResult(myParam);
+ } else if(protocol.equals("p206V1_0_1")) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV1_0_1.cd_10;
+
+ // 鍒涘缓瑙嗗浘
+ Com97Vo param = new Com97Vo() ;
+ return BaseResponseUtils.buildSuccess("");
+ } else {
+ return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ }
+ }
+
+ /**
+ * 璁剧疆璁惧缁堢骞寸敤姘撮噺
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "set_max_amount", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> setMaxAmount(@RequestBody @Valid WaterConsumption po, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ Long intakeId = po.getIntakeId();
+ Integer maxAmountYear = Optional.ofNullable(po.getMaxAmountYear()).orElse(0);
+ Long operator = po.getOperator();
+ Long comId = idLongGenerator.generate();
+
+ // 鑾峰彇绯荤粺鍙傛暟
+ if(!setuped) {
+ setUp();
+ }
+
+ // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
+ JSONObject job_rtu = getRtu(intakeId, null);
+ if(job_rtu == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_EXIST.getMessage());
+ }
+ String rtuAddr = job_rtu.getString("rtuAddr");
+ String protocol = job_rtu.getString("protocol");
+
+ String commandCode = null;
+ if(protocol.equals("p206V202404")) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV202404.cd_26;
+
+ // 鍒涘缓瑙嗗浘
+ ComCd26Vo param = new ComCd26Vo();
+ param.controllerType = controllerType;
+ param.projectNo = projectNo;
+ param.maxAmountYear = maxAmountYear;
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setCommandCode(commandCode);
+ myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+ myParam.setIntakeId(intakeId);
+ myParam.setRtuAddr(rtuAddr);
+ myParam.setProtocol(protocol);
+ myParam.setParam(param);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
+ myParam.setOperator(operator);
+ return dealWithCommandResult(myParam);
+ } else if(protocol.equals("p206V1_0_1")) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV1_0_1.cd_10;
+
+ // 鍒涘缓瑙嗗浘
+ Com97Vo param = new Com97Vo() ;
+ return BaseResponseUtils.buildSuccess("");
+ } else {
+ return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ }
+ }
+
+ /**
+ * 璁剧疆璁惧缁堢IP鍦板潃
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "set_ip", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> setIp(@RequestBody @Valid Domain po, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ Long intakeId = po.getIntakeId();
+ Integer channel = po.getChannel();
+ String ip = po.getIp();
+ Integer port = po.getPort();
+ Long operator = po.getOperator();
+ Long comId = idLongGenerator.generate();
+
+ // 鑾峰彇绯荤粺鍙傛暟
+ if(!setuped) {
+ setUp();
+ }
+
+ // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
+ JSONObject job_rtu = getRtu(intakeId, null);
+ if(job_rtu == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_EXIST.getMessage());
+ }
+ String rtuAddr = job_rtu.getString("rtuAddr");
+ String protocol = job_rtu.getString("protocol");
+
+ String commandCode = null;
+ if(protocol.equals("p206V202404")) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV202404.cd_21;
+
+ // 鍒涘缓瑙嗗浘
+ ComCd21Vo param = new ComCd21Vo();
+ param.controllerType = controllerType;
+ param.projectNo = projectNo;
+ param.channel = channel;
+ param.ip = ip;
+ param.port = port;
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setCommandCode(commandCode);
+ myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+ myParam.setIntakeId(intakeId);
+ myParam.setRtuAddr(rtuAddr);
+ myParam.setProtocol(protocol);
+ myParam.setParam(param);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
+ myParam.setOperator(operator);
+ return dealWithCommandResult(myParam);
+ } else if(protocol.equals("p206V1_0_1")) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV1_0_1.cd_10;
+
+ // 鍒涘缓瑙嗗浘
+ Com97Vo param = new Com97Vo() ;
+ return BaseResponseUtils.buildSuccess("");
+ } else {
+ return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ }
+ }
+
+ /**
+ * 璁剧疆璁惧缁堢鍩熷悕
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "set_domain", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> setDomain(@RequestBody @Valid Domain po, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ Long intakeId = po.getIntakeId();
+ Integer channel = po.getChannel();
+ String domain = po.getDomain();
+ Integer port = po.getPort();
+ Long operator = po.getOperator();
+ Long comId = idLongGenerator.generate();
+
+ // 鑾峰彇绯荤粺鍙傛暟
+ if(!setuped) {
+ setUp();
+ }
+
+ // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
+ JSONObject job_rtu = getRtu(intakeId, null);
+ if(job_rtu == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_EXIST.getMessage());
+ }
+ String rtuAddr = job_rtu.getString("rtuAddr");
+ String protocol = job_rtu.getString("protocol");
+
+ String commandCode = null;
+ if(protocol.equals("p206V202404")) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV202404.cd_23;
+
+ // 鍒涘缓瑙嗗浘
+ ComCd23Vo param = new ComCd23Vo();
+ param.controllerType = controllerType;
+ param.projectNo = projectNo;
+ param.channel = channel;
+ param.domain = domain;
+ param.port = port;
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setCommandCode(commandCode);
+ myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+ myParam.setIntakeId(intakeId);
+ myParam.setRtuAddr(rtuAddr);
+ myParam.setProtocol(protocol);
+ myParam.setParam(param);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
} else if(protocol.equals("p206V1_0_1")) {
--
Gitblit v1.8.0