From bf580699fbe3fe2996712d90f09325e870991435 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 04 六月 2025 09:33:45 +0800
Subject: [PATCH] 两次请求命令时保存第二次的ID，开阀时判断阀门开闭状态
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java | 210 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 202 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
index e940483..8e2a50c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
@@ -8,11 +8,13 @@
import com.dy.common.mw.protocol.p206V1.CodeV1;
import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
import com.dy.common.mw.protocol.p206V1.downVos.Com97Vo;
+import com.dy.common.mw.protocol.p206V1.downVos.Com98Vo;
import com.dy.common.mw.protocol.p206V1.downVos.ComA1Vo;
import com.dy.common.mw.protocol.p206V2.ProtocolConstantV206V2;
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
import com.dy.common.mw.protocol.p206V202404.ProtocolConstantV206V202404;
import com.dy.common.mw.protocol.p206V202404.downVos.ComCd92_A2Vo;
+import com.dy.common.mw.protocol.p206V202404.downVos.ComCd93_A3Vo;
import com.dy.common.util.IDLongGenerator;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
@@ -20,6 +22,7 @@
import com.dy.pipIrrGlobal.command.ComSupport;
import com.dy.pipIrrGlobal.command.dto.Param;
import com.dy.pipIrrGlobal.daoIr.IrIntakeOperateMapper;
+import com.dy.pipIrrGlobal.daoPr.PrIntakeControllerMapper;
import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
import com.dy.pipIrrGlobal.daoPr.PrIntakeVcMapper;
import com.dy.pipIrrGlobal.daoPr.PrWaterPriceMapper;
@@ -36,7 +39,10 @@
import com.dy.pipIrrGlobal.voRm.VoUnclosedValve;
import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
import com.dy.pipIrrWechat.command.dto.AutomaticClose;
+import com.dy.pipIrrWechat.command.dto.ValveClose;
import com.dy.pipIrrWechat.command.dto.ValveOpen;
+import com.dy.pipIrrWechat.irrigatePlan.IrrigatePlanSv;
+import com.dy.pipIrrWechat.irrigation.IrrigationSv;
import com.dy.pipIrrWechat.result.WechatResultCode;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -44,6 +50,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.*;
@@ -68,6 +75,8 @@
private final RmOpenCloseValveLastMapper rmOpenCloseValveLastMapper;
//private final PrCommonIntakesMapper prCommonIntakesMapper;
private final IrIntakeOperateMapper irIntakeOperateMapper;
+ private final IrrigationSv irrigationSv;
+ private final PrIntakeControllerMapper prIntakeControllerMapper;
@Value("${mw.rtuCallbackUrl_wx}")
private String rtuCallbackUrl_wx;
@@ -81,7 +90,7 @@
private String pro_mw = "mw";
private String key_mw = "comSendUrl";
@Autowired
- public CommandSv(RmCommandHistoryMapper rmCommandHistoryMapper,RmOpenCloseValveLastMapper rmOpenCloseValveLastMapper, SeVirtualCardMapper seVirtualCardMapper, PrIntakeMapper prIntakeMapper, PrWaterPriceMapper prWaterPriceMapper, PrIntakeVcMapper prIntakeVcMapper, SeClientCardMapper seClientCardMapper, RmIrrigateProfileMapper rmIrrigateProfileMapper, Environment env, IrIntakeOperateMapper irIntakeOperateMapper) {
+ public CommandSv(RmCommandHistoryMapper rmCommandHistoryMapper,RmOpenCloseValveLastMapper rmOpenCloseValveLastMapper, SeVirtualCardMapper seVirtualCardMapper, PrIntakeMapper prIntakeMapper, PrWaterPriceMapper prWaterPriceMapper, PrIntakeVcMapper prIntakeVcMapper, SeClientCardMapper seClientCardMapper, RmIrrigateProfileMapper rmIrrigateProfileMapper, Environment env, IrIntakeOperateMapper irIntakeOperateMapper, IrrigationSv irrigationSv, PrIntakeControllerMapper prIntakeControllerMapper) {
this.rmCommandHistoryMapper = rmCommandHistoryMapper;
this.rmOpenCloseValveLastMapper = rmOpenCloseValveLastMapper;
//this.prCommonIntakesMapper = prCommonIntakesMapper;
@@ -93,6 +102,8 @@
this.rmIrrigateProfileMapper = rmIrrigateProfileMapper;
this.env = env;
this.irIntakeOperateMapper = irIntakeOperateMapper;
+ this.irrigationSv = irrigationSv;
+ this.prIntakeControllerMapper = prIntakeControllerMapper;
}
/**
* 铏氭嫙鍗D鎹㈣櫄鎷熷崱瀵硅薄
@@ -123,6 +134,7 @@
com.type = "innerCommand";
comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
+ String aa = response.toJSONString();
JSONArray jsonArray = new JSONArray();
if(response != null && response.getString("code").equals("0001")) {
@@ -255,6 +267,7 @@
* @param automaticClose
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
public Map planedOpenTimedClose(AutomaticClose automaticClose, Long planId, Byte operatetype, Date startTime, Integer duration) {
Long intakeId = automaticClose.getIntakeId();
Long vcId = automaticClose.getVcId();
@@ -263,8 +276,10 @@
Long operator = automaticClose.getOperator();
Byte openType = automaticClose.getOpenType();
Long comId = new IDLongGenerator().generate();
+ String intakeName = Optional.ofNullable(prIntakeControllerMapper.getIntakeNameById(intakeId)).orElse("");
// 濡傛灉鏄疆鐏�
+ Long operateId = null;
if(openType != null && openType == 1) {
IrIntakeOperate irIntakeOperate = new IrIntakeOperate();
irIntakeOperate.setPlanId(planId);
@@ -274,8 +289,8 @@
irIntakeOperate.setStartTime(startTime);
irIntakeOperate.setDuration(duration);
- Long id = addIntakeOperate(irIntakeOperate);
- if(id == null) {
+ operateId = addIntakeOperate(irIntakeOperate);
+ if(operateId == null) {
Map map = new HashMap<>();
map.put("success", false);
map.put("msg", "娣诲姞鍙栨按鍙ｆ搷浣滆褰曞け璐�");
@@ -302,7 +317,7 @@
Map map = new HashMap<>();
map.put("success", false);
- map.put("msg", WechatResultCode.PLEASE_SELECT_A_VC.getMessage() + "(" + intakeId + ")");
+ map.put("msg", WechatResultCode.PLEASE_SELECT_A_VC.getMessage() + "(" + intakeName + ")");
map.put("content", null);
return map;
}
@@ -315,14 +330,14 @@
Map map = new HashMap<>();
map.put("success", false);
- map.put("msg", WechatResultCode.PLEASE_SELECT_A_VC.getMessage() + "(" + intakeId + ")");
+ map.put("msg", WechatResultCode.PLEASE_SELECT_A_VC.getMessage() + "(" + intakeName + ")");
map.put("content", null);
return map;
}
String vcNum = vc.getVcNum().toString();
Double moneyRemain = vc.getMoney();
if(moneyRemain < 100) {
- irIntakeOperateMapper.updateByCommandId(comId, (byte)2, "铏氭嫙鍗′綑棰濅笉瓒筹紝璇峰厖鍊�" + "(" + intakeId + ")");
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, "铏氭嫙鍗′綑棰濅笉瓒筹紝璇峰厖鍊�" + "(" + intakeName + ")");
Map map = new HashMap<>();
map.put("success", false);
map.put("msg", "铏氭嫙鍗′綑棰濅笉瓒筹紝璇峰厖鍊�");
@@ -333,6 +348,7 @@
// 鑾峰彇姘翠环
Double waterPrice = getPrice();
if(waterPrice == null) {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.NO_WATER_PRICE.getMessage() + "(" + intakeName + ")");
Map map = new HashMap<>();
map.put("success", false);
map.put("msg", WechatResultCode.NO_WATER_PRICE.getMessage());
@@ -343,7 +359,7 @@
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
if(job_rtu == null) {
- irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.RTU_NOT_EXIST.getMessage() + "(" + intakeId + ")");
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.RTU_NOT_EXIST.getMessage() + "(" + intakeName + ")");
Map map = new HashMap<>();
map.put("success", false);
@@ -359,11 +375,22 @@
// 鐢熸垚璁㈠崟鍙�
String orderNo = generateOrderNo();
if(orderNo == null) {
- irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.NO_ORDER_NUMBER.getMessage() + "(" + intakeId + ")");
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.NO_ORDER_NUMBER.getMessage() + "(" + intakeName + ")");
Map map = new HashMap<>();
map.put("success", false);
map.put("msg", WechatResultCode.NO_ORDER_NUMBER.getMessage());
+ map.put("content", null);
+ return map;
+ }
+
+ // 鍒ゆ柇闃�鎺у櫒鏄惁宸茬粡寮�闃�
+ Boolean isOpen = irrigationSv.getOpenCloseStatus(rtuAddr);
+ if(isOpen) {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, intakeName + " 闃�闂ㄤ负鎵撳紑鐘舵��");
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", intakeName + " 闃�闂ㄤ负鎵撳紑鐘舵��");
map.put("content", null);
return map;
}
@@ -412,6 +439,15 @@
myParam.setOpenType(openType);
BaseResponse<Boolean> result = dealWithCommandResult(myParam);
+ // 濡傛灉鍛戒护鎵ц澶辫触锛屽垯鍐嶆鎵ц鍛戒护
+ if(!result.isSuccess()) {
+ Long newComId = new IDLongGenerator().generate();
+ myParam.setComId(newComId);
+ result = dealWithCommandResult(myParam);
+
+ // 鏍规嵁operateId淇敼鍙栨按鍙ｆ搷浣滆褰曚腑鐨刢ommandId
+ irIntakeOperateMapper.updateCommandId(newComId, operateId);
+ }
Map map = new HashMap<>();
map.put("success", result.isSuccess());
@@ -429,6 +465,13 @@
}
}
+ /**
+ * 灏忕▼搴忚繙绋嬪紑闃�
+ * @param valve
+ * @param planId
+ * @param operatetype
+ * @return
+ */
public Map openWx(ValveOpen valve, Long planId, Byte operatetype) {
Long intakeId = valve.getIntakeId();
String intakeName = valve.getIntakeName();
@@ -602,7 +645,14 @@
myParam.setParam(param);
myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
myParam.setOperator(operator);
+ //BaseResponse<Boolean> result = dealWithCommandResult(myParam);
+
BaseResponse<Boolean> result = dealWithCommandResult(myParam);
+ // 濡傛灉鍛戒护鎵ц澶辫触锛屽垯鍐嶆鎵ц鍛戒护
+ if(!result.isSuccess()) {
+ myParam.setComId(new IDLongGenerator().generate());
+ result = dealWithCommandResult(myParam);
+ }
Map map = new HashMap<>();
map.put("success", result.isSuccess());
@@ -657,4 +707,148 @@
return map;
}
}
+
+ /**
+ * 灏忕▼搴忚繙绋嬪叧闃�
+ * @param valve
+ * @param planId
+ * @param operatetype
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public Map closeWx(ValveClose valve, Long planId, Byte operatetype) {
+ String rtuAddr = valve.getRtuAddr();
+ String vcNum = valve.getVcNum();
+ Long vcId = Optional.ofNullable(seVirtualCardMapper.getVcIdByNum(vcNum)).orElse(0L);
+ String orderNo = valve.getOrderNo();
+ Long operator = valve.getOperator();
+ Byte openType = valve.getOpenType();
+ Long comId = new IDLongGenerator().generate();
+
+ // 闃�鎺у櫒鍦板潃鎹㈠彇姘村彛ID鍜岄�氳鍗忚
+ JSONObject job_rtu = getRtu(null, rtuAddr);
+ if (job_rtu == null) {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.RTU_NOT_EXIST.getMessage());
+
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", WechatResultCode.RTU_NOT_EXIST.getMessage());
+ map.put("content", null);
+ return map;
+ //return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_EXIST.getMessage());
+ }
+ Long intakeId = job_rtu.getLong("intakeId");
+ String protocol = job_rtu.getString("protocol");
+
+ // 濡傛灉鏄疆鐏�
+ if(openType != null && openType == 1) {
+ IrIntakeOperate irIntakeOperate = new IrIntakeOperate();
+ irIntakeOperate.setPlanId(planId);
+ irIntakeOperate.setOperateType(operatetype);
+ irIntakeOperate.setCommandId(comId);
+ irIntakeOperate.setIntakeId(intakeId);
+ irIntakeOperate.setCommandResult((byte)1);
+
+ Long id = addIntakeOperate(irIntakeOperate);
+ if(id == null) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "娣诲姞鍙栨按鍙ｆ搷浣滆褰曞け璐�");
+ map.put("content", null);
+ return map;
+ }
+ }
+
+ comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
+
+ String commandCode = null;
+ if (protocol.equals(ProtocolConstantV206V202404.protocolName)) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV202404.cd_A3;
+
+ // 鍒涘缓瑙嗗浘
+ ComCd93_A3Vo param = new ComCd93_A3Vo();
+ param.controllerType = controllerType;
+ param.projectNo = projectNo;
+ param.icCardNo = vcNum;
+ param.orderNo = orderNo;
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setComType((byte)2);
+ myParam.setCommandCode(commandCode);
+ myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+ myParam.setIntakeId(intakeId);
+ myParam.setRtuAddr(rtuAddr);
+ myParam.setProtocol(protocol);
+ myParam.setVcId(vcId);
+ myParam.setParam(param);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
+ myParam.setOperator(operator);
+ //return dealWithCommandResult(myParam);
+ BaseResponse<Boolean> result = dealWithCommandResult(myParam);
+
+ Map map = new HashMap<>();
+ map.put("success", result.isSuccess());
+ map.put("msg", result.getMsg());
+ map.put("content", result.getContent());
+ return map;
+ } else if (protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV1.cd_98;
+
+ // 鍒涘缓瑙嗗浘
+ Com98Vo param = new Com98Vo();
+ param.icCardNo = vcNum;
+ param.orderNo = orderNo;
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 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_wx);
+ myParam.setOperator(operator);
+ //return dealWithCommandResult(myParam);
+
+ BaseResponse<Boolean> result = dealWithCommandResult(myParam);
+ // 濡傛灉鍛戒护鎵ц澶辫触锛屽垯鍐嶆鎵ц鍛戒护
+ if(!result.isSuccess()) {
+ myParam.setComId(new IDLongGenerator().generate());
+ result = dealWithCommandResult(myParam);
+ }
+
+ Map map = new HashMap<>();
+ map.put("success", result.isSuccess());
+ map.put("msg", result.getMsg());
+ map.put("content", result.getContent());
+ return map;
+
+ } else {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, "绯荤粺鏆備笉鏀寔璇ュ崗璁�" + "(" + intakeId + ")");
+
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ map.put("content", null);
+ return map;
+ //return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ }
+
+ }
}
--
Gitblit v1.8.0