From 5f54ba90abcc0ccf1b578472eac54fc98056767c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 08 四月 2025 17:15:13 +0800
Subject: [PATCH] 灌溉计划终止接口，包括远程关阀和取消灌溉计划
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java | 699 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 361 insertions(+), 338 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
index d098d1f..22e08e8 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
@@ -2,9 +2,12 @@
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.multiDataSource.DataSourceContext;
-import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
-import com.dy.common.mw.protocol.p206V1_0_0.downVos.*;
+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.ProtocolConstantV206V202404;
import com.dy.common.mw.protocol.p206V202404.downVos.ComCd15Vo;
import com.dy.common.mw.protocol.p206V202404.downVos.ComCd92_A2Vo;
import com.dy.common.mw.protocol.p206V202404.downVos.ComCd93_A3Vo;
@@ -33,10 +36,7 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
/**
* @author ZhuBaoMin
@@ -52,7 +52,6 @@
public class ValveCtrl extends ComSupport {
private final CommandSv commandSv;
private final SeVirtualCardMapper seVirtualCardMapper;
- private final IDLongGenerator idLongGenerator;
@Value("${mw.rtuCallbackUrl_wx}")
private String rtuCallbackUrl_wx;
@@ -67,10 +66,9 @@
private String key_mw = "comSendUrl";
@Autowired
- public ValveCtrl(CommandSv commandSv, SeVirtualCardMapper seVirtualCardMapper, IDLongGenerator idLongGenerator, Environment env) {
+ public ValveCtrl(CommandSv commandSv, SeVirtualCardMapper seVirtualCardMapper, Environment env) {
this.commandSv = commandSv;
this.seVirtualCardMapper = seVirtualCardMapper;
- this.idLongGenerator = idLongGenerator;
this.env = env;
}
@@ -81,147 +79,149 @@
* @return
*/
@PostMapping(path = "open_wx", consumes = MediaType.APPLICATION_JSON_VALUE)
- //@Transactional(rollbackFor = Exception.class)
+ @Transactional(rollbackFor = Exception.class)
public BaseResponse<Boolean> open(@RequestBody @Valid ValveOpen valve, BindingResult bindingResult) {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- Long intakeId = valve.getIntakeId();
- String intakeName = valve.getIntakeName();
- Long vcId = valve.getVcId();
- Boolean forceOpen = valve.getForceOpen();
- Long operator = valve.getOperator();
- Long comId = idLongGenerator.generate();
-
- if(intakeId == null && intakeName == null) {
- return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_INTAKE.getMessage());
+ Map map_result = commandSv.openWx(valve, null, null);
+ if(map_result.get("success").equals(false)) {
+ return BaseResponseUtils.buildErrorMsg(map_result.get("msg").toString());
}
+ return BaseResponseUtils.buildSuccess(map_result.get("content")) ;
- // intakeName鎹ntakeId
- if(intakeId == null) {
- intakeId = commandSv.getIntakeIdByName(intakeName);
- if(intakeId == null) {
- return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_INTAKE.getMessage());
- }
- }
-
- /**
- * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
- * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
- * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
- */
- if (vcId == null) {
- vcId = commandSv.getVcIdByIntakeId(intakeId);
- if (vcId == null) {
- return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
- }
- }
-
- // 铏氭嫙鍗D鎹㈣櫄鎷熷崱瀵硅薄
- VoVirtualCard vc = commandSv.getVcById(vcId);
- if (vc == null) {
- return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
- }
-
- // 铏氭嫙鍗＄姸鎬佷负浣跨敤涓紝涓斾笉鏄己鍒跺紑闃�鏃舵彁绀�
- if (vc.getInUse() && !forceOpen) {
- return BaseResponseUtils.buildCodeMsg(WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getCode(), WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getMessage());
- }
-
- // 鑾峰彇姘翠环
- Double waterPrice = commandSv.getPrice();
- if(waterPrice == null) {
- return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
- }
-
- // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
- JSONObject job_rtu = getRtu(intakeId, null);
- if (job_rtu == null) {
- return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_EXIST.getMessage());
- }
- String rtuAddr = job_rtu.getString("rtuAddr");
- String protocol = job_rtu.getString("protocol");
- //String orgTag = job_rtu.getString("orgTag");
- //if(orgTag == null) {
- // return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ //Long intakeId = valve.getIntakeId();
+ //String intakeName = valve.getIntakeName();
+ //Long vcId = valve.getVcId();
+ //Boolean forceOpen = valve.getForceOpen();
+ //Long operator = valve.getOperator();
+ //Long comId = new IDLongGenerator().generate();
+ //
+ //if(intakeId == null && intakeName == null) {
+ // return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_INTAKE.getMessage());
//}
- //comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
- comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
-
- // 鐢熸垚璁㈠崟鍙�
- String orderNo = generateOrderNo();
- if(orderNo == null) {
- return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_ORDER_NUMBER.getMessage());
- }
-
- String commandCode = null;
- if (protocol.equals("p206V202404")) {
- // 鑾峰彇鍔熻兘鐮�
- 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);
- return dealWithCommandResult(myParam);
-
- } else if (protocol.equals("p206V1_0_1")) {
- // 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV1_0_1.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_0_1.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);
- } else {
- return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
- }
+ //
+ //// intakeName鎹ntakeId
+ //if(intakeId == null) {
+ // intakeId = commandSv.getIntakeIdByName(intakeName);
+ // if(intakeId == null) {
+ // return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_INTAKE.getMessage());
+ // }
+ //}
+ //
+ ///**
+ // * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
+ // * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
+ // * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
+ // */
+ //if (vcId == null) {
+ // vcId = commandSv.getVcIdByIntakeId(intakeId);
+ // if (vcId == null) {
+ // return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
+ // }
+ //}
+ //
+ //// 铏氭嫙鍗D鎹㈣櫄鎷熷崱瀵硅薄
+ //VoVirtualCard vc = commandSv.getVcById(vcId);
+ //if (vc == null) {
+ // return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
+ //}
+ //
+ //// 铏氭嫙鍗＄姸鎬佷负浣跨敤涓紝涓斾笉鏄己鍒跺紑闃�鏃舵彁绀�
+ //if (vc.getInUse() && !forceOpen) {
+ // return BaseResponseUtils.buildCodeMsg(WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getCode(), WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getMessage());
+ //}
+ //
+ //// 鑾峰彇姘翠环
+ //Double waterPrice = commandSv.getPrice();
+ //if(waterPrice == null) {
+ // return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
+ //}
+ //
+ //// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
+ //JSONObject job_rtu = getRtu(intakeId, null);
+ //if (job_rtu == null) {
+ // 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) {
+ // 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);
+ // return dealWithCommandResult(myParam);
+ //
+ //} 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);
+ //} else {
+ // return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ //}
}
/**
@@ -238,87 +238,93 @@
return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- 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();
- Long comId = idLongGenerator.generate();
-
- // 闃�鎺у櫒鍦板潃鎹㈠彇姘村彛ID鍜岄�氳鍗忚
- JSONObject job_rtu = getRtu(null, rtuAddr);
- if (job_rtu == null) {
- return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_EXIST.getMessage());
+ Map map_result = commandSv.closeWx(valve, null, null);
+ if(map_result.get("success").equals(false)) {
+ return BaseResponseUtils.buildErrorMsg(map_result.get("msg").toString());
}
- Long intakeId = job_rtu.getLong("intakeId");
- String protocol = job_rtu.getString("protocol");
- //String orgTag = job_rtu.getString("orgTag");
- //if(orgTag == null) {
- // return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ return BaseResponseUtils.buildSuccess(map_result.get("content")) ;
+
+ //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();
+ //Long comId = new IDLongGenerator().generate();
+ //
+ //// 闃�鎺у櫒鍦板潃鎹㈠彇姘村彛ID鍜岄�氳鍗忚
+ //JSONObject job_rtu = getRtu(null, rtuAddr);
+ //if (job_rtu == null) {
+ // return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_EXIST.getMessage());
//}
- //comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
- comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
-
- String commandCode = null;
- if (protocol.equals("p206V202404")) {
- // 鑾峰彇鍔熻兘鐮�
- 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);
- } else if (protocol.equals("p206V1_0_1")) {
- // 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV1_0_1.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_0_1.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);
- } else {
- return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
- }
+ //Long intakeId = job_rtu.getLong("intakeId");
+ //String protocol = job_rtu.getString("protocol");
+ ////String orgTag = job_rtu.getString("orgTag");
+ ////if(orgTag == null) {
+ //// return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ ////}
+ ////comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
+ //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);
+ //} 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);
+ //} else {
+ // return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ //}
}
/**
@@ -338,7 +344,7 @@
Long vcId = automaticClose.getVcId();
Integer minutes = automaticClose.getMinutes();
Long operator = automaticClose.getOperator();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
/**
* 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
@@ -387,11 +393,11 @@
}
String commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
return BaseResponseUtils.buildSuccess();
- } else if(protocol.equals("p206V1_0_1")) {
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV1_0_1.cd_99;
+ commandCode = CodeV1.cd_99;
// 鍒涘缓瑙嗗浘
Com99Vo param = new Com99Vo();
@@ -408,9 +414,9 @@
*/
Param myParam = new Param();
myParam.setComId(comId);
- myParam.setComType((byte)2);
+ myParam.setComType((byte)1);
myParam.setCommandCode(commandCode);
- myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
+ myParam.setCommandName(CodeV1.getCodeName(commandCode));
myParam.setIntakeId(intakeId);
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
@@ -441,7 +447,7 @@
Long vcId = automaticClose.getVcId();
Integer waterAmount = automaticClose.getWaterAmount();
Long operator = automaticClose.getOperator();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
/**
* 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
@@ -490,11 +496,11 @@
}
String commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
return BaseResponseUtils.buildSuccess();
- } else if(protocol.equals("p206V1_0_1")) {
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV1_0_1.cd_A0;
+ commandCode = CodeV1.cd_A0;
// 鍒涘缓瑙嗗浘
ComA0Vo param = new ComA0Vo();
@@ -511,9 +517,9 @@
*/
Param myParam = new Param();
myParam.setComId(comId);
- myParam.setComType((byte)2);
+ myParam.setComType((byte)1);
myParam.setCommandCode(commandCode);
- myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
+ myParam.setCommandName(CodeV1.getCodeName(commandCode));
myParam.setIntakeId(intakeId);
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
@@ -540,106 +546,123 @@
return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- Long intakeId = automaticClose.getIntakeId();
- Long vcId = automaticClose.getVcId();
- Date plannedOpenTime = automaticClose.getPlannedOpenTime();
- Integer minutes = automaticClose.getMinutes();
- Long operator = automaticClose.getOperator();
- Long comId = idLongGenerator.generate();
-
- 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 = commandSv.getVcIdByIntakeId(intakeId);
- if(vcId == null) {
- return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
- }
+ Map map_result = commandSv.planedOpenTimedClose(automaticClose, null, null, null,null);
+ if(map_result.get("success").equals(false)) {
+ return BaseResponseUtils.buildErrorMsg(map_result.get("msg").toString());
}
+ return BaseResponseUtils.buildSuccess(map_result.get("content")) ;
- // 铏氭嫙鍗D鎹㈣櫄鎷熷崱瀵硅薄
- VoVirtualCard vc = commandSv.getVcById(vcId);
- if(vc == null) {
- return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
- }
- String vcNum = vc.getVcNum().toString();
- Double moneyRemain = vc.getMoney();
- // 鑾峰彇姘翠环
- Double waterPrice = commandSv.getPrice();
- if(waterPrice == null) {
- return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
- }
-
- // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
- JSONObject job_rtu = getRtu(intakeId, null);
- if(job_rtu == null) {
- return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_EXIST.getMessage());
- }
- String rtuAddr = job_rtu.getString("rtuAddr");
- String protocol = job_rtu.getString("protocol");
- //String orgTag = job_rtu.getString("orgTag");
- //if(orgTag == null) {
- // return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ //Long intakeId = automaticClose.getIntakeId();
+ //Long vcId = automaticClose.getVcId();
+ //Date plannedOpenTime = automaticClose.getPlannedOpenTime();
+ //Integer minutes = automaticClose.getMinutes();
+ //Long operator = automaticClose.getOperator();
+ //Long openingId = automaticClose.getOpeningId();
+ //Long comId = new IDLongGenerator().generate();
+ //
+ //if(openingId != null) {
+ // IrIntakeOperate irIntakeOperate = new IrIntakeOperate();
+ // irIntakeOperate.setOpeningId(openingId);
+ // irIntakeOperate.setCommandId(comId);
+ // System.out.println("------------------------------------------------comId: " + comId);
+ // irIntakeOperate.setIntakeId(intakeId);
+ // Long id = commandSv.addIntakeOperate(irIntakeOperate);
+ // if(id == null) {
+ // return BaseResponseUtils.buildErrorMsg("娣诲姞鍙栨按鍙ｆ搷浣滆褰曞け璐�");
+ // }
//}
- //comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
- comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
-
- // 鐢熸垚璁㈠崟鍙�
- String orderNo = generateOrderNo();
- if(orderNo == null) {
- return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_ORDER_NUMBER.getMessage());
- }
-
- String commandCode = null;
- if(protocol.equals("p206V202404")) {
- return BaseResponseUtils.buildSuccess();
- } else if(protocol.equals("p206V1_0_1")) {
- // 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV1_0_1.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)2);
- myParam.setCommandCode(commandCode);
- myParam.setCommandName(CodeV1_0_1.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);
- } else {
- return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
- }
+ //
+ //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 = commandSv.getVcIdByIntakeId(intakeId);
+ // if(vcId == null) {
+ // return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
+ // }
+ //}
+ //
+ //// 铏氭嫙鍗D鎹㈣櫄鎷熷崱瀵硅薄
+ //VoVirtualCard vc = commandSv.getVcById(vcId);
+ //if(vc == null) {
+ // return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
+ //}
+ //String vcNum = vc.getVcNum().toString();
+ //Double moneyRemain = vc.getMoney();
+ //
+ //// 鑾峰彇姘翠环
+ //Double waterPrice = commandSv.getPrice();
+ //if(waterPrice == null) {
+ // return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
+ //}
+ //
+ //// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
+ //JSONObject job_rtu = getRtu(intakeId, null);
+ //if(job_rtu == null) {
+ // 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) {
+ // return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_ORDER_NUMBER.getMessage());
+ //}
+ //
+ //String commandCode = null;
+ //if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
+ // return BaseResponseUtils.buildSuccess();
+ //} 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.setOpeningId(openingId);
+ // return dealWithCommandResult(myParam);
+ //} else {
+ // return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ //}
}
/**
@@ -660,7 +683,7 @@
Date plannedOpenTime = automaticClose.getPlannedOpenTime();
Integer waterAmount = automaticClose.getWaterAmount();
Long operator = automaticClose.getOperator();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
Integer year = Integer.parseInt(String.format("%tY", plannedOpenTime));
Integer month = Integer.parseInt(String.format("%tm", plannedOpenTime));
@@ -715,11 +738,11 @@
}
String commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
return BaseResponseUtils.buildSuccess();
- } else if(protocol.equals("p206V1_0_1")) {
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV1_0_1.cd_A2;
+ commandCode = CodeV1.cd_A2;
// 鍒涘缓瑙嗗浘
ComA2Vo param = new ComA2Vo();
@@ -741,9 +764,9 @@
*/
Param myParam = new Param();
myParam.setComId(comId);
- myParam.setComType((byte)2);
+ myParam.setComType((byte)1);
myParam.setCommandCode(commandCode);
- myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
+ myParam.setCommandName(CodeV1.getCodeName(commandCode));
myParam.setIntakeId(intakeId);
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
@@ -809,7 +832,7 @@
Double chargeWater = po.getChargeWater();
Long operator = po.getOperator();
String flowNo = RandomStringUtils.randomNumeric(12); // 鐢熸垚12浣嶉殢鏈烘暟
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -828,7 +851,7 @@
String icCardNo = seClientCard.getCardnum();
String commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV202404.cd_15;
@@ -858,7 +881,7 @@
myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
- } else if(protocol.equals("p206V1_0_1")) {
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
return BaseResponseUtils.buildErrorMsg(WechatResultCode.THE_DEVICE_DOES_NOT_HAVE_THIS_FUNCTION.getMessage());
} else {
return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
--
Gitblit v1.8.0