From 7aab004601e77890b158f19d1735594a8326feaa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 24 四月 2025 17:11:17 +0800
Subject: [PATCH] 数据库事务注解位置调整
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java | 705 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 682 insertions(+), 23 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 ae7601e..6bbaac0 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
@@ -5,29 +5,51 @@
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.multiDataSource.DataSourceContext;
import com.dy.common.mw.protocol.Command;
+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;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.command.ComSupport;
+import com.dy.pipIrrGlobal.command.dto.Param;
+import com.dy.pipIrrGlobal.daoIr.IrIntakeOperateMapper;
import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
import com.dy.pipIrrGlobal.daoPr.PrIntakeVcMapper;
import com.dy.pipIrrGlobal.daoPr.PrWaterPriceMapper;
import com.dy.pipIrrGlobal.daoRm.RmCommandHistoryMapper;
+import com.dy.pipIrrGlobal.daoRm.RmIrrigateProfileMapper;
+import com.dy.pipIrrGlobal.daoRm.RmOpenCloseValveLastMapper;
import com.dy.pipIrrGlobal.daoSe.SeClientCardMapper;
import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;
+import com.dy.pipIrrGlobal.pojoIr.IrIntakeOperate;
import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
-import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
+import com.dy.pipIrrGlobal.voRm.VoIrrigaterProfile;
+import com.dy.pipIrrGlobal.voRm.VoRtuAndVc;
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.result.WechatResultCode;
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.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author ZhuBaoMin
@@ -46,6 +68,13 @@
private final PrWaterPriceMapper prWaterPriceMapper;
private final PrIntakeVcMapper prIntakeVcMapper;
private final SeClientCardMapper seClientCardMapper;
+ private final RmIrrigateProfileMapper rmIrrigateProfileMapper;
+ private final RmOpenCloseValveLastMapper rmOpenCloseValveLastMapper;
+ //private final PrCommonIntakesMapper prCommonIntakesMapper;
+ private final IrIntakeOperateMapper irIntakeOperateMapper;
+
+ @Value("${mw.rtuCallbackUrl_wx}")
+ private String rtuCallbackUrl_wx;
/**
* pro_mw锛氬睘鎬�
@@ -56,14 +85,18 @@
private String pro_mw = "mw";
private String key_mw = "comSendUrl";
@Autowired
- public CommandSv(RmCommandHistoryMapper rmCommandHistoryMapper, SeVirtualCardMapper seVirtualCardMapper, PrIntakeMapper prIntakeMapper, PrWaterPriceMapper prWaterPriceMapper, PrIntakeVcMapper prIntakeVcMapper, SeClientCardMapper seClientCardMapper, Environment env) {
+ public CommandSv(RmCommandHistoryMapper rmCommandHistoryMapper,RmOpenCloseValveLastMapper rmOpenCloseValveLastMapper, SeVirtualCardMapper seVirtualCardMapper, PrIntakeMapper prIntakeMapper, PrWaterPriceMapper prWaterPriceMapper, PrIntakeVcMapper prIntakeVcMapper, SeClientCardMapper seClientCardMapper, RmIrrigateProfileMapper rmIrrigateProfileMapper, Environment env, IrIntakeOperateMapper irIntakeOperateMapper) {
this.rmCommandHistoryMapper = rmCommandHistoryMapper;
+ this.rmOpenCloseValveLastMapper = rmOpenCloseValveLastMapper;
+ //this.prCommonIntakesMapper = prCommonIntakesMapper;
this.seVirtualCardMapper = seVirtualCardMapper;
this.prIntakeMapper = prIntakeMapper;
this.prWaterPriceMapper = prWaterPriceMapper;
this.prIntakeVcMapper = prIntakeVcMapper;
this.seClientCardMapper = seClientCardMapper;
+ this.rmIrrigateProfileMapper = rmIrrigateProfileMapper;
this.env = env;
+ this.irIntakeOperateMapper = irIntakeOperateMapper;
}
/**
* 铏氭嫙鍗D鎹㈣櫄鎷熷崱瀵硅薄
@@ -93,31 +126,55 @@
com.code = "LCD0001";
com.type = "innerCommand";
comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
-
JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
+
+ JSONArray jsonArray = new JSONArray();
if(response != null && response.getString("code").equals("0001")) {
- JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap");
- HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class);
-
- JSONArray jsonArray = new JSONArray();
- for (Map.Entry<String, Boolean> entry : onLineMap.entrySet()) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("rtuAddr", entry.getKey());
- jsonObject.put("isOnLine", entry.getValue());
- jsonArray.add(jsonObject);
+ JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
+ if(attachment != null) {
+ attachment.forEach((key, value) -> {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("rtuAddr", key);
+ jsonObject.put("isOnLine", value);
+ jsonArray.add(jsonObject);
+ });
}
+ //System.out.println(jsonArray.toJSONString());
+ }
- System.out.println(jsonArray);
- List<VoUnclosedValve> res = rmCommandHistoryMapper.getUnclosedValves(jsonArray.toJSONString(), operator);
+ /**
+ * 鑾峰彇鏈叧闃�鐨凴TU鍦板潃鍜岃櫄鎷熷崱缂栧彿瀵规暟缁�
+ * 閬嶅巻鏁扮粍鑾峰彇鏈�鍚庡懡浠ゆ棩蹇桰D闆嗗悎
+ */
+ List<VoRtuAndVc> rtus = rmCommandHistoryMapper.getUnclosedRtus(operator);
+ String comIds = "";
+ if(rtus != null && rtus.size() > 0) {
+ for (int i = 0; i < rtus.size(); i++) {
+ Long comId = rmCommandHistoryMapper.getLastComId(rtus.get(i).getRtuAddr(), rtus.get(i).getVcNum());
+ if(comId > 0) {
+ comIds = comIds + "\"" + comId + "\",";
+ }
+ }
+ }
+
+ if(comIds.length() > 0) {
+ comIds = comIds.substring(0, comIds.length()-1);
+ List<VoUnclosedValve> res = rmCommandHistoryMapper.getUnclosedValves(jsonArray.toJSONString(), comIds);
if(res != null) {
return res;
- } else {
- return new ArrayList<>();
}
- } else {
- QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>();
- return new ArrayList<>();
}
+ return new ArrayList<>();
+ }
+
+ /**
+ * 涓烘寚瀹氾紙闃�鎺у櫒鍦板潃銆佹按鍗＄紪鍙枫�佹棤鍏抽榾璁板綍锛夊紑鍏抽榾鏈�鏂拌褰曟坊鍔犲叧闃�鏃堕棿锛屼娇涔嬩笉鍦ㄦ湭鍏抽榾璁板綍涓樉绀�
+ * @param rtuAddr
+ * @param icCardNo
+ * @return
+ */
+ public Integer addClostTime(String rtuAddr, String icCardNo) {
+ return rmOpenCloseValveLastMapper.addCloseTime(rtuAddr, icCardNo);
}
/**
@@ -166,4 +223,606 @@
return prIntakeMapper.getIntakeIdByName(intakeName);
}
+ /**
+ * 鏍规嵁閰嶇疆绫诲瀷鑾峰彇閰嶇疆鍊�
+ * @param type
+ * @return
+ */
+ QueryResultVo<List<VoIrrigaterProfile>> getIrrPro(Integer type) {
+ QueryResultVo<List<VoIrrigaterProfile>> rsVo = new QueryResultVo<>() ;
+ rsVo.obj = rmIrrigateProfileMapper.getIrrPro(type);
+ return rsVo ;
+ }
+
+ /**
+ * 娣诲姞鍙栨按鍙ｆ搷浣滆褰曪紝杞亴杩囩▼鍛戒护涓嬪彂鏃朵娇鐢�
+ * @param po
+ * @return
+ */
+ public Long addIntakeOperate(IrIntakeOperate po) {
+ irIntakeOperateMapper.insert(po);
+ return po.getId();
+ }
+
+ ///**
+ // * 鏍规嵁鍛戒护ID鏇存柊鍙栨按鍙ｆ搷浣滆褰�
+ // * @param commandId
+ // * @param commandResult
+ // * @return
+ // */
+ //public Integer updateByCommandId(Long commandId, Byte commandResult) {
+ // return irIntakeOperateMapper.updateByCommandId(commandId, commandResult);
+ //}
+
+ /**
+ * 瀹氭椂鍏抽榾寮忚鍒掑紑闃�
+ * @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();
+ Date plannedOpenTime = automaticClose.getPlannedOpenTime();
+ Integer minutes = automaticClose.getMinutes();
+ Long operator = automaticClose.getOperator();
+ Byte openType = automaticClose.getOpenType();
+ Long comId = new IDLongGenerator().generate();
+
+ // 濡傛灉鏄疆鐏�
+ if(openType != null && openType == 1) {
+ IrIntakeOperate irIntakeOperate = new IrIntakeOperate();
+ irIntakeOperate.setPlanId(planId);
+ irIntakeOperate.setOperateType(operatetype);
+ irIntakeOperate.setCommandId(comId);
+ irIntakeOperate.setIntakeId(intakeId);
+ irIntakeOperate.setStartTime(startTime);
+ irIntakeOperate.setDuration(duration);
+
+ Long id = addIntakeOperate(irIntakeOperate);
+ if(id == null) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "娣诲姞鍙栨按鍙ｆ搷浣滆褰曞け璐�");
+ map.put("content", null);
+ return map;
+ }
+ }
+
+ Integer year = Integer.parseInt(String.format("%tY", plannedOpenTime));
+ Integer month = Integer.parseInt(String.format("%tm", plannedOpenTime));
+ Integer day = Integer.parseInt(String.format("%td", plannedOpenTime));
+ Integer hour = Integer.parseInt(String.format("%tH", plannedOpenTime));
+ Integer minute = Integer.parseInt(String.format("%tM", plannedOpenTime));
+
+ /**
+ * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
+ * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
+ * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
+ */
+ if(vcId == null) {
+ vcId = getVcIdByIntakeId(intakeId);
+ if(vcId == null) {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.PLEASE_SELECT_A_VC.getMessage() + "(" + intakeId + ")");
+
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", WechatResultCode.PLEASE_SELECT_A_VC.getMessage() + "(" + intakeId + ")");
+ map.put("content", null);
+ return map;
+ }
+ }
+
+ // 铏氭嫙鍗D鎹㈣櫄鎷熷崱瀵硅薄
+ VoVirtualCard vc = getVcById(vcId);
+ if(vc == null) {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.PLEASE_SELECT_A_VC.getMessage() + "(" + intakeId + ")");
+
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", WechatResultCode.PLEASE_SELECT_A_VC.getMessage() + "(" + intakeId + ")");
+ map.put("content", null);
+ return map;
+ }
+ String vcNum = vc.getVcNum().toString();
+ Double moneyRemain = vc.getMoney();
+ if(moneyRemain < 100) {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, "铏氭嫙鍗′綑棰濅笉瓒筹紝璇峰厖鍊�" + "(" + intakeId + ")");
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "铏氭嫙鍗′綑棰濅笉瓒筹紝璇峰厖鍊�");
+ map.put("content", null);
+ return map;
+ }
+
+ // 鑾峰彇姘翠环
+ Double waterPrice = getPrice();
+ if(waterPrice == null) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", WechatResultCode.NO_WATER_PRICE.getMessage());
+ map.put("content", null);
+ return map;
+ }
+
+ // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
+ JSONObject job_rtu = getRtu(intakeId, null);
+ if(job_rtu == null) {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.RTU_NOT_EXIST.getMessage() + "(" + intakeId + ")");
+
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", WechatResultCode.RTU_NOT_EXIST.getMessage());
+ map.put("content", null);
+ return map;
+ }
+ String rtuAddr = job_rtu.getString("rtuAddr");
+ String protocol = job_rtu.getString("protocol");
+
+ comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
+
+ // 鐢熸垚璁㈠崟鍙�
+ String orderNo = generateOrderNo();
+ if(orderNo == null) {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.NO_ORDER_NUMBER.getMessage() + "(" + intakeId + ")");
+
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", WechatResultCode.NO_ORDER_NUMBER.getMessage());
+ map.put("content", null);
+ return map;
+ }
+
+ String commandCode = null;
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
+ Map map = new HashMap<>();
+ map.put("success", true);
+ map.put("msg", "寮�闃�鎴愬姛");
+ map.put("content", null);
+ return map;
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV1.cd_A1;
+
+ // 鍒涘缓瑙嗗浘
+ ComA1Vo param = new ComA1Vo();
+ param.setIcCardNo(vcNum);
+ param.setMoneyRemain(moneyRemain);
+ param.setWaterPrice(waterPrice);
+ param.setMinutes(minutes);
+ param.setYear(year);
+ param.setMonth(month);
+ param.setDay(day);
+ param.setHour(hour);
+ param.setMinute(minute);
+ param.setOrderNo(orderNo);
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setComType((byte)1);
+ 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);
+ myParam.setOpenType(openType);
+
+ 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;
+ }
+ }
+
+ /**
+ * 灏忕▼搴忚繙绋嬪紑闃�
+ * @param valve
+ * @param planId
+ * @param operatetype
+ * @return
+ */
+ public Map openWx(ValveOpen valve, Long planId, Byte operatetype) {
+ Long intakeId = valve.getIntakeId();
+ String intakeName = valve.getIntakeName();
+ Long vcId = valve.getVcId();
+ Boolean forceOpen = valve.getForceOpen();
+ Long operator = valve.getOperator();
+ Byte openType = valve.getOpenType();
+ Long comId = new IDLongGenerator().generate();
+
+ // 濡傛灉鏄疆鐏�
+ if(openType != null && openType == 1) {
+ IrIntakeOperate irIntakeOperate = new IrIntakeOperate();
+ irIntakeOperate.setPlanId(planId);
+ irIntakeOperate.setOperateType(operatetype);
+ irIntakeOperate.setCommandId(comId);
+ irIntakeOperate.setIntakeId(intakeId);
+
+ Long id = addIntakeOperate(irIntakeOperate);
+ if(id == null) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "娣诲姞鍙栨按鍙ｆ搷浣滆褰曞け璐�");
+ map.put("content", null);
+ return map;
+ }
+ }
+
+ if(intakeId == null && intakeName == null) {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.PLEASE_SELECT_A_INTAKE.getMessage() + "(" + intakeId + ")");
+
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", WechatResultCode.PLEASE_SELECT_A_INTAKE.getMessage() + "(" + intakeId + ")");
+ map.put("content", null);
+ return map;
+ //return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_INTAKE.getMessage());
+ }
+
+ // intakeName鎹ntakeId
+ if(intakeId == null) {
+ intakeId = getIntakeIdByName(intakeName);
+ if(intakeId == null) {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.PLEASE_SELECT_A_INTAKE.getMessage() + "(" + intakeId + ")");
+
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", WechatResultCode.PLEASE_SELECT_A_INTAKE.getMessage() + "(" + intakeId + ")");
+ map.put("content", null);
+ return map;
+ //return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_INTAKE.getMessage());
+ }
+ }
+
+ /**
+ * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
+ * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
+ * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
+ */
+ if (vcId == null) {
+ vcId = getVcIdByIntakeId(intakeId);
+ if (vcId == null) {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.PLEASE_SELECT_A_VC.getMessage() + "(" + intakeId + ")");
+
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", WechatResultCode.PLEASE_SELECT_A_VC.getMessage() + "(" + intakeId + ")");
+ map.put("content", null);
+ return map;
+ //return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
+ }
+ }
+
+ // 铏氭嫙鍗D鎹㈣櫄鎷熷崱瀵硅薄
+ VoVirtualCard vc = getVcById(vcId);
+ if (vc == null) {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.PLEASE_SELECT_A_VC.getMessage() + "(" + intakeId + ")");
+
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", WechatResultCode.PLEASE_SELECT_A_VC.getMessage() + "(" + intakeId + ")");
+ map.put("content", null);
+ return map;
+ //return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
+ }
+
+ // 铏氭嫙鍗＄姸鎬佷负浣跨敤涓紝涓斾笉鏄己鍒跺紑闃�鏃舵彁绀�
+ if (vc.getInUse() && !forceOpen) {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getMessage() + "(" + intakeId + ")");
+
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getMessage() + "(" + intakeId + ")");
+ map.put("content", null);
+ return map;
+ //return BaseResponseUtils.buildCodeMsg(WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getCode(), WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getMessage());
+ }
+
+ // 鑾峰彇姘翠环
+ Double waterPrice = getPrice();
+ if(waterPrice == null) {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.NO_WATER_PRICE.getMessage() + "(" + intakeId + ")");
+
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", WechatResultCode.NO_WATER_PRICE.getMessage() + "(" + intakeId + ")");
+ map.put("content", null);
+ return map;
+ //return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
+ }
+
+ // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
+ JSONObject job_rtu = getRtu(intakeId, null);
+ if (job_rtu == null) {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.RTU_NOT_EXIST.getMessage() + "(" + intakeId + ")");
+
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", WechatResultCode.RTU_NOT_EXIST.getMessage() + "(" + intakeId + ")");
+ map.put("content", null);
+ return map;
+ //return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_EXIST.getMessage());
+ }
+ String rtuAddr = job_rtu.getString("rtuAddr");
+ String protocol = job_rtu.getString("protocol");
+
+ comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
+
+ // 鐢熸垚璁㈠崟鍙�
+ String orderNo = generateOrderNo();
+ if(orderNo == null) {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.NO_ORDER_NUMBER.getMessage() + "(" + intakeId + ")");
+
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", WechatResultCode.NO_ORDER_NUMBER.getMessage() + "(" + intakeId + ")");
+ map.put("content", null);
+ return map;
+ //return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_ORDER_NUMBER.getMessage());
+ }
+
+ String commandCode = null;
+ if (protocol.equals(ProtocolConstantV206V202404.protocolName)) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV202404.cd_A2;
+
+ // 鍒涘缓瑙嗗浘
+ ComCd92_A2Vo param = new ComCd92_A2Vo();
+ param.controllerType = controllerType;
+ param.projectNo = projectNo;
+ param.icCardNo = vc.getVcNum().toString();
+ param.waterRemain = 0.0;
+ param.moneyRemain = vc.getMoney();
+ param.waterPrice = waterPrice;
+ param.elePrice = 0.0;
+ param.orderNo = orderNo;
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setComType((byte)1);
+ 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);
+ //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());
+ 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_97;
+
+ // 鍒涘缓瑙嗗浘
+ Com97Vo param = new Com97Vo();
+ param.icCardNo = vc.getVcNum().toString();
+ param.moneyRemain = vc.getMoney();
+ param.waterPrice = waterPrice;
+ param.orderNo = orderNo;
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setComType((byte)1);
+ 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);
+
+ Map map = new HashMap<>();
+ map.put("success", result.isSuccess());
+ map.put("msg", result.getMsg());
+ map.put("content", result.getContent());
+ return map;
+ } else {
+ //return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, "绯荤粺鏆備笉鏀寔璇ュ崗璁�" + "(" + intakeId + ")");
+
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ map.put("content", null);
+ 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