From 001f24d4efd7b818bc2224b976c82faf4f9e564c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十一月 2024 11:25:00 +0800
Subject: [PATCH] 1、通信协议要增加版本号（目的为远程升级准备），原来没有版本号的协议默认为版本号为1，所以调整了程序命名； 2、流浪控制器与控制器数据库表都增加了协议版本号字段； 3、VO中Double和Float类型的属性增加注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java | 508 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 349 insertions(+), 159 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..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
@@ -1,38 +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.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.ComCd10Vo;
+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.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.command.ComSupport;
-import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
-import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
+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.qo.OnLineIntakesQO;
+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;
-import org.springframework.web.bind.annotation.*;
+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 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
@@ -44,173 +46,361 @@
@Slf4j
@RestController
@RequestMapping(path="rtu")
-@RequiredArgsConstructor
+//@RequiredArgsConstructor
public class RtuCtrl extends ComSupport {
private final CommandSv commandSv;
-
- protected static String controllerType = "57";
private final IDLongGenerator idLongGenerator;
+ @Value("${mw.rtuCallbackUrl_rm}")
+ private String rtuCallbackUrl_rm;
+
/**
- * 鏌ヨ鎵�鏈塕TU鍦ㄧ嚎鎯呭喌锛堜粎娴嬭瘯鐢級
- * @return
+ * pro_mw锛氬睘鎬�
+ * tag浠庢帶鍒跺櫒涓幏鍙�
+ * key_mw锛歶rl鐨刱ey
*/
- @GetMapping(path = "get_online")
- @SsoAop()
- public BaseResponse<Boolean> get_online() {
- Command com = new Command() ;
- com.id = Command.defaultId;
- com.code = "LCD0001";
- com.type = "innerCommand";
+ private Environment env = null;
+ private String pro_mw = "mw";
+ private String key_mw = "comSendUrl";
- JSONObject response = (JSONObject)JSON.toJSON(sendCom2Mw(com));
- JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
-
- return BaseResponseUtils.buildSuccess(attachment) ;
+ @Autowired
+ public RtuCtrl(CommandSv commandSv, IDLongGenerator idLongGenerator, Environment env) {
+ this.commandSv = commandSv;
+ this.idLongGenerator = idLongGenerator;
+ this.env = env;
}
/**
- * 鑾峰彇鍙栨按鍙ｅ垪琛紙鍦ㄧ嚎鍜屼笉鍦ㄧ嚎锛�
- * @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());
- }
- }
-
- /**
- * 璁剧疆璁惧缁堢鍦板潃
- * @param addr 璁剧疆璁惧缁堢鍦板潃浼犲叆瀵硅薄
+ * 閫氱敤鏌ヨ鎺ュ彛
+ * p206V1
+ * 66 鏌ヨIP鍜岀鍙�
+ * 67 鏌ヨ娴侀噺閲囬泦鍛ㄦ湡
+ * 68 鏌ヨ鐢ㄦ埛浣欓鎶ヨ鍊�
+ * 69 鏌ヨ鐢垫睜鐢靛帇鎶ヨ鍊�
+ * 6A 鏌ヨ闃�闂ㄥ牭杞數娴佸��
+ * 6B 鏌ヨ闃�闂ㄨ秴鏃舵椂闂�
+ * @param po 鏌ヨ浼犲叆瀵硅薄
* @param bindingResult
- * @return
+ * @return 鏌ヨ缁撴灉
*/
- @PostMapping(path = "set_addr", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @PostMapping(path = "common_get", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> setAddr(@RequestBody @Valid Addr addr, 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());
}
- 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鍒嗛挓鍚庡幓鏌ョ湅缁撴灉");
- }
-
-
- //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()
- public BaseResponse<Boolean> clearUsageRecord(@RequestBody @Valid DtoBase 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();
Long operator = po.getOperator();
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();
- String rtuAddr = "";
- String protocol = "";
+ 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 orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
+ comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
- // 鍒涘缓瑙嗗浘
- ComCdXyVo param = new ComCdXyVo();
- param.controllerType = controllerType;
- param.projectNo = projectNo;
+ // 鑾峰彇鍔熻兘鐮�
+ String commandCode = po.getCommandCode();
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
+ // 鍒涘缓瑙嗗浘
+ ComCdXyVo param = new ComCdXyVo();
+ param.controllerType = controllerType;
+ param.projectNo = projectNo;
- // 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
- RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, "",intakeId, rtuAddr, protocol, param, operator);
- comId = commandSv.insert(rmCommandHistory);
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 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(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
+ // 鍒涘缓瑙嗗浘
+ ComXyVo param = new ComXyVo();
+ param.setCommandCode(commandCode);
- // 鏋勯�犲懡浠�
- Command com = command(comId, commandCode,"", rtuAddr, protocol, param);
- return sendCom2Mw(com);
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setComType((byte)2);
+ myParam.setCommandCode(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 {
+ return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ }
}
+
+ /**
+ * 璁剧疆娴侀噺閲囬泦鍛ㄦ湡
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "set_collect_period", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ 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();
+ Long operator = po.getOperator();
+ Long comId = idLongGenerator.generate();
+
+ // 鍙栨按鍙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 orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
+ comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
+
+ // 鑾峰彇鍔熻兘鐮�
+ String commandCode = po.getCommandCode();
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
+ return BaseResponseUtils.buildSuccess("");
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
+ // 鍒涘缓瑙嗗浘
+ Com37Vo param = new Com37Vo();
+ param.setSeconds(po.getSeconds());
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setComType((byte)2);
+ myParam.setCommandCode(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 {
+ return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ }
+ }
+
+ /**
+ * 璁剧疆鏈嶅姟绔疘P鍜岀鍙�
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "set_ip_port", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ 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();
+ Long operator = po.getOperator();
+ Long comId = idLongGenerator.generate();
+
+ // 鍙栨按鍙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 orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
+ comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
+
+ // 鑾峰彇鍔熻兘鐮�
+ String commandCode = po.getCommandCode();
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
+ return BaseResponseUtils.buildSuccess("");
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
+ // 鍒涘缓瑙嗗浘
+ Com21Vo param = new Com21Vo();
+ param.setIp(po.getIp());
+ param.setPort(po.getPort());
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setComType((byte)2);
+ myParam.setCommandCode(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 {
+ return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ }
+ }
+
+ /**
+ * 璁剧疆鐢ㄦ埛浣欓鎶ヨ鍊�
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "set_remain_money_alarm", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ 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();
+ Long operator = po.getOperator();
+ Long comId = idLongGenerator.generate();
+
+ // 鍙栨按鍙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 orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
+ comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
+
+ // 鑾峰彇鍔熻兘鐮�
+ String commandCode = po.getCommandCode();
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
+ return BaseResponseUtils.buildSuccess("");
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
+ // 鍒涘缓瑙嗗浘
+ Com38Vo param = new Com38Vo();
+ param.setRemainMoneyAlarm(po.getRemainMoneyAlarm());
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setComType((byte)2);
+ myParam.setCommandCode(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 {
+ return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ }
+ }
+
+ /**
+ * 璁剧疆鐢垫睜鐢靛帇鎶ヨ鍊�
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "set_battery_volt_alarm", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ 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();
+ Long operator = po.getOperator();
+ Long comId = idLongGenerator.generate();
+
+ // 鍙栨按鍙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 orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
+ comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
+
+ // 鑾峰彇鍔熻兘鐮�
+ String commandCode = po.getCommandCode();
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
+ return BaseResponseUtils.buildSuccess("");
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
+ // 鍒涘缓瑙嗗浘
+ Com39Vo param = new Com39Vo();
+ param.setBatteryVoltAlarm(po.getBatteryVoltAlarm());
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setComType((byte)2);
+ myParam.setCommandCode(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 {
+ return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ }
+ }
+
}
--
Gitblit v1.8.0