From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceTransaction.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceTransaction.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceTransaction.java
index fd87312..411999a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceTransaction.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceTransaction.java
@@ -10,6 +10,12 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+/**
+ * 澶氭暟鎹簮鐨勪簨鍔＄被锛屼簨鍔″璞＄敱浜嬪姟宸ュ巶鍒涘缓锛屽畬鎴愭暟鎹簱浜嬪姟鎿嶄綔銆�
+ * 浜嬪姟瀵硅薄鍖呰９鐫�锛�
+ * 鏁版嵁搴撹繛鎺ャ�佷簨鍔℃彁浜ゃ�佷簨鍔″洖婊氱瓑瀵硅薄鍙婃搷浣�
+ * 鍦ㄤ簨鍔″璞′腑鍏蜂綋鍐冲畾閲囩敤鐨勫叿浣撴暟鎹簮
+ */
public class MultiDataSourceTransaction implements Transaction {
private final DataSource multidataSource;
@@ -19,9 +25,10 @@
private boolean autoCommit;
- public MultiDataSourceTransaction(DataSource dataSource) {
+ public MultiDataSourceTransaction(DataSource dataSource, boolean autoCommit) {
//dataSource鏄疍ynamicDataSource绫荤殑瀹炰緥
this.multidataSource = dataSource;
+ this.autoCommit = autoCommit;
curConMap = new ConcurrentHashMap<>();
}
@@ -38,7 +45,7 @@
if (!this.curConMap.containsKey(nowDsName)) {
try {
Connection conn = this.multidataSource.getConnection();
- autoCommit=false;
+ this.autoCommit = false;
conn.setAutoCommit(false);
this.curConMap.put(nowDsName, conn);
} catch (SQLException ex) {
--
Gitblit v1.8.0