From cb46d99ac8c302334e8c39600de0d9a4ffbf5533 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 十月 2024 09:39:48 +0800
Subject: [PATCH] 1、删除global模块中Contant中的一些无用代码； 2、删除global模块中一些无用的备份； 3、一些有继承关系并注解有@Data的类中增加注解@EqualsAndHashCode(callSuper=false)，防止编译时警告
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java
index e4b0ec0..55b2348 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.aop.SsoAop;
+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;
@@ -98,7 +99,8 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
+ //String orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鑾峰彇鍔熻兘鐮�
@@ -178,7 +180,8 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
+ //String orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鑾峰彇鍔熻兘鐮�
@@ -238,7 +241,8 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
+ //String orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鑾峰彇鍔熻兘鐮�
@@ -299,7 +303,8 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
+ //String orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鑾峰彇鍔熻兘鐮�
@@ -359,7 +364,8 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
+ //String orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鑾峰彇鍔熻兘鐮�
--
Gitblit v1.8.0