From ebcdfe98837582be807649f7a1a3f6f8ce776736 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 六月 2024 21:40:35 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java | 494 +++++++++++++++++++++---------------------------------
1 files changed, 190 insertions(+), 304 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 c923176..f5825b3 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
@@ -1,42 +1,39 @@
package com.dy.pipIrrWechat.command;
-import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
-import com.dy.common.aop.SsoAop;
-import com.dy.common.mw.protocol.Command;
-import com.dy.common.mw.protocol.Data;
import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com97Vo;
import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com98Vo;
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
+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.pipIrrGlobal.command.ComSupport;
+import com.dy.pipIrrGlobal.command.dto.Param;
import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;
-import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
-import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard;
+import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
import com.dy.pipIrrGlobal.voRm.VoUnclosedValve;
import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
+import com.dy.pipIrrWechat.command.dto.Recharge;
import com.dy.pipIrrWechat.command.dto.ValveClose;
import com.dy.pipIrrWechat.command.dto.ValveOpen;
-import com.dy.pipIrrWechat.command.enums.LastOperateENUM;
import com.dy.pipIrrWechat.result.WechatResultCode;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.Optional;
/**
* @author ZhuBaoMin
@@ -48,13 +45,13 @@
@Slf4j
@Tag(name = "灏忕▼搴忛榾鎺у櫒鎺у埗", description = "灏忕▼搴忛榾鎺у櫒鎺у埗")
@RestController
-@RequestMapping(path="valve")
+@RequestMapping(path = "valve")
@RequiredArgsConstructor
public class ValveCtrl extends ComSupport {
private final CommandSv commandSv;
private final SeVirtualCardMapper seVirtualCardMapper;
private final IDLongGenerator idLongGenerator;
- private String rtuResultSendWebUrl = "http://127.0.0.1:8087/wx/comRes/receive" ;
+ private String rtuResultSendWebUrl = "http://127.0.0.1:8087/wx/comRes/receive";
/**
* 灏忕▼搴忚繙绋嬪紑闃�
@@ -64,11 +61,9 @@
*/
@PostMapping(path = "open_wx", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
- @SsoAop()
public BaseResponse<Boolean> open(@RequestBody @Valid ValveOpen valve, BindingResult bindingResult) {
- DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyMMddHHmmss");
- if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
Long intakeId = valve.getIntakeId();
@@ -81,25 +76,25 @@
* 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
* 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
*/
- if(vcId == null) {
+ if (vcId == null) {
vcId = commandSv.getVcIdByIntakeId(intakeId);
- if(vcId == null) {
- return BaseResponseUtils.buildFail(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
+ if (vcId == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
}
}
// 鑾峰彇绯荤粺鍙傛暟
- if(!setuped) {
+ if (!setuped) {
setUp();
}
// 铏氭嫙鍗D鎹㈣櫄鎷熷崱瀵硅薄
VoVirtualCard vc = commandSv.getVcById(vcId);
- if(vc == null) {
- return BaseResponseUtils.buildFail(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
+ if (vc == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
}
- if(vc.getInUse() == 1) {
- return BaseResponseUtils.buildFail(WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getMessage());
+ if (vc.getInUse() == 1) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getMessage());
}
// 鑾峰彇姘翠环
@@ -107,8 +102,8 @@
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
- if(job_rtu == null) {
- return BaseResponseUtils.buildError(WechatResultCode.RTU_NOT_EXIST.getMessage());
+ if (job_rtu == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_EXIST.getMessage());
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
@@ -117,7 +112,7 @@
String orderNo = generateOrderNo();
String commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if (protocol.equals("p206V202404")) {
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV202404.cd_A2;
@@ -132,188 +127,95 @@
param.elePrice = 0.0;
param.orderNo = orderNo;
- // 鏋勯�犲懡浠�
- Command com = command(comId, commandCode, rtuAddr, protocol, rtuResultSendWebUrl, param);
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 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(rtuResultSendWebUrl);
+ myParam.setOperator(operator);
+ return dealWithCommandResult(myParam);
- // 鍙戦�佸懡浠�
- JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com));
- if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) {
- //if(1 > 0) {
- // 璇锋眰鎴愬姛
-
- // 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
- String commandName = CodeV202404.getCodeName(commandCode);
- RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
- commandSv.insert(rmCommandHistory);
-
- // 澶勭悊鍥炶皟
- BaseResponse response_CallBack = dealWithCallBack(comId);
-
- // 鍥炶皟澶辫触
- if(!response_CallBack.getCode().equals("0001")) {
- return BaseResponseUtils.buildFail(response_CallBack.getMsg());
- //return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
- }
-
- // 鍥炶皟鎴愬姛锛屽啀鍒ゆ柇鎵ц鏄惁鎴愬姛
- JSONObject job_content = (JSONObject)JSON.toJSON(response_CallBack.getContent());
- System.out.println(job_content);
- JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData");
- System.out.println(job_subData);
- Boolean dealResult = job_subData.getBoolean("success");
- if(!dealResult) {
- return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
- }
-
- /**
- * 鎵ц鎴愬姛
- * 鏇存敼铏氭嫙鍗＄姸鎬侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
- */
- //SeVirtualCard virtualCard = new SeVirtualCard();
- //virtualCard.setId(vcId);
- //virtualCard.setInUse((byte) 1);
- //virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
- //virtualCard.setLastOperateTime(new Date());
- //seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
-
- // 鍥炶皟杩斿洖鐨勫唴瀹�
- Data myData = (Data)response_CallBack.getContent();
- return BaseResponseUtils.buildSuccess(myData) ;
- } else {
- // 璇锋眰澶辫触
- JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
- return BaseResponseUtils.buildFail(job_param.getString("message"));
- }
- } else if(protocol.equals("p206V1_0_1")) {
+ } else if (protocol.equals("p206V1_0_1")) {
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV1_0_1.cd_97;
// 鍒涘缓瑙嗗浘
- Com97Vo param = new Com97Vo() ;
+ Com97Vo param = new Com97Vo();
param.icCardNo = vc.getVcNum();
param.moneyRemain = vc.getMoney();
param.waterPrice = waterPrice;
param.orderNo = orderNo;
- // 鏋勯�犲懡浠�
- Command com = command(comId, commandCode, rtuAddr, protocol, rtuResultSendWebUrl, param);
-
- // 鍙戦�佸懡浠�
- JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com));
- if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) {
- //if(1 > 0) {
- // 璇锋眰鎴愬姛
-
- // 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
- String commandName = CodeV1_0_1.getCodeName(commandCode);
- RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
- commandSv.insert(rmCommandHistory);
-
- // 澶勭悊鍥炶皟
- BaseResponse response_CallBack = dealWithCallBack(comId);
-
- //鍥炶皟寮傚父
- if(!response_CallBack.getCode().equals("0001")) {
- // 鍛戒护鏃ュ織鎵ц缁撴灉鏀逛负澶辫触
- rmCommandHistory = new RmCommandHistory();
- rmCommandHistory.setId(comId);
- rmCommandHistory.setResult((byte)0);
- commandSv.update(rmCommandHistory);
- return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
- }
-
- // 鍥炶皟瓒呮椂
- if(response_CallBack.getContent().toString().equals(WechatResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage())) {
- /**
- * 鍥炶皟瓒呮椂锛屾殏鏃惰涓烘墽琛屽け璐�
- * 鍛戒护缃负澶辫触
- * 铏氭嫙鍗′緷鏃т繚鎸佷娇鐢ㄤ腑鐨勭姸鎬�
- */
-
- rmCommandHistory = new RmCommandHistory();
- rmCommandHistory.setId(comId);
- rmCommandHistory.setResult((byte)0);
- commandSv.update(rmCommandHistory);
-
- //SeVirtualCard virtualCard = new SeVirtualCard();
- //virtualCard.setId(vcId);
- //virtualCard.setInUse((byte) 1);
- //virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
- //virtualCard.setLastOperateTime(new Date());
- //seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
- return BaseResponseUtils.buildFail(WechatResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
- }
-
- // 鍥炶皟鎴愬姛锛屽啀鍒ゆ柇鎵ц鏄惁鎴愬姛
- JSONObject job_content = (JSONObject)JSON.toJSON(response_CallBack.getContent());
- System.out.println(job_content);
- JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData");
- System.out.println(job_subData);
- Boolean dealResult = job_subData.getBoolean("success");
- if(!dealResult) {
- return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
- }
-
- /**
- * 鎵ц鎴愬姛
- * 鏇存敼铏氭嫙鍗＄姸鎬侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
- */
- SeVirtualCard virtualCard = new SeVirtualCard();
- virtualCard.setId(vcId);
- virtualCard.setInUse((byte) 1);
- virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
- virtualCard.setLastOperateTime(new Date());
- seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
-
- // 鍥炶皟杩斿洖鐨勫唴瀹�
- Data myData = (Data)response_CallBack.getContent();
- return BaseResponseUtils.buildSuccess(myData) ;
- } else {
- // 璇锋眰澶辫触
- JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
- return BaseResponseUtils.buildFail(job_param.getString("message"));
- }
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 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(rtuResultSendWebUrl);
+ myParam.setOperator(operator);
+ return dealWithCommandResult(myParam);
} else {
- return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
}
}
/**
* 灏忕▼搴忚繙绋嬪叧闃�
+ *
* @param valve
* @param bindingResult
* @return
*/
@PostMapping(path = "close_wx", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
- @SsoAop()
public BaseResponse<Boolean> close(@RequestBody @Valid ValveClose valve, BindingResult bindingResult) {
- DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyMMddHHmmss");
- if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ 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 = idLongGenerator.generate();
// 鑾峰彇绯荤粺鍙傛暟
- if(!setuped) {
+ if (!setuped) {
setUp();
}
// 闃�鎺у櫒鍦板潃鎹㈠彇姘村彛ID鍜岄�氳鍗忚
JSONObject job_rtu = getRtu(null, rtuAddr);
- if(job_rtu == null) {
- return BaseResponseUtils.buildError(WechatResultCode.RTU_NOT_EXIST.getMessage());
+ 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 commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if (protocol.equals("p206V202404")) {
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV202404.cd_A3;
@@ -324,166 +226,150 @@
param.icCardNo = vcNum;
param.orderNo = orderNo;
- // 鏋勯�犲懡浠�
- Command com = command(comId, commandCode, rtuAddr, protocol, rtuResultSendWebUrl, param);
-
- // 鍙戦�佸懡浠�
- JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com));
- if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) {
- // 璇锋眰鎴愬姛
-
- // 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
- String commandName = CodeV202404.getCodeName(commandCode);
- RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
- commandSv.insert(rmCommandHistory);
-
- // 澶勭悊鍥炶皟
- BaseResponse response_CallBack = dealWithCallBack(comId);
-
- // 鍥炶皟澶辫触
- if(!response_CallBack.getCode().equals("0001")) {
- return BaseResponseUtils.buildFail(response_CallBack.getMsg());
- //return BaseResponseUtils.buildError(WechatResultCode.GET_RESULT_ERROR.getMessage());
- }
-
- // 鍥炶皟鎴愬姛锛屽啀鍒ゆ柇鎵ц鏄惁鎴愬姛
- JSONObject job_content = (JSONObject)JSON.toJSON(response_CallBack.getContent());
- System.out.println(job_content);
- JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData");
- System.out.println(job_subData);
- Boolean dealResult = job_subData.getBoolean("success");
- if(!dealResult) {
- return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
- }
-
- /**
- * 鎵ц鎴愬姛
- * 鏇存敼铏氭嫙鍗＄姸鎬侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
- */
- //Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum);
- //SeVirtualCard virtualCard = new SeVirtualCard();
- //virtualCard.setId(vcId);
- //virtualCard.setInUse((byte) 0);
- //virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
- //virtualCard.setLastOperateTime(new Date());
- //seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
-
- // 鍥炶皟杩斿洖鐨勫唴瀹�
- Data myData = (Data)response_CallBack.getContent();
- return BaseResponseUtils.buildSuccess(myData) ;
- } else {
- // 璇锋眰澶辫触
- JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
- return BaseResponseUtils.buildFail(job_param.getString("message"));
- }
- } else if(protocol.equals("p206V1_0_1")) {
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 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(rtuResultSendWebUrl);
+ myParam.setOperator(operator);
+ return dealWithCommandResult(myParam);
+ } else if (protocol.equals("p206V1_0_1")) {
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV1_0_1.cd_98;
// 鍒涘缓瑙嗗浘
- Com98Vo param = new Com98Vo() ;
+ Com98Vo param = new Com98Vo();
param.icCardNo = vcNum;
param.orderNo = orderNo;
- // 鏋勯�犲懡浠�
- Command com = command(comId, commandCode, rtuAddr, protocol, rtuResultSendWebUrl, param);
-
- // 鍙戦�佸懡浠�
- JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com));
- if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) {
- //if(1 > 0) {
- // 璇锋眰鎴愬姛
-
- // 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
- String commandName = CodeV1_0_1.getCodeName(commandCode);
- RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
- commandSv.insert(rmCommandHistory);
-
- // 澶勭悊鍥炶皟
- BaseResponse response_CallBack = dealWithCallBack(comId);
-
- // 鍥炶皟寮傚父
- if(!response_CallBack.getCode().equals("0001")) {
- // 鍛戒护鏃ュ織鎵ц缁撴灉鏀逛负澶辫触
- rmCommandHistory = new RmCommandHistory();
- rmCommandHistory.setId(comId);
- rmCommandHistory.setResult((byte)0);
- commandSv.update(rmCommandHistory);
- return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
- }
-
- // 鍥炶皟瓒呮椂
- if(response_CallBack.getContent().toString().equals(WechatResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage())) {
- /**
- * 鍥炶皟瓒呮椂锛屾殏鏃惰涓烘墽琛屽け璐�
- * 鍛戒护缃负澶辫触
- * 铏氭嫙鍗′緷鏃т繚鎸佷娇鐢ㄤ腑鐨勭姸鎬�
- */
-
- rmCommandHistory = new RmCommandHistory();
- rmCommandHistory.setId(comId);
- rmCommandHistory.setResult((byte)0);
- commandSv.update(rmCommandHistory);
-
- //Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum);
- //SeVirtualCard virtualCard = new SeVirtualCard();
- //virtualCard.setId(vcId);
- //virtualCard.setInUse((byte) 0);
- //virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
- //virtualCard.setLastOperateTime(new Date());
- //seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
- return BaseResponseUtils.buildFail(WechatResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
- }
-
- // 鍥炶皟鎴愬姛锛屽啀鍒ゆ柇鎵ц鏄惁鎴愬姛
- JSONObject job_content = (JSONObject)JSON.toJSON(response_CallBack.getContent());
- System.out.println(job_content);
- JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData");
- System.out.println(job_subData);
- Boolean dealResult = job_subData.getBoolean("success");
- if(!dealResult) {
- return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
- }
-
- /**
- * 鎵ц鎴愬姛
- * 鏇存敼铏氭嫙鍗＄姸鎬侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
- */
- Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum);
- SeVirtualCard virtualCard = new SeVirtualCard();
- virtualCard.setId(vcId);
- virtualCard.setInUse((byte) 0);
- virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
- virtualCard.setLastOperateTime(new Date());
- seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
-
- // 鍥炶皟杩斿洖鐨勫唴瀹�
- Data myData = (Data)response_CallBack.getContent();
- return BaseResponseUtils.buildSuccess(myData) ;
- } else {
- // 璇锋眰澶辫触
- JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
- return BaseResponseUtils.buildFail(job_param.getString("message"));
- }
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 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(rtuResultSendWebUrl);
+ myParam.setOperator(operator);
+ return dealWithCommandResult(myParam);
} else {
- return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
}
}
/**
* 鏍规嵁鎿嶄綔鍛業D鑾峰彇鏈叧闃�璁板綍
+ *
* @param operator
* @return
*/
@GetMapping(path = "/get")
- @SsoAop()
- public BaseResponse<List<VoUnclosedValve>> getUnclosedValves(@RequestParam Long operator){
+ 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()) ;
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+ /**
+ * 灏忕▼搴忚繙绋嬪厖鍊�
+ * @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 = idLongGenerator.generate();
+
+ // 鑾峰彇绯荤粺鍙傛暟
+ if(!setuped) {
+ setUp();
+ }
+
+ // 鍙栨按鍙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("p206V202404")) {
+ // 鑾峰彇鍔熻兘鐮�
+ 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(rtuResultSendWebUrl);
+ myParam.setOperator(operator);
+ return dealWithCommandResult(myParam);
+ } else if(protocol.equals("p206V1_0_1")) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.THE_DEVICE_DOES_NOT_HAVE_THIS_FUNCTION.getMessage());
+ } else {
+ return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
}
}
}
--
Gitblit v1.8.0