From 5ebea680d776c0647f83a5e4d1038b8708b3f3e7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 14 十二月 2023 11:23:42 +0800
Subject: [PATCH] 1、优化多数据源模块代码； 2、优化通信中间件代码； 3、通信中间件数据库插入数据测试Po、Mapper.java、Mapper.xml
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4Mapper.java | 18
pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test2Mapper.xml | 25 +
pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test4Mapper.xml | 25 +
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/resources/config.xml | 28
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0Mapper.java | 18
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingle.java | 20
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8.java | 44 ++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java | 57 ++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSource.java | 5
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8Mapper.java | 18
pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test6Mapper.xml | 25 +
pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test0Mapper.xml | 25 +
pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test8Mapper.xml | 25 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceTransaction.java | 11
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5.java | 44 ++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1Mapper.java | 18
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2.java | 44 ++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceTransactionFactory.java | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/threadPool/TreadPoolFactory.java | 14
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5Mapper.java | 18
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceConfig.java | 5
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRtu.java | 26 -
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6.java | 44 ++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test3Mapper.xml | 25 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSource.java | 7
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9Mapper.java | 18
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java | 6
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0.java | 45 ++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAspect.java | 4
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9.java | 44 ++
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/RtuSv.java | 164 +++++++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceAspect.java | 1
pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test1Mapper.xml | 25 +
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/PipIrrMwAcceptApplication.java | 4
pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test5Mapper.xml | 25 +
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/Server.java | 7
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2Mapper.java | 18
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3.java | 44 ++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6Mapper.java | 18
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/PipIrrSsoApplication.java | 7
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4.java | 44 ++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1.java | 44 ++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test7Mapper.xml | 25 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7Mapper.java | 18
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceBeanDefinitionRegistrar.java | 5
pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test9Mapper.xml | 25 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3Mapper.java | 18
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7.java | 44 ++
48 files changed, 1,193 insertions(+), 56 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAspect.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAspect.java
index fbfa354..f9792d2 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAspect.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAspect.java
@@ -75,7 +75,9 @@
if(ssoVo.hasPower){
if(!StringUtils.isNullOrEmpty(ssoVo.dataSourceName)){
DataSourceContext.set(ssoVo.dataSourceName);
- return point.proceed();
+ Object obj = point.proceed();
+ DataSourceContext.remove();
+ return obj ;
}else{
//鏃犳暟鎹簮
return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛屾湭寰楀埌褰撳墠鐧诲綍鐢ㄦ埛鎵�灞炴満鏋勬爣绛撅紙鏁版嵁婧愬悕锛�") ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSource.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSource.java
index 9dd28fb..6764618 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSource.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSource.java
@@ -5,7 +5,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-
+/**
+ * 澶氭暟鎹簮搴旂敤涓紝閫氳繃娉ㄨВ纭畾鏌愪釜鏁版嵁婧�
+ * 渚嬪鍦⊿ervices灞傛柟娉曚笂娉ㄨВ锛�
+ * @DataSource("test")
+ * 琛ㄧず搴旂敤鏁版嵁婧恡est
+ */
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface DataSource {
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceAspect.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceAspect.java
index 610dbcf..6af975f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceAspect.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceAspect.java
@@ -14,6 +14,7 @@
import java.lang.reflect.Method;
import java.util.Objects;
+
@Slf4j
@Aspect
@Order(Constant.AspectOrderDataSource)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingle.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingle.java
new file mode 100644
index 0000000..cdcf4df
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingle.java
@@ -0,0 +1,20 @@
+package com.dy.common.multiDataSource;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+/**
+ * 閽堝涓�涓暟鎹簮锛堜腑闂翠欢搴旂敤锛夛紝澶氭暟鎹簮搴旂敤涓疄闄呭彧鐢ㄤ簡涓�涓暟鎹簮
+ * 澶氭暟鎹簮搴旂敤涓紝閫氳繃娉ㄨВ纭畾鏌愪釜鏁版嵁婧愩��
+ * 纭畾鏁版嵁婧愭湁涓ょ鏂规硶锛�
+ * 1銆佹敞瑙ｆ槑纭簡鏁版嵁婧愶細
+ * 渚嬪鍦⊿ervices灞傛柟娉曚笂娉ㄨВ锛� @DataSourceSingle(鈥渢est鈥�), 琛ㄧず搴旂敤鏁版嵁婧恡est
+ * 2銆佹敞瑙ｄ笉鏄庣‘鏁版嵁婧愶細
+ * 渚嬪鍦⊿ervices灞傛柟娉曚笂娉ㄨВ锛� @DataSourceSingle(), 鏈槑纭暟鎹簮锛岄渶瑕佸湪AOP瀹炵幇涓‘瀹氭暟鎹簮
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface DataSourceSingle {
+ String value() default "";
+}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java
new file mode 100644
index 0000000..860bfcc
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java
@@ -0,0 +1,57 @@
+package com.dy.common.multiDataSource;
+
+
+import com.dy.common.contant.Constant;
+import com.dy.common.springUtil.SpringContextUtil;
+import com.mysql.cj.util.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+import java.util.Objects;
+
+@Slf4j
+@Aspect
+@Order(Constant.AspectOrderDataSource)
+@Component
+public class DataSourceSingleAspect {
+
+ @Pointcut("@annotation(com.dy.common.multiDataSource.DataSourceSingle)")
+ public void dataSourceSinglePointCut() {
+ }
+
+ @Around("dataSourceSinglePointCut()")
+ public Object around(ProceedingJoinPoint point) throws Throwable {
+ MethodSignature signature = (MethodSignature) point.getSignature();
+ Method method = signature.getMethod();
+ DataSourceSingle dataSource = method.getAnnotation(DataSourceSingle.class);
+
+ if (Objects.nonNull(dataSource) && !StringUtils.isNullOrEmpty(dataSource.value())) {
+ log.info("鏁版嵁婧愭寚瀹氫负" + dataSource.value());
+ //寮哄埗杞垚鏂规硶涓婇厤缃殑鏁版嵁婧愶紝鏇挎崲鎺塂ataSourceContext涓繚瀛樼殑鏁版嵁婧�
+ DataSourceContext.set(dataSource.value());
+ }else{
+ String datasourceName = SpringContextUtil.getApplicationContext().getEnvironment().getProperty("spring.datasource.names") ;
+ if(!StringUtils.isNullOrEmpty(datasourceName)){
+ log.info("鏍规嵁閰嶇疆鏁版嵁婧愪负" + datasourceName);
+ DataSourceContext.set(datasourceName);
+ }else{
+ log.error("鏁版嵁婧愭湭鎸囧畾");
+ }
+ }
+ try {
+ log.info("鏁版嵁搴撴搷浣滃紑濮�" + dataSource.value());
+ return point.proceed();
+ } finally {
+ // 閿�姣佹暟鎹簮 鍦ㄦ墽琛屾柟娉曚箣鍚�
+ log.info("鏁版嵁婧愭搷浣滃畬姣�" + dataSource.value());
+ DataSourceContext.remove();
+ }
+ }
+}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSource.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSource.java
index b319031..61ecdc1 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSource.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSource.java
@@ -4,6 +4,11 @@
public class MultiDataSource extends AbstractRoutingDataSource {
+ /**
+ * 瀹炵幇澶氭暟鎹簮鎺ュ彛鐨刣etermineCurrentLookupKey鏂规硶
+ * 浠ヤ緵鍏朵粬閮ㄥ垎璋冪敤锛屼互纭畾褰撳墠鎵�杩炴帴鐨勬暟鎹簱鍙婃暟鎹簮銆�
+ * @return
+ */
@Override
protected Object determineCurrentLookupKey() {
return DataSourceContext.get();
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceBeanDefinitionRegistrar.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceBeanDefinitionRegistrar.java
index 28322dc..d19c088 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceBeanDefinitionRegistrar.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceBeanDefinitionRegistrar.java
@@ -19,6 +19,11 @@
import java.util.Properties;
import java.util.Set;
+/**
+ * SpringBoot瀹瑰櫒鍚姩鏃讹紝閽堝鏁版嵁婧愶紝绗竴姝ュ惎鍔ㄦ湰绫伙細
+ * 鏀堕泦澶氭暟鎹簮鐨勯厤缃紝褰㈡垚鍚勬暟鎹簮鐨勫畾涔夛紝
+ * 鎶婃暟鎹簮鐨勫畾涔変綔涓衡�渄ataSource鈥濇敞鍐屽埌Spring瀹瑰櫒涓�
+ */
@Slf4j
public class MultiDataSourceBeanDefinitionRegistrar implements ImportBeanDefinitionRegistrar, EnvironmentAware {
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceConfig.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceConfig.java
index a27c7bc..4e27478 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceConfig.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceConfig.java
@@ -7,6 +7,11 @@
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+/**
+ * SpringBoot瀹瑰櫒鍚姩鏃讹紝閽堝鏁版嵁婧愶紝绗簩姝ュ惎鍔ㄦ湰绫伙細
+ * 鎶婄涓�姝ュ舰鎴愬悇鏁版嵁婧愬畾涔夛紝娉ㄥ叆鏈被瀵硅薄multiDataSource灞炴�т腑锛�
+ * 鏈被鐢熸垚SQL浼氳瘽宸ュ巶瀵硅薄锛屽伐鍘傚璞℃寔鏈変簨鍔″伐鍘傚璞★紝鍜屽悇鏁版嵁婧愶紙鏁版嵁搴擄級琛ㄧ殑瀹氫箟(Mapper.xml)
+ */
@Configuration
public class MultiDataSourceConfig {
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) {
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceTransactionFactory.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceTransactionFactory.java
index d1363eb..e1caea4 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceTransactionFactory.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceTransactionFactory.java
@@ -6,9 +6,14 @@
import javax.sql.DataSource;
+/**
+ * 鍦ㄦ暟鎹簱杩炴帴浼氳瘽鍚姩鍚庯紝鐢辨湰浜嬪姟宸ュ巶浜х敓鍏蜂綋浜嬪姟瀵硅薄锛�
+ * 鐢变簨鍔″璞″畬鎴愭暟鎹簱琛ㄧ殑浜嬪姟鎿嶄綔銆�
+ */
public class MultiDataSourceTransactionFactory extends SpringManagedTransactionFactory {
@Override
public Transaction newTransaction(DataSource multiDataSource, TransactionIsolationLevel level, boolean autoCommit) {
- return new MultiDataSourceTransaction(multiDataSource);
+ Transaction transaction = new MultiDataSourceTransaction(multiDataSource, autoCommit);
+ return transaction ;
}
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/threadPool/TreadPoolFactory.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/threadPool/TreadPoolFactory.java
index 040913d..f7c34ee 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/threadPool/TreadPoolFactory.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/threadPool/TreadPoolFactory.java
@@ -8,9 +8,9 @@
/**
* 鍒濆鍖栫嚎绋嬫睜
- * @param threadPoolName 绾跨▼姹犲拰绾跨▼鍚嶇О
- * @param maxThreadNum 绾跨▼姹犳渶澶х嚎绋嬫暟 锛岃嫢涓�-1锛屼笉鍙楅檺鍒�
- * @param minThreadNum 绾跨▼姹犳渶灏忕嚎绋嬫暟锛屾垨鍒濆绾跨▼鏁�
+ * @param poolName 绾跨▼姹犲拰绾跨▼鍚嶇О
+ * @param maxNum 绾跨▼姹犳渶澶х嚎绋嬫暟 锛岃嫢涓�-1锛屼笉鍙楅檺鍒�
+ * @param minNum 绾跨▼姹犳渶灏忕嚎绋嬫暟锛屾垨鍒濆绾跨▼鏁�
* @param freeTimeout 绌洪棽绾跨▼瓒呮椂鏃堕暱(绉�)
* @param busyTimeout 蹇欑绾跨▼瓒呮椂鏃堕暱(绉�)锛岃嫢涓�-1锛屼笉鍙楅檺鍒�
* @return 绾跨▼姹犲疄渚�
@@ -30,9 +30,9 @@
/**
* 鍒濆鍖栫嚎绋嬫睜
- * @param threadPoolName 绾跨▼姹犲拰绾跨▼鍚嶇О
- * @param maxThreadNum 绾跨▼姹犳渶澶х嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒�
- * @param minThreadNum 绾跨▼姹犳渶灏忕嚎绋嬫暟锛屾垨鍒濆绾跨▼鏁�
+ * @param poolName 绾跨▼姹犲拰绾跨▼鍚嶇О
+ * @param maxNum 绾跨▼姹犳渶澶х嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒�
+ * @param minNum 绾跨▼姹犳渶灏忕嚎绋嬫暟锛屾垨鍒濆绾跨▼鏁�
* @param freeTimeout 绌洪棽绾跨▼瓒呮椂鏃堕暱(绉�)
* @param busyTimeout 蹇欑绾跨▼瓒呮椂鏃堕暱(绉�)锛岃嫢涓�-1锛屼笉鍙楅檺鍒�
* @return 绾跨▼姹犲疄渚�
@@ -51,7 +51,6 @@
}
/**
* 寰楀埌鍞竴绾跨▼姹犲疄渚�
- * @param dataSourceName
* @return
* @throws Exception
*/
@@ -64,7 +63,6 @@
}
/**
* 寰楀埌鍞竴绾跨▼姹犲疄渚�
- * @param dataSourceName
* @return
* @throws Exception
*/
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRTU.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRtu.java
similarity index 60%
rename from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRTU.java
rename to pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRtu.java
index 0f4841a..b538645 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRTU.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRtu.java
@@ -15,14 +15,14 @@
/**
* 鎺у埗鍣ㄥ疄浣擄紝RTU闃�鎺т竴浣撴満
*/
-@TableName(value = "ba_intake", autoResultMap = true)
+@TableName(value = "ba_rtu", autoResultMap = true)
@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "RTU闃�鎺т竴浣撴満瀹炰綋")
-public class BaRTU implements BaseEntity {
+public class BaRtu implements BaseEntity {
public static final long serialVersionUID = 202312011021001L;
@@ -32,73 +32,57 @@
public Long id;
/**
- * 鎺у埗鍣ㄧ紪鍙�
+ * 鎺у埗鍣ㄥ湴鍧�
*/
- @Schema(description = "鎺у埗鍣ㄧ紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotEmpty(message = "鎺у埗鍣ㄧ紪鍙蜂笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Length(message = "鎺у埗鍣ㄧ紪鍙蜂笉澶т簬{max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
- public String num;
+ @Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
+ public String rtuAddr;
/**
* 澶栭敭锛屾寚鍚戝彇姘村彛
*/
@JSONField(serializeUsing = ObjectWriterImplToString.class)
- @Schema(description = "鎵�鍦ㄥ彇姘村彛ID", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "鎵�鍦ㄥ彇姘村彛涓嶈兘涓虹┖") //涓嶈兘涓簄ull
public Long intakeId;
/**
* 澶栭敭锛屾寚鍚戝啘鎴凤紙鐢ㄦ按鎴凤級
*/
@JSONField(serializeUsing = ObjectWriterImplToString.class)
- @Schema(description = "鎵�灞炲啘鎴稩D", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "鎵�灞炲啘鎴蜂笉鑳戒负绌�") //涓嶈兘涓簄ull
public Long clientId;
/**
* 璐熻矗浜�
*/
@Schema(description = "璐熻矗浜�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Length(message = "璐熻矗浜轰笉澶т簬{max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
public String header;
/**
* 鑱旂郴鐢佃瘽
*/
@Schema(description = "鑱旂郴鐢佃瘽", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotEmpty(message = "鑱旂郴鐢佃瘽涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Length(message = "鑱旂郴鐢佃瘽蹇呴』{max}浣嶆暟鎹�", min = 11, max = 11)
public String phone;
/**
* 寮�鍏抽榾
*/
@Schema(description = "寮�鍏抽榾", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotEmpty(message = "0鍏抽榾锛�1寮�闃�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Length(message = "鑱旂郴鐢佃瘽蹇呴』{max}浣嶆暟鎹�", min = 1, max = 1)
public Byte isOpen;
/**
* 鎺у埗鍣ㄥ悕绉�
*/
@Schema(description = "鎺у埗鍣ㄥ悕绉�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotEmpty(message = "鎺у埗鍣ㄥ悕绉伴潪蹇呭～") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Length(message = "鎺у埗鍣ㄥ悕绉颁笉澶т簬{max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
public String name;
/**
* 鍘傚鍚嶇О
*/
@Schema(description = "鍘傚鍚嶇О", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotEmpty(message = "鍘傚鍚嶇О闈炲繀濉�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Length(message = "鍘傚鍚嶇О涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
public String manufacturer;
/**
* 澶囨敞
*/
@Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Length(message = "澶囨敞涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 50)
public String remark;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0.java
new file mode 100644
index 0000000..8468fe1
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0.java
@@ -0,0 +1,45 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.util.Date;
+
+/**
+ * 娴嬭瘯琛�
+ */
+@TableName(value="test0", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁0")
+public class TestPo0 implements BaseEntity {
+
+ public static final long serialVersionUID = 202311141539001L;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Long id ;
+
+ @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String rtuAddr ;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
+ @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Date dt ;
+
+ @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String content ;
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0Mapper.java
new file mode 100644
index 0000000..7863a5b
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo0Mapper.java
@@ -0,0 +1,18 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TestPo0Mapper extends BaseMapper<TestPo0> {
+
+ /**
+ * insert record to table
+ * @param po the record
+ * @return insert count
+ */
+ int putin(TestPo0 po);
+
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1.java
new file mode 100644
index 0000000..6c0928a
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1.java
@@ -0,0 +1,44 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 娴嬭瘯琛�
+ */
+@TableName(value="test1", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁1")
+public class TestPo1 implements BaseEntity {
+
+ public static final long serialVersionUID = 202311141539001L;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Long id ;
+
+ @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String rtuAddr ;
+
+ @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Date dt ;
+
+ @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String content ;
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1Mapper.java
new file mode 100644
index 0000000..8b552cb
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo1Mapper.java
@@ -0,0 +1,18 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TestPo1Mapper extends BaseMapper<TestPo1> {
+
+ /**
+ * insert record to table
+ * @param po the record
+ * @return insert count
+ */
+ int putin(TestPo1 po);
+
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2.java
new file mode 100644
index 0000000..8eb7258
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2.java
@@ -0,0 +1,44 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 娴嬭瘯琛�
+ */
+@TableName(value="test2", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁2")
+public class TestPo2 implements BaseEntity {
+
+ public static final long serialVersionUID = 202311141539001L;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Long id ;
+
+ @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String rtuAddr ;
+
+ @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Date dt ;
+
+ @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String content ;
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2Mapper.java
new file mode 100644
index 0000000..167a093
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo2Mapper.java
@@ -0,0 +1,18 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TestPo2Mapper extends BaseMapper<TestPo2> {
+
+ /**
+ * insert record to table
+ * @param po the record
+ * @return insert count
+ */
+ int putin(TestPo2 po);
+
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3.java
new file mode 100644
index 0000000..38312d8
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3.java
@@ -0,0 +1,44 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 娴嬭瘯琛�
+ */
+@TableName(value="test3", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁3")
+public class TestPo3 implements BaseEntity {
+
+ public static final long serialVersionUID = 202311141539001L;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Long id ;
+
+ @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String rtuAddr ;
+
+ @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Date dt ;
+
+ @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String content ;
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3Mapper.java
new file mode 100644
index 0000000..fed9dca
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo3Mapper.java
@@ -0,0 +1,18 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TestPo3Mapper extends BaseMapper<TestPo3> {
+
+ /**
+ * insert record to table
+ * @param po the record
+ * @return insert count
+ */
+ int putin(TestPo3 po);
+
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4.java
new file mode 100644
index 0000000..8430bfc
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4.java
@@ -0,0 +1,44 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 娴嬭瘯琛�
+ */
+@TableName(value="test4", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁4")
+public class TestPo4 implements BaseEntity {
+
+ public static final long serialVersionUID = 202311141539001L;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Long id ;
+
+ @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String rtuAddr ;
+
+ @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Date dt ;
+
+ @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String content ;
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4Mapper.java
new file mode 100644
index 0000000..76d774a
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo4Mapper.java
@@ -0,0 +1,18 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TestPo4Mapper extends BaseMapper<TestPo4> {
+
+ /**
+ * insert record to table
+ * @param po the record
+ * @return insert count
+ */
+ int putin(TestPo4 po);
+
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5.java
new file mode 100644
index 0000000..7809faa
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5.java
@@ -0,0 +1,44 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 娴嬭瘯琛�
+ */
+@TableName(value="test5", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁5")
+public class TestPo5 implements BaseEntity {
+
+ public static final long serialVersionUID = 202311141539001L;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Long id ;
+
+ @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String rtuAddr ;
+
+ @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Date dt ;
+
+ @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String content ;
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5Mapper.java
new file mode 100644
index 0000000..678cbf2
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo5Mapper.java
@@ -0,0 +1,18 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TestPo5Mapper extends BaseMapper<TestPo5> {
+
+ /**
+ * insert record to table
+ * @param po the record
+ * @return insert count
+ */
+ int putin(TestPo5 po);
+
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6.java
new file mode 100644
index 0000000..fbdb8db
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6.java
@@ -0,0 +1,44 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 娴嬭瘯琛�
+ */
+@TableName(value="test6", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁6")
+public class TestPo6 implements BaseEntity {
+
+ public static final long serialVersionUID = 202311141539001L;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Long id ;
+
+ @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String rtuAddr ;
+
+ @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Date dt ;
+
+ @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String content ;
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6Mapper.java
new file mode 100644
index 0000000..3441990
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo6Mapper.java
@@ -0,0 +1,18 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TestPo6Mapper extends BaseMapper<TestPo6> {
+
+ /**
+ * insert record to table
+ * @param po the record
+ * @return insert count
+ */
+ int putin(TestPo6 po);
+
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7.java
new file mode 100644
index 0000000..6821803
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7.java
@@ -0,0 +1,44 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 娴嬭瘯琛�
+ */
+@TableName(value="test7", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁7")
+public class TestPo7 implements BaseEntity {
+
+ public static final long serialVersionUID = 202311141539001L;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Long id ;
+
+ @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String rtuAddr ;
+
+ @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Date dt ;
+
+ @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String content ;
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7Mapper.java
new file mode 100644
index 0000000..5cc6efb
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo7Mapper.java
@@ -0,0 +1,18 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TestPo7Mapper extends BaseMapper<TestPo7> {
+
+ /**
+ * insert record to table
+ * @param po the record
+ * @return insert count
+ */
+ int putin(TestPo7 po);
+
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8.java
new file mode 100644
index 0000000..68be918
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8.java
@@ -0,0 +1,44 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 娴嬭瘯琛�
+ */
+@TableName(value="test8", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁8")
+public class TestPo8 implements BaseEntity {
+
+ public static final long serialVersionUID = 202311141539001L;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Long id ;
+
+ @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String rtuAddr ;
+
+ @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Date dt ;
+
+ @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String content ;
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8Mapper.java
new file mode 100644
index 0000000..ef6b34d
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo8Mapper.java
@@ -0,0 +1,18 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TestPo8Mapper extends BaseMapper<TestPo8> {
+
+ /**
+ * insert record to table
+ * @param po the record
+ * @return insert count
+ */
+ int putin(TestPo8 po);
+
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9.java
new file mode 100644
index 0000000..bc540d5
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9.java
@@ -0,0 +1,44 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 娴嬭瘯琛�
+ */
+@TableName(value="test9", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "RTU娴嬭瘯涓婃姤鏁版嵁9")
+public class TestPo9 implements BaseEntity {
+
+ public static final long serialVersionUID = 202311141539001L;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Long id ;
+
+ @Schema(description = "rtu鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String rtuAddr ;
+
+ @Schema(description = "涓婃姤鏁版嵁鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Date dt ;
+
+ @Schema(description = "涓婃姤鏁版嵁鍐呭锛圚EX锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public String content ;
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9Mapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9Mapper.java
new file mode 100644
index 0000000..e4afae4
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestPo9Mapper.java
@@ -0,0 +1,18 @@
+package com.dy.pipIrrGlobal.test;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TestPo9Mapper extends BaseMapper<TestPo9> {
+
+ /**
+ * insert record to table
+ * @param po the record
+ * @return insert count
+ */
+ int putin(TestPo9 po);
+
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test0Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test0Mapper.xml
new file mode 100644
index 0000000..1d3c95f
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test0Mapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.test.TestPo0Mapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo0">
+ <!--@mbg.generated-->
+ <!--@Table test0-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
+ <result column="content" jdbcType="VARCHAR" property="content" />
+ <result column="dt" jdbcType="TIMESTAMP" property="dt" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, rtuAddr, content, dt
+ </sql>
+
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo0">
+ <!--@mbg.generated-->
+ insert into test0 (id, rtuAddr, content, dt)
+ values (#{id,jdbcType=BIGINT},
+ #{rtuAddr,jdbcType=VARCHAR},
+ #{content,jdbcType=VARCHAR},
+ #{dt,jdbcType=TIMESTAMP})
+ </insert>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test1Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test1Mapper.xml
new file mode 100644
index 0000000..a95a566
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test1Mapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.test.TestPo1Mapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo1">
+ <!--@mbg.generated-->
+ <!--@Table test1-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
+ <result column="content" jdbcType="VARCHAR" property="content" />
+ <result column="dt" jdbcType="TIMESTAMP" property="dt" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, rtuAddr, content, dt
+ </sql>
+
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo1">
+ <!--@mbg.generated-->
+ insert into test1 (id, rtuAddr, content, dt)
+ values (#{id,jdbcType=BIGINT},
+ #{rtuAddr,jdbcType=VARCHAR},
+ #{content,jdbcType=VARCHAR},
+ #{dt,jdbcType=TIMESTAMP})
+ </insert>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test2Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test2Mapper.xml
new file mode 100644
index 0000000..a150f8f
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test2Mapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.test.TestPo2Mapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo2">
+ <!--@mbg.generated-->
+ <!--@Table test2-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
+ <result column="content" jdbcType="VARCHAR" property="content" />
+ <result column="dt" jdbcType="TIMESTAMP" property="dt" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, rtuAddr, content, dt
+ </sql>
+
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo2">
+ <!--@mbg.generated-->
+ insert into test2 (id, rtuAddr, content, dt)
+ values (#{id,jdbcType=BIGINT},
+ #{rtuAddr,jdbcType=VARCHAR},
+ #{content,jdbcType=VARCHAR},
+ #{dt,jdbcType=TIMESTAMP})
+ </insert>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test3Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test3Mapper.xml
new file mode 100644
index 0000000..694b363
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test3Mapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.test.TestPo3Mapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo3">
+ <!--@mbg.generated-->
+ <!--@Table test3-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
+ <result column="content" jdbcType="VARCHAR" property="content" />
+ <result column="dt" jdbcType="TIMESTAMP" property="dt" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, rtuAddr, content, dt
+ </sql>
+
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo3">
+ <!--@mbg.generated-->
+ insert into test3 (id, rtuAddr, content, dt)
+ values (#{id,jdbcType=BIGINT},
+ #{rtuAddr,jdbcType=VARCHAR},
+ #{content,jdbcType=VARCHAR},
+ #{dt,jdbcType=TIMESTAMP})
+ </insert>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test4Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test4Mapper.xml
new file mode 100644
index 0000000..b0960fb
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test4Mapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.test.TestPo4Mapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo4">
+ <!--@mbg.generated-->
+ <!--@Table test4-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
+ <result column="content" jdbcType="VARCHAR" property="content" />
+ <result column="dt" jdbcType="TIMESTAMP" property="dt" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, rtuAddr, content, dt
+ </sql>
+
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo4">
+ <!--@mbg.generated-->
+ insert into test4 (id, rtuAddr, content, dt)
+ values (#{id,jdbcType=BIGINT},
+ #{rtuAddr,jdbcType=VARCHAR},
+ #{content,jdbcType=VARCHAR},
+ #{dt,jdbcType=TIMESTAMP})
+ </insert>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test5Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test5Mapper.xml
new file mode 100644
index 0000000..a4baa60
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test5Mapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.test.TestPo5Mapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo5">
+ <!--@mbg.generated-->
+ <!--@Table test5-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
+ <result column="content" jdbcType="VARCHAR" property="content" />
+ <result column="dt" jdbcType="TIMESTAMP" property="dt" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, rtuAddr, content, dt
+ </sql>
+
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo5">
+ <!--@mbg.generated-->
+ insert into test5 (id, rtuAddr, content, dt)
+ values (#{id,jdbcType=BIGINT},
+ #{rtuAddr,jdbcType=VARCHAR},
+ #{content,jdbcType=VARCHAR},
+ #{dt,jdbcType=TIMESTAMP})
+ </insert>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test6Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test6Mapper.xml
new file mode 100644
index 0000000..7a7972c
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test6Mapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.test.TestPo6Mapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo6">
+ <!--@mbg.generated-->
+ <!--@Table test6-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
+ <result column="content" jdbcType="VARCHAR" property="content" />
+ <result column="dt" jdbcType="TIMESTAMP" property="dt" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, rtuAddr, content, dt
+ </sql>
+
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo6">
+ <!--@mbg.generated-->
+ insert into test6 (id, rtuAddr, content, dt)
+ values (#{id,jdbcType=BIGINT},
+ #{rtuAddr,jdbcType=VARCHAR},
+ #{content,jdbcType=VARCHAR},
+ #{dt,jdbcType=TIMESTAMP})
+ </insert>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test7Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test7Mapper.xml
new file mode 100644
index 0000000..53eba1c
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test7Mapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.test.TestPo7Mapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo7">
+ <!--@mbg.generated-->
+ <!--@Table test7-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
+ <result column="content" jdbcType="VARCHAR" property="content" />
+ <result column="dt" jdbcType="TIMESTAMP" property="dt" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, rtuAddr, content, dt
+ </sql>
+
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo7">
+ <!--@mbg.generated-->
+ insert into test7 (id, rtuAddr, content, dt)
+ values (#{id,jdbcType=BIGINT},
+ #{rtuAddr,jdbcType=VARCHAR},
+ #{content,jdbcType=VARCHAR},
+ #{dt,jdbcType=TIMESTAMP})
+ </insert>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test8Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test8Mapper.xml
new file mode 100644
index 0000000..ae507a8
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test8Mapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.test.TestPo8Mapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo8">
+ <!--@mbg.generated-->
+ <!--@Table test8-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
+ <result column="content" jdbcType="VARCHAR" property="content" />
+ <result column="dt" jdbcType="TIMESTAMP" property="dt" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, rtuAddr, content, dt
+ </sql>
+
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo8">
+ <!--@mbg.generated-->
+ insert into test8 (id, rtuAddr, content, dt)
+ values (#{id,jdbcType=BIGINT},
+ #{rtuAddr,jdbcType=VARCHAR},
+ #{content,jdbcType=VARCHAR},
+ #{dt,jdbcType=TIMESTAMP})
+ </insert>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test9Mapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test9Mapper.xml
new file mode 100644
index 0000000..c2d13a4
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Test9Mapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.test.TestPo9Mapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.test.TestPo9">
+ <!--@mbg.generated-->
+ <!--@Table test9-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
+ <result column="content" jdbcType="VARCHAR" property="content" />
+ <result column="dt" jdbcType="TIMESTAMP" property="dt" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, rtuAddr, content, dt
+ </sql>
+
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.test.TestPo9">
+ <!--@mbg.generated-->
+ insert into test9 (id, rtuAddr, content, dt)
+ values (#{id,jdbcType=BIGINT},
+ #{rtuAddr,jdbcType=VARCHAR},
+ #{content,jdbcType=VARCHAR},
+ #{dt,jdbcType=TIMESTAMP})
+ </insert>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/PipIrrMwAcceptApplication.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/PipIrrMwAcceptApplication.java
index e0b836f..88f7105 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/PipIrrMwAcceptApplication.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/PipIrrMwAcceptApplication.java
@@ -6,15 +6,15 @@
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
@SpringBootApplication
@EnableAspectJAutoProxy
+//@EnableAspectJAutoProxy(exposeProxy=true)//瑙乭ttps://blog.csdn.net/qq_32590703/article/details/109320381
@EnableMultiDataSource
@ComponentScan(basePackages = {"com.dy.common", "com.dy.pipIrrGlobal", "com.dy.aceMw"})
-@MapperScan(basePackages={"com.dy.pipIrrGlobal.daoRm"})
+@MapperScan(basePackages={"com.dy.pipIrrGlobal.test","com.dy.pipIrrGlobal.daoRm"})
public class PipIrrMwAcceptApplication implements CommandLineRunner {
public static void main(String[] args) {
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/Server.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/Server.java
index 3a89030..a368845 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/Server.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/Server.java
@@ -144,6 +144,13 @@
ServerProperties.lastUpDataTimeLive = conf.getSetAttrPlusInt(doc, "config.base", "lastUpDataTimeLive", null, 0, 5, null) * 1000L ;
//鏁版嵁搴撴暟鎹甶d鐢熸垚鍣ㄧ殑id鍚庣紑锛�0鏄粯璁ょ殑鍚庣紑锛屼竴鑸瑆eb绯荤粺搴旂敤锛屾暟鎹腑闂翠欢id鍚庣紑澶т簬绛変簬1
ServerProperties.dbDataIdSuffix = conf.getSetAttrInt(doc, "config.base", "dbDataIdSuffix", null, 0, 99, null);
+ //涓婁笅琛屾暟鎹紦瀛橀槦鍒椾腑缂撳瓨鏁版嵁涓暟鐨勬姤璀﹂噺锛岃繖涓笌鐜板疄椤圭洰鎵�鎺ユ按琛ㄦ暟鐩稿叧
+ ServerProperties.cacheUpDownDataWarnCount = conf.getSetAttrPlusInt(doc, "config.base", "cacheUpDownDataWarnCount", null, 1, null, null) ;
+ //涓婁笅琛屾暟鎹紦瀛橀槦鍒椾腑缂撳瓨鏁版嵁涓暟鐨勬渶澶у�硷紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
+ ServerProperties.cacheUpDownDataMaxCount = conf.getSetAttrPlusInt(doc, "config.base", "cacheUpDownDataMaxCount", null, 1, null, null) ;
+ if(ServerProperties.cacheUpDownDataMaxCount <= ServerProperties.cacheUpDownDataWarnCount){
+ throw new Exception("cacheUpDownDataMaxCount蹇呴』澶т簬cacheUpDownDataWarnCount") ;
+ }
//璁剧疆ID鐢熸垚鍣ㄧ殑鍚庣紑
IDLongGenerator.setSuffix(ServerProperties.dbDataIdSuffix.intValue());
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/RtuSv.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/RtuSv.java
index 271001a..1d979bf 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/RtuSv.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/RtuSv.java
@@ -1,7 +1,169 @@
package com.dy.aceMw.server.rtuData.dbSv;
+import com.dy.common.multiDataSource.DataSourceSingle;
+import com.dy.common.mw.protocol.Data;
+import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-@Service
+import java.util.Date;
+
+import com.dy.pipIrrGlobal.test.*;
+
+@Service()
public class RtuSv {
+ @Autowired
+ public TestPo0Mapper dao0 ;
+ @Autowired
+ public TestPo1Mapper dao1 ;
+ @Autowired
+ public TestPo2Mapper dao2 ;
+ @Autowired
+ public TestPo3Mapper dao3 ;
+ @Autowired
+ public TestPo4Mapper dao4 ;
+ @Autowired
+ public TestPo5Mapper dao5 ;
+ @Autowired
+ public TestPo6Mapper dao6 ;
+ @Autowired
+ public TestPo7Mapper dao7 ;
+ @Autowired
+ public TestPo8Mapper dao8 ;
+ @Autowired
+ public TestPo9Mapper dao9 ;
+
+ @Autowired
+ @Lazy
+ private RtuSv sv ;
+
+ public int save(Data data){
+ int count = 0 ;
+ if(data != null && data.getSubData() != null){
+ Object obj = data.getSubData() ;
+ if(obj != null && obj instanceof DataV1_0_1){
+ DataV1_0_1 dataV1_0_1 = (DataV1_0_1)obj ;
+ if(dataV1_0_1 != null && dataV1_0_1.dataCdC0Vo != null){
+ //瑙乭ttps://blog.csdn.net/qq_32590703/article/details/109320381
+ //this.save0(dataV1_0_1)杩欑璋冪敤鏂规硶save0锛宻ave0涓婄殑娉ㄨВ涓嶇敓鏁堬紝鍥犱负閲囩敤AOP鍚庯紝浼氱敓浜т唬鐞嗙被鏉ヨ繍琛�
+ //count += ((RtuSv)AopContext.currentProxy()).save0(dataV1_0_1);
+ //count += ((RtuSv)AopContext.currentProxy()).save1(dataV1_0_1);
+
+ count += sv.save0(dataV1_0_1);
+ count += sv.save1(dataV1_0_1);
+ count += sv.save2(dataV1_0_1);
+ count += sv.save3(dataV1_0_1);
+ count += sv.save4(dataV1_0_1);
+ count += sv.save5(dataV1_0_1);
+ count += sv.save6(dataV1_0_1);
+ count += sv.save7(dataV1_0_1);
+ count += sv.save8(dataV1_0_1);
+ count += sv.save9(dataV1_0_1);
+ }
+ }
+ }
+ return count ;
+ }
+
+ @DataSourceSingle()
+ @Transactional
+ public int save0(DataV1_0_1 dataV1_0_1){
+ TestPo0 po = new TestPo0() ;
+ po.rtuAddr = dataV1_0_1.rtuAddr ;
+ po.dt = new Date() ;
+ po.content = dataV1_0_1.dataCdC0Vo.toString() ;
+ return dao0.putin(po) ;
+ }
+
+ @DataSourceSingle()
+ @Transactional
+ public int save1(DataV1_0_1 dataV1_0_1){
+ TestPo1 po = new TestPo1() ;
+ po.rtuAddr = dataV1_0_1.rtuAddr ;
+ po.dt = new Date() ;
+ po.content = dataV1_0_1.dataCdC0Vo.toString() ;
+ return dao1.putin(po) ;
+ }
+
+ @DataSourceSingle()
+ @Transactional
+ public int save2(DataV1_0_1 dataV1_0_1){
+ TestPo2 po = new TestPo2() ;
+ po.rtuAddr = dataV1_0_1.rtuAddr ;
+ po.dt = new Date() ;
+ po.content = dataV1_0_1.dataCdC0Vo.toString() ;
+ return dao2.putin(po) ;
+ }
+
+ @DataSourceSingle()
+ @Transactional
+ public int save3(DataV1_0_1 dataV1_0_1){
+ TestPo3 po = new TestPo3() ;
+ po.rtuAddr = dataV1_0_1.rtuAddr ;
+ po.dt = new Date() ;
+ po.content = dataV1_0_1.dataCdC0Vo.toString() ;
+ return dao3.putin(po) ;
+ }
+
+ @DataSourceSingle()
+ @Transactional
+ public int save4(DataV1_0_1 dataV1_0_1){
+ TestPo4 po = new TestPo4() ;
+ po.rtuAddr = dataV1_0_1.rtuAddr ;
+ po.dt = new Date() ;
+ po.content = dataV1_0_1.dataCdC0Vo.toString() ;
+ return dao4.putin(po) ;
+ }
+
+ @DataSourceSingle()
+ @Transactional
+ public int save5(DataV1_0_1 dataV1_0_1){
+ TestPo5 po = new TestPo5() ;
+ po.rtuAddr = dataV1_0_1.rtuAddr ;
+ po.dt = new Date() ;
+ po.content = dataV1_0_1.dataCdC0Vo.toString() ;
+ return dao5.putin(po) ;
+ }
+
+ @DataSourceSingle()
+ @Transactional
+ public int save6(DataV1_0_1 dataV1_0_1){
+ TestPo6 po = new TestPo6() ;
+ po.rtuAddr = dataV1_0_1.rtuAddr ;
+ po.dt = new Date() ;
+ po.content = dataV1_0_1.dataCdC0Vo.toString() ;
+ return dao6.putin(po) ;
+ }
+
+ @DataSourceSingle()
+ @Transactional
+ public int save7(DataV1_0_1 dataV1_0_1){
+ TestPo7 po = new TestPo7() ;
+ po.rtuAddr = dataV1_0_1.rtuAddr ;
+ po.dt = new Date() ;
+ po.content = dataV1_0_1.dataCdC0Vo.toString() ;
+ return dao7.putin(po) ;
+ }
+
+ @DataSourceSingle()
+ @Transactional
+ public int save8(DataV1_0_1 dataV1_0_1){
+ TestPo8 po = new TestPo8() ;
+ po.rtuAddr = dataV1_0_1.rtuAddr ;
+ po.dt = new Date() ;
+ po.content = dataV1_0_1.dataCdC0Vo.toString() ;
+ return dao8.putin(po) ;
+ }
+
+ @DataSourceSingle()
+ @Transactional
+ public int save9(DataV1_0_1 dataV1_0_1){
+ TestPo9 po = new TestPo9() ;
+ po.rtuAddr = dataV1_0_1.rtuAddr ;
+ po.dt = new Date() ;
+ po.content = dataV1_0_1.dataCdC0Vo.toString() ;
+ return dao9.putin(po) ;
+ }
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
index 4e13d52..34b9641 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
@@ -1,7 +1,9 @@
package com.dy.aceMw.server.rtuData.p206V1_0_0;
import com.dy.aceMw.server.rtuData.TaskSurpport;
+import com.dy.aceMw.server.rtuData.dbSv.RtuSv;
import com.dy.common.mw.protocol.Data;
+import com.dy.common.springUtil.SpringContextUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -21,6 +23,10 @@
Data d = (Data)data ;
String rtuAddr = d.getRtuAddr() ;
log.info("RTU" + rtuAddr + "鏁版嵁鍒版锛岃繕鏈疄鐜板鐞�:" + data.toString());
+
+ RtuSv sv = (RtuSv)SpringContextUtil.getBean(RtuSv.class) ;
+ sv.save(d) ;
+
//寰楀埌鏈湴RTU 鏁版嵁锛屼互澶囧悗闈㈣妭鐐瑰簲鐢�
/*
BuziInterface baseBusi = BuziGeter.getBaseBusi() ;
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/resources/config.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/resources/config.xml
index 230a69b..b4b2330 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/resources/config.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/resources/config.xml
@@ -14,20 +14,24 @@
offLineCachTimeout: 涓嶅湪绾跨紦瀛樼殑鍛戒护鏈�澶х紦瀛樻椂闀�(绉�)
lastUpDataTimeLive: TCP涓婅鏁版嵁鏃跺埢缂撳瓨鏃堕暱(绉�)锛屽綋杈惧埌鏃堕暱鏃讹紝TCP涓婅鏁版嵁鏃跺埢琚竻绌猴紝閲囩敤TCP涓婅鏁版嵁鏃跺埢鐩殑鏄紝闃绘涓婅鏁版嵁鍚屾椂涓嬪彂鏁版嵁锛屽洜涓篟TU澶勭悊涓嶈繃鏉�(缁忓垵娆″疄楠岋紝1绉掕繕鏄湁闂锛�2绉掓棤闂)
dbDataIdSuffix锛氭暟鎹簱鏁版嵁id鐢熸垚鍣ㄧ殑id鍚庣紑锛�0鏄粯璁ょ殑鍚庣紑锛屼竴鑸瑆eb绯荤粺搴旂敤锛屾暟鎹腑闂翠欢id鍚庣紑澶т簬绛変簬1
+ cacheUpDownDataWarnCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鎶ヨ閲忥紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
+ cacheUpDownDataMaxCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鏈�澶у�硷紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
-->
<base
isLowPower="false"
onlyOneProtocol="true"
- downComandMaxResendTimes="1"
+ downComandMaxResendTimes="3"
commandSendInterval="3"
cachWaitResultTimeout="60"
offLineCachTimeout="86400"
lastUpDataTimeLive="1"
- dbDataIdSuffix="1"
+ dbDataIdSuffix="0"
+ cacheUpDownDataWarnCount="100000"
+ cacheUpDownDataMaxCount="110000"
/>
<!--
- centerAddr: 涓績鍦板潃锛屽綋鍓嶏紝鍦ㄦ埛琛ㄧ郴缁熶腑鐨勶紝centerAddr鏈敤鍒�
+ centerAddr: 涓績鍦板潃锛屽綋鍓嶏紝centerAddr鏈敤鍒�
synchroRtuClock: 鏄惁瀵筊TU鏍℃椂
synchroRtuClockTimepieces锛氬綋RTU涓庢湇鍔″櫒鏃堕挓鐩稿樊涓�瀹氭绉掞紙閰嶇疆鏂囦欢鏄閽燂級鍚庯紝杩涜鏍℃椂
-->
@@ -53,24 +57,24 @@
<!--
鏀寔妯″潡
鐭伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝鐭殑宸ヤ綔浠诲姟
- short_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1
- short_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟
+ short_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒� 锛岃缃负0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ short_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
short_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋嬶紝涓轰簡涓嶆竻闄わ紝鎶妋inThread涓巑axThread璁剧疆鐩哥瓑
short_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝璁や负绾跨▼宸茬粡浜嗗穿婧冿紝灏嗗己鍒舵竻闄わ紝鐭伐浣滄椂闀胯缃负5绉�
- 闀垮伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝闀跨殑宸ヤ綔浠诲姟锛屼緥濡備粠Redis涓彇缂撳瓨鐨凴TU涓婅鏁版嵁
- long_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟,鑻ヤ负-1锛屼笉鍙楅檺鍒�
- long_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟
+ 闀垮伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝闀跨殑宸ヤ綔浠诲姟锛屼緥濡傛暟鎹簱瀛樺彇鎿嶄綔
+ long_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ long_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
long_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋�
long_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝鑻ヤ负-1锛屼笉鍙楅檺鍒�
enableThreadPool锛氭槸鍚﹀惎鐢ㄧ嚎绋嬫睜
-->
<support
- short_maxThread="100"
- short_minThread="5"
+ short_maxThread="6"
+ short_minThread="6"
short_freeTimeout="60"
short_busyTimeout="5"
- long_maxThread="200"
- long_minThread="0"
+ long_maxThread="6"
+ long_minThread="6"
long_freeTimeout="60"
long_busyTimeout="-1"
enableThreadPool="true"
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/PipIrrSsoApplication.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/PipIrrSsoApplication.java
index 1774e26..e7795b6 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/PipIrrSsoApplication.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/PipIrrSsoApplication.java
@@ -20,12 +20,5 @@
public static void main(String[] args) {
SpringApplication.run(PipIrrSsoApplication.class, args);
- log.info("瀹瑰櫒鍚姩鎴愬姛... ");
-
-// SpringCacheService springCacheService = SpringContextUtil.getBean(SpringCacheService.class);
-// springCacheService.query();
-
-// MyGuavaCacheService myGuavaCacheService = SpringContextUtil.getBean(MyGuavaCacheService.class);
-// myGuavaCacheService.query();
}
}
--
Gitblit v1.8.0