From 3cf13ad3251d86fa4025e4a248f600c6b56c7e8f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 12 十月 2024 17:11:45 +0800
Subject: [PATCH] 江海协议相关完善代码
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 68 insertions(+), 13 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 64acd6b..c88ecf0 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,6 +1,7 @@
package com.dy.pipIrrWechat.command;
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.p206V202404.CodeV202404;
@@ -51,7 +52,6 @@
@Tag(name = "灏忕▼搴忛榾鎺у櫒鎺у埗", description = "灏忕▼搴忛榾鎺у櫒鎺у埗")
@RestController
@RequestMapping(path = "valve")
-//@RequiredArgsConstructor
public class ValveCtrl extends ComSupport {
private final CommandSv commandSv;
private final SeVirtualCardMapper seVirtualCardMapper;
@@ -134,6 +134,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -142,11 +145,18 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
- comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
+ //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("p206V202404")) {
@@ -245,8 +255,12 @@
}
Long intakeId = job_rtu.getLong("intakeId");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
- comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
+ //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("p206V202404")) {
@@ -351,6 +365,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -359,11 +376,18 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
- comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
+ //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("p206V202404")) {
@@ -444,6 +468,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -452,11 +479,19 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
- comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
+ //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("p206V202404")) {
return BaseResponseUtils.buildSuccess();
@@ -543,6 +578,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -551,11 +589,18 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
- comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
+ //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("p206V202404")) {
@@ -648,6 +693,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -656,11 +704,18 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
- comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
+ //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("p206V202404")) {
--
Gitblit v1.8.0