From 1a2b07f01ba4616fd9e894dddf474b56d020158c Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期一, 07 四月 2025 15:18:51 +0800 Subject: [PATCH] 整理版本 --- pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java | 896 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 896 insertions(+), 0 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 new file mode 100644 index 0000000..bfe5672 --- /dev/null +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java @@ -0,0 +1,896 @@ +package com.dy.pipIrrWechat.command; + +import com.alibaba.fastjson2.JSONObject; +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.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; +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.daoSe.SeVirtualCardMapper; +import com.dy.pipIrrGlobal.pojoSe.SeClientCard; +import com.dy.pipIrrGlobal.voRm.VoIrrigaterProfile; +import com.dy.pipIrrGlobal.voRm.VoUnclosedValve; +import com.dy.pipIrrGlobal.voSe.VoVirtualCard; +import com.dy.pipIrrWechat.command.dto.*; +import com.dy.pipIrrWechat.result.WechatResultCode; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.RandomStringUtils; +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 java.util.*; + +/** + * @author ZhuBaoMin + * @date 2024-05-30 16:11 + * @LastEditTime 2024-05-30 16:11 + * @Description + */ + +@Slf4j +@Tag(name = "灏忕▼搴忛榾鎺у櫒鎺у埗", description = "灏忕▼搴忛榾鎺у櫒鎺у埗") +@RestController +@RequestMapping(path = "valve") +public class ValveCtrl extends ComSupport { + private final CommandSv commandSv; + private final SeVirtualCardMapper seVirtualCardMapper; + + @Value("${mw.rtuCallbackUrl_wx}") + private String rtuCallbackUrl_wx; + + /** + * pro_mw锛氬睘鎬� + * tag浠庢帶鍒跺櫒涓幏鍙� + * key_mw锛歶rl鐨刱ey + */ + private Environment env = null; + private String pro_mw = "mw"; + private String key_mw = "comSendUrl"; + + @Autowired + public ValveCtrl(CommandSv commandSv, SeVirtualCardMapper seVirtualCardMapper, Environment env) { + this.commandSv = commandSv; + this.seVirtualCardMapper = seVirtualCardMapper; + this.env = env; + } + + /** + * 灏忕▼搴忚繙绋嬪紑闃� + * @param valve + * @param bindingResult + * @return + */ + @PostMapping(path = "open_wx", consumes = MediaType.APPLICATION_JSON_VALUE) + @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 = new IDLongGenerator().generate(); + + if(intakeId == null && intakeName == null) { + return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_INTAKE.getMessage()); + } + + // intakeName鎹ntakeId + if(intakeId == null) { + intakeId = commandSv.getIntakeIdByName(intakeName); + if(intakeId == null) { + return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_INTAKE.getMessage()); + } + } + + /** + * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱 + * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱 + * 濡傛灉鍙栨按鍙f病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱 + */ + 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()); + //} + //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(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("绯荤粺鏆備笉鏀寔璇ュ崗璁�"); + } + } + + /** + * 灏忕▼搴忚繙绋嬪叧闃� + * + * @param valve + * @param bindingResult + * @return + */ + @PostMapping(path = "close_wx", consumes = MediaType.APPLICATION_JSON_VALUE) + //@Transactional(rollbackFor = Exception.class) + public BaseResponse<Boolean> close(@RequestBody @Valid ValveClose valve, BindingResult bindingResult) { + if (bindingResult != null && bindingResult.hasErrors()) { + 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 = new IDLongGenerator().generate(); + + // 闃�鎺у櫒鍦板潃鎹㈠彇姘村彛ID鍜岄�氳鍗忚 + JSONObject job_rtu = getRtu(null, rtuAddr); + if (job_rtu == null) { + return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_EXIST.getMessage()); + } + 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("绯荤粺鏆備笉鏀寔璇ュ崗璁�"); + } + } + + /** + * 瀹氭椂鍏抽榾 + * @param automaticClose + * @param bindingResult + * @return + */ + @PostMapping(path = "timed_close", consumes = MediaType.APPLICATION_JSON_VALUE) + @Transactional(rollbackFor = Exception.class) + public BaseResponse<Boolean> timedClose(@RequestBody @Valid AutomaticClose automaticClose, BindingResult bindingResult) { + if(bindingResult != null && bindingResult.hasErrors()){ + return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); + } + + Long intakeId = automaticClose.getIntakeId(); + Long vcId = automaticClose.getVcId(); + Integer minutes = automaticClose.getMinutes(); + Long operator = automaticClose.getOperator(); + Long comId = new IDLongGenerator().generate(); + + /** + * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱 + * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱 + * 濡傛灉鍙栨按鍙f病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱 + */ + 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"); + //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 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_99; + + // 鍒涘缓瑙嗗浘 + Com99Vo param = new Com99Vo(); + param.setIcCardNo(vcNum); + param.setMoneyRemain(moneyRemain); + param.setWaterPrice(waterPrice); + param.setMinutes(minutes); + 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); + return dealWithCommandResult(myParam); + } else { + return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�"); + } + } + + /** + * 瀹氶噺鍏抽榾 + * @param automaticClose + * @param bindingResult + * @return + */ + @PostMapping(path = "quantify_close", consumes = MediaType.APPLICATION_JSON_VALUE) + @Transactional(rollbackFor = Exception.class) + public BaseResponse<Boolean> quantifyClose(@RequestBody @Valid AutomaticClose automaticClose, BindingResult bindingResult) { + if(bindingResult != null && bindingResult.hasErrors()){ + return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); + } + + Long intakeId = automaticClose.getIntakeId(); + Long vcId = automaticClose.getVcId(); + Integer waterAmount = automaticClose.getWaterAmount(); + Long operator = automaticClose.getOperator(); + Long comId = new IDLongGenerator().generate(); + + /** + * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱 + * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱 + * 濡傛灉鍙栨按鍙f病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱 + */ + 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"); + //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 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_A0; + + // 鍒涘缓瑙嗗浘 + ComA0Vo param = new ComA0Vo(); + param.setIcCardNo(vcNum); + param.setMoneyRemain(moneyRemain); + param.setWaterPrice(waterPrice); + param.setWaterAmount(waterAmount); + 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); + return dealWithCommandResult(myParam); + } else { + return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�"); + } + } + + /** + * 璁″垝寮�闃�瀹氭椂鍏抽榾 + * @param automaticClose + * @param bindingResult + * @return + */ + @PostMapping(path = "planed_open_timed_close", consumes = MediaType.APPLICATION_JSON_VALUE) + @Transactional(rollbackFor = Exception.class) + public BaseResponse<Boolean> planedOpenTimedClose(@RequestBody @Valid AutomaticClose automaticClose, BindingResult bindingResult) { + if(bindingResult != null && bindingResult.hasErrors()){ + return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); + } + + 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")) ; + + + //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("娣诲姞鍙栨按鍙f搷浣滆褰曞け璐�"); + // } + //} + // + //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鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱 + // * 濡傛灉鍙栨按鍙f病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱 + // */ + //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("绯荤粺鏆備笉鏀寔璇ュ崗璁�"); + //} + } + + /** + * 璁″垝寮�闃�瀹氶噺鍏抽榾 + * @param automaticClose + * @param bindingResult + * @return + */ + @PostMapping(path = "planed_open_quantify_close", consumes = MediaType.APPLICATION_JSON_VALUE) + @Transactional(rollbackFor = Exception.class) + public BaseResponse<Boolean> planedOpenQuantifyClose(@RequestBody @Valid AutomaticClose automaticClose, BindingResult bindingResult) { + if(bindingResult != null && bindingResult.hasErrors()){ + return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); + } + + Long intakeId = automaticClose.getIntakeId(); + Long vcId = automaticClose.getVcId(); + Date plannedOpenTime = automaticClose.getPlannedOpenTime(); + Integer waterAmount = automaticClose.getWaterAmount(); + Long operator = automaticClose.getOperator(); + Long comId = new 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鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱 + * 濡傛灉鍙栨按鍙f病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱 + */ + 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"); + //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 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_A2; + + // 鍒涘缓瑙嗗浘 + ComA2Vo param = new ComA2Vo(); + param.setIcCardNo(vcNum); + param.setMoneyRemain(moneyRemain); + param.setWaterPrice(waterPrice); + param.setWaterAmount(waterAmount); + 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); + return dealWithCommandResult(myParam); + } else { + return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�"); + } + } + + /** + * 鏍规嵁鎿嶄綔鍛業D鑾峰彇鏈叧闃�璁板綍 + * + * @param operator + * @return + */ + @GetMapping(path = "/get") + public BaseResponse<List<VoUnclosedValve>> getUnclosedValves(@RequestParam Long operator) { + try { + List<VoUnclosedValve> res = commandSv.getUnclosedValves(operator); + return BaseResponseUtils.buildSuccess(res); + } catch (Exception e) { + log.error("鑾峰彇鏈叧闃�璁板綍寮傚父", e); + return BaseResponseUtils.buildException(e.getMessage()); + } + } + + /** + * 寮哄埗闅愯棌鏈叧闃�璁板綍锛氫负鎸囧畾锛堥榾鎺у櫒鍦板潃銆佹按鍗$紪鍙枫�佹棤鍏抽榾璁板綍锛夊紑鍏抽榾鏈�鏂拌褰曟坊鍔犲叧闃�鏃堕棿锛屼娇涔嬩笉鍦ㄦ湭鍏抽榾璁板綍涓樉绀� + * @param po + * @param bindingResult + * @return + */ + @PostMapping(path = "deleteUnclosed", consumes = MediaType.APPLICATION_JSON_VALUE) + public BaseResponse<Boolean> deleteUnclosed(@RequestBody @Valid deleteUnclosedParam po, BindingResult bindingResult) { + if(bindingResult != null && bindingResult.hasErrors()){ + return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); + } + + commandSv.addClostTime(po.getRtuAddr(), po.getVcNum()); + return BaseResponseUtils.buildSuccess(); + } + + /** + * 灏忕▼搴忚繙绋嬪厖鍊� + * @param po + * @param bindingResult + * @return + */ + @PostMapping(path = "recharge", consumes = MediaType.APPLICATION_JSON_VALUE) + @Transactional(rollbackFor = Exception.class) + public BaseResponse<Boolean> recharge(@RequestBody @Valid Recharge po, BindingResult bindingResult) { + if(bindingResult != null && bindingResult.hasErrors()){ + return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); + } + + Long intakeId = po.getIntakeId(); + Long cardId = po.getCardId(); + Double chargeMoney = po.getChargeMoney(); + Double chargeWater = po.getChargeWater(); + Long operator = po.getOperator(); + String flowNo = RandomStringUtils.randomNumeric(12); // 鐢熸垚12浣嶉殢鏈烘暟 + Long comId = new IDLongGenerator().generate(); + + // 鍙栨按鍙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"); + + // 姘村崱ID鎹㈡按鍗″湴鍧�鍙婃按鍗$紪鍙� + SeClientCard seClientCard = commandSv.geClientCardByCardId(cardId); + if(seClientCard == null) { + return BaseResponseUtils.buildErrorMsg(WechatResultCode.CLIENT_CARD_NOT_EXIST.getMessage()); + } + String icCardAddr = seClientCard.getCardaddr(); + String icCardNo = seClientCard.getCardnum(); + + String commandCode = null; + if(protocol.equals(ProtocolConstantV206V202404.protocolName)) { + // 鑾峰彇鍔熻兘鐮� + commandCode = CodeV202404.cd_15; + + // 鍒涘缓瑙嗗浘 + ComCd15Vo param = new ComCd15Vo(); + param.controllerType = controllerType; + param.projectNo = projectNo; + param.icCardAddr = icCardAddr; + param.icCardNo = icCardNo; + param.chargeMoney = chargeMoney; + param.chargeWater = chargeWater; + param.flowNo = flowNo; + + /** + * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋� + * 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_wx); + myParam.setOperator(operator); + return dealWithCommandResult(myParam); + } 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("绯荤粺鏆備笉鏀寔璇ュ崗璁�"); + } + } + + /** + * 鏍规嵁閰嶇疆绫诲瀷鑾峰彇閰嶇疆鍊� + * @param type + * @return + */ + @GetMapping(path = "/irrigate_profile") + public BaseResponse<QueryResultVo<List<VoIrrigaterProfile>>> getIrrPro(Integer type){ + try { + return BaseResponseUtils.buildSuccess(commandSv.getIrrPro(type)); + } catch (Exception e) { + return BaseResponseUtils.buildException(e.getMessage()) ; + } + } +} -- Gitblit v1.8.0