From f388738abe887990516f3ab1b7e97f828613a437 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 23 九月 2024 10:18:40 +0800
Subject: [PATCH] 2024-09-23 朱宝民 优化获取图片验证码接口
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java | 67 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 30 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 74589e5..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;
@@ -144,11 +145,12 @@
}
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);
+ //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();
@@ -253,11 +255,12 @@
}
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);
+ //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")) {
@@ -373,11 +376,12 @@
}
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);
+ //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();
@@ -475,11 +479,12 @@
}
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);
+ //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();
@@ -584,11 +589,12 @@
}
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);
+ //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();
@@ -698,11 +704,12 @@
}
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);
+ //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();
--
Gitblit v1.8.0