From 267e622c876bea09b61af34fc93cd08b022aa423 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 05 十二月 2024 14:50:40 +0800
Subject: [PATCH] 1、优化代码； 2、实现新功能：查询RTU设备在通信中间件中的状态。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java | 386 ++++++++++++++++--------------------------------------
1 files changed, 118 insertions(+), 268 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 961b3f0..dcaf611 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
@@ -2,22 +2,30 @@
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.aop.SsoAop;
-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.multiDataSource.DataSourceContext;
+import com.dy.common.mw.protocol.p206V1.CodeV1;
+import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
+import com.dy.common.mw.protocol.p206V1.downVos.*;
+import com.dy.common.mw.protocol.p206V2.ProtocolConstantV206V2;
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
-import com.dy.common.mw.protocol.p206V202404.downVos.*;
+import com.dy.common.mw.protocol.p206V202404.ProtocolConstantV206V202404;
+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.pipIrrGlobal.command.ComSupport;
import com.dy.pipIrrGlobal.command.dto.Param;
import com.dy.pipIrrRemote.common.CommandSv;
-import com.dy.pipIrrRemote.common.dto.*;
+import com.dy.pipIrrRemote.common.dto.Alarm;
+import com.dy.pipIrrRemote.common.dto.CollectPeriod;
+import com.dy.pipIrrRemote.common.dto.CommandGet;
+import com.dy.pipIrrRemote.common.dto.Domain;
import com.dy.pipIrrRemote.result.RemoteResultCode;
import jakarta.validation.Valid;
-import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.env.Environment;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
@@ -27,7 +35,6 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.Objects;
-import java.util.Optional;
/**
* @author ZhuBaoMin
@@ -39,7 +46,7 @@
@Slf4j
@RestController
@RequestMapping(path="rtu")
-@RequiredArgsConstructor
+//@RequiredArgsConstructor
public class RtuCtrl extends ComSupport {
private final CommandSv commandSv;
private final IDLongGenerator idLongGenerator;
@@ -48,20 +55,38 @@
private String rtuCallbackUrl_rm;
/**
- * 閫氱敤澶勭悊鎺ュ彛
- * 97 娓呴櫎鐢ㄦ按璁板綍
- * 98 娓呴櫎鍏呭�艰褰�
- * 99 娓呴櫎鏃ヨ褰�
- * 9A 娓呴櫎骞寸敤姘撮噺
- * 50 鏌ヨ缁堢鍦板潃
- * @param po
- * @param bindingResult
- * @return
+ * pro_mw锛氬睘鎬�
+ * tag浠庢帶鍒跺櫒涓幏鍙�
+ * key_mw锛歶rl鐨刱ey
*/
- @PostMapping(path = "common_deal", consumes = MediaType.APPLICATION_JSON_VALUE)
+ private Environment env = null;
+ private String pro_mw = "mw";
+ private String key_mw = "comSendUrl";
+
+ @Autowired
+ public RtuCtrl(CommandSv commandSv, IDLongGenerator idLongGenerator, Environment env) {
+ this.commandSv = commandSv;
+ this.idLongGenerator = idLongGenerator;
+ this.env = env;
+ }
+
+ /**
+ * 閫氱敤鏌ヨ鎺ュ彛
+ * p206V1
+ * 66 鏌ヨIP鍜岀鍙�
+ * 67 鏌ヨ娴侀噺閲囬泦鍛ㄦ湡
+ * 68 鏌ヨ鐢ㄦ埛浣欓鎶ヨ鍊�
+ * 69 鏌ヨ鐢垫睜鐢靛帇鎶ヨ鍊�
+ * 6A 鏌ヨ闃�闂ㄥ牭杞數娴佸��
+ * 6B 鏌ヨ闃�闂ㄨ秴鏃舵椂闂�
+ * @param po 鏌ヨ浼犲叆瀵硅薄
+ * @param bindingResult
+ * @return 鏌ヨ缁撴灉
+ */
+ @PostMapping(path = "common_get", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> commonDeal(@RequestBody @Valid CommandDeal po, BindingResult bindingResult) {
+ public BaseResponse<Boolean> commonGet(@RequestBody @Valid CommandGet po, BindingResult bindingResult) {
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
@@ -70,11 +95,6 @@
Long operator = po.getOperator();
Long comId = idLongGenerator.generate();
- // 鑾峰彇绯荤粺鍙傛暟
- if(!setuped) {
- setUp();
- }
-
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
if(job_rtu == null) {
@@ -82,10 +102,13 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
+ //String orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
+ comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鑾峰彇鍔熻兘鐮�
String commandCode = po.getCommandCode();
- if(protocol.equals("p206V202404")) {
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
// 鍒涘缓瑙嗗浘
ComCdXyVo param = new ComCdXyVo();
param.controllerType = controllerType;
@@ -107,57 +130,10 @@
myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
- } else if(protocol.equals("p206V1_0_1")) {
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
// 鍒涘缓瑙嗗浘
- Com97Vo param = new Com97Vo() ;
- return BaseResponseUtils.buildSuccess("");
- } else {
- return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
- }
- }
-
- /**
- * 璁剧疆璁惧缁堢鍦板潃
- * @param addr 璁剧疆璁惧缁堢鍦板潃浼犲叆瀵硅薄
- * @param bindingResult
- * @return
- */
- @PostMapping(path = "set_addr", consumes = MediaType.APPLICATION_JSON_VALUE)
- @Transactional(rollbackFor = Exception.class)
- @SsoAop()
- public BaseResponse<Boolean> setAddr(@RequestBody @Valid Addr addr, BindingResult bindingResult) {
- if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
-
- Long intakeId = addr.getIntakeId();
- String newRtuAddr = addr.getNewRtuAddr();
- Long operator = addr.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_10;
-
- // 鍒涘缓瑙嗗浘
- ComCd10Vo param = new ComCd10Vo() ;
- param.controllerType = controllerType;
- param.projectNo = projectNo;
- param.rtuNewAddr = newRtuAddr;
+ ComXyVo param = new ComXyVo();
+ param.setCommandCode(commandCode);
/**
* 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
@@ -166,51 +142,39 @@
*/
Param myParam = new Param();
myParam.setComId(comId);
+ myParam.setComType((byte)2);
myParam.setCommandCode(commandCode);
- myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+ myParam.setCommandName(CodeV1.getCodeName(commandCode));
myParam.setIntakeId(intakeId);
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
+ //myParam.setVcId(vcId);
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_alarm", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @PostMapping(path = "set_collect_period", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> setAlarm(@RequestBody @Valid Alarm po, BindingResult bindingResult) {
+ public BaseResponse<Boolean> setCollectPeriod(@RequestBody @Valid CollectPeriod po, BindingResult bindingResult) {
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
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();
-
- // 鑾峰彇绯荤粺鍙傛暟
- if(!setuped) {
- setUp();
- }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -219,18 +183,18 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
+ //String orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
+ comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
- String commandCode = null;
- if(protocol.equals("p206V202404")) {
- // 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV202404.cd_16;
-
+ // 鑾峰彇鍔熻兘鐮�
+ String commandCode = po.getCommandCode();
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
+ return BaseResponseUtils.buildSuccess("");
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
// 鍒涘缓瑙嗗浘
- ComCd16Vo param = new ComCd16Vo();
- param.controllerType = controllerType;
- param.projectNo = projectNo;
- param.waterAlarm = waterAlarm;
- param.moneyAlarm = moneyAlarm;
+ Com37Vo param = new Com37Vo();
+ param.setSeconds(po.getSeconds());
/**
* 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
@@ -239,51 +203,39 @@
*/
Param myParam = new Param();
myParam.setComId(comId);
+ myParam.setComType((byte)2);
myParam.setCommandCode(commandCode);
- myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+ myParam.setCommandName(CodeV1.getCodeName(commandCode));
myParam.setIntakeId(intakeId);
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
+ //myParam.setVcId(vcId);
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("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
}
}
/**
- * 璁剧疆鏈轰簳骞存渶澶у紑閲囬噺鍜屾按浣嶄笅闄�
+ * 璁剧疆鏈嶅姟绔疘P鍜岀鍙�
* @param po
* @param bindingResult
* @return
*/
- @PostMapping(path = "set_well", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @PostMapping(path = "set_ip_port", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> setWell(@RequestBody @Valid DrivenWell po, BindingResult bindingResult) {
+ public BaseResponse<Boolean> setIpPort(@RequestBody @Valid Domain 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);
@@ -292,18 +244,19 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
+ //String orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
+ comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
- String commandCode = null;
- if(protocol.equals("p206V202404")) {
- // 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV202404.cd_22;
-
+ // 鑾峰彇鍔熻兘鐮�
+ String commandCode = po.getCommandCode();
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
+ return BaseResponseUtils.buildSuccess("");
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
// 鍒涘缓瑙嗗浘
- ComCd22Vo param = new ComCd22Vo();
- param.controllerType = controllerType;
- param.projectNo = projectNo;
- param.maxAmountYear = maxAmountYear;
- param.limitLevel = limitLevel;
+ Com21Vo param = new Com21Vo();
+ param.setIp(po.getIp());
+ param.setPort(po.getPort());
/**
* 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
@@ -312,50 +265,39 @@
*/
Param myParam = new Param();
myParam.setComId(comId);
+ myParam.setComType((byte)2);
myParam.setCommandCode(commandCode);
- myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+ myParam.setCommandName(CodeV1.getCodeName(commandCode));
myParam.setIntakeId(intakeId);
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
+ //myParam.setVcId(vcId);
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)
+ @PostMapping(path = "set_remain_money_alarm", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> setMaxAmount(@RequestBody @Valid WaterConsumption po, BindingResult bindingResult) {
+ public BaseResponse<Boolean> setRemainMoneyAlarm(@RequestBody @Valid Alarm 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);
@@ -364,17 +306,18 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
+ //String orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
+ comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
- String commandCode = null;
- if(protocol.equals("p206V202404")) {
- // 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV202404.cd_26;
-
+ // 鑾峰彇鍔熻兘鐮�
+ String commandCode = po.getCommandCode();
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
+ return BaseResponseUtils.buildSuccess("");
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
// 鍒涘缓瑙嗗浘
- ComCd26Vo param = new ComCd26Vo();
- param.controllerType = controllerType;
- param.projectNo = projectNo;
- param.maxAmountYear = maxAmountYear;
+ Com38Vo param = new Com38Vo();
+ param.setRemainMoneyAlarm(po.getRemainMoneyAlarm());
/**
* 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
@@ -383,52 +326,39 @@
*/
Param myParam = new Param();
myParam.setComId(comId);
+ myParam.setComType((byte)2);
myParam.setCommandCode(commandCode);
- myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+ myParam.setCommandName(CodeV1.getCodeName(commandCode));
myParam.setIntakeId(intakeId);
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
+ //myParam.setVcId(vcId);
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)
+ @PostMapping(path = "set_battery_volt_alarm", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> setIp(@RequestBody @Valid Domain po, BindingResult bindingResult) {
+ public BaseResponse<Boolean> setBatteryVoltAlarm(@RequestBody @Valid Alarm 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);
@@ -437,19 +367,18 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
+ //String orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
+ comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
- String commandCode = null;
- if(protocol.equals("p206V202404")) {
- // 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV202404.cd_21;
-
+ // 鑾峰彇鍔熻兘鐮�
+ String commandCode = po.getCommandCode();
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
+ return BaseResponseUtils.buildSuccess("");
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
// 鍒涘缓瑙嗗浘
- ComCd21Vo param = new ComCd21Vo();
- param.controllerType = controllerType;
- param.projectNo = projectNo;
- param.channel = channel;
- param.ip = ip;
- param.port = port;
+ Com39Vo param = new Com39Vo();
+ param.setBatteryVoltAlarm(po.getBatteryVoltAlarm());
/**
* 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
@@ -458,99 +387,20 @@
*/
Param myParam = new Param();
myParam.setComId(comId);
+ myParam.setComType((byte)2);
myParam.setCommandCode(commandCode);
- myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+ myParam.setCommandName(CodeV1.getCodeName(commandCode));
myParam.setIntakeId(intakeId);
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
+ //myParam.setVcId(vcId);
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")) {
- // 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV1_0_1.cd_10;
-
- // 鍒涘缓瑙嗗浘
- Com97Vo param = new Com97Vo() ;
- return BaseResponseUtils.buildSuccess("");
- } else {
- return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
- }
- }
}
--
Gitblit v1.8.0