From 3dae16069f7f6572750f028a48ca291f449bbb44 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 12 七月 2024 14:37:40 +0800
Subject: [PATCH] 2024-07-12 朱宝民 开卡传入协议，补卡返回协议
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 7a7f9c4..a353cf7 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
@@ -23,10 +23,10 @@
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.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
@@ -47,14 +47,24 @@
@Tag(name = "灏忕▼搴忛榾鎺у櫒鎺у埗", description = "灏忕▼搴忛榾鎺у櫒鎺у埗")
@RestController
@RequestMapping(path = "valve")
-@RequiredArgsConstructor
+//@RequiredArgsConstructor
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;
+ //@Value("${mw.rtuCallbackUrl_wx}")
+ private String rtuCallbackUrl_wx = null;
+
+ private Environment env = null;
+
+ @Autowired
+ public ValveCtrl(CommandSv commandSv, SeVirtualCardMapper seVirtualCardMapper, IDLongGenerator idLongGenerator, Environment env) {
+ this.commandSv = commandSv;
+ this.seVirtualCardMapper = seVirtualCardMapper;
+ this.idLongGenerator = idLongGenerator;
+ this.env = env;
+ }
/**
* 灏忕▼搴忚繙绋嬪紑闃�
@@ -68,6 +78,10 @@
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
+
+ String pro_mw = "mw";
+ String key_mw = "comSendUrl";
+ rtuCallbackUrl_wx = env.getProperty(pro_mw + "." + key_mw);
Long intakeId = valve.getIntakeId();
String intakeName = valve.getIntakeName();
@@ -113,7 +127,7 @@
// 铏氭嫙鍗＄姸鎬佷负浣跨敤涓紝涓斾笉鏄己鍒跺紑闃�鏃舵彁绀�
if (vc.getInUse() == 1 && !forceOpen) {
- return BaseResponseUtils.buildErrorMsg(WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getMessage());
+ return BaseResponseUtils.buildCodeMsg(WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getCode(), WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getMessage());
}
// 鑾峰彇姘翠环
--
Gitblit v1.8.0