feat(吉林演示): 松原

1.开发间开优化结果统计功能,创建间开优化效果统计表,生成对应代码;
2.修改15天,10天,3天,1天间开优化功能,修改代码结构;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C00-common/pps-common/src/main/java/pps/core/common/mybatis/PpsCoreCommonMybatis.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
-import xstartup.service.mybatis.XMybatis;
+
 
 /**
  * mybatis 配置类

C02-system/pps-core-system/src/main/java/pps/core/system/mybatis/PpsCoreSystemMybatis.java

@@ -5,7 +5,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import pps.core.common.mybatis.MybaitisGlobalConfigSuppiler;
-import xstartup.service.mybatis.XMybatis;
+import pps.core.common.mybatis.XMybatis;
 
 /**
  * mybatis 配置类

C09-base/pps-core-base/src/main/java/pps/core/base/mybatis/PpsCoreBaseMybatis.java

@@ -5,7 +5,8 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import pps.core.common.mybatis.MybaitisGlobalConfigSuppiler;
-import xstartup.service.mybatis.XMybatis;
+import pps.core.common.mybatis.XMybatis;
+
 
 /**
  * mybatis 配置类

C10-task/pps-core-task/src/main/java/pps/core/task/mybatis/PpsCoreBaseMybatis.java

@@ -5,7 +5,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import pps.core.common.mybatis.MybaitisGlobalConfigSuppiler;
-import xstartup.service.mybatis.XMybatis;
+import pps.core.common.mybatis.XMybatis;
 
 /**
  * mybatis 配置类

C11-space/pps-core-space/src/main/java/pps/core/space/mybatis/PpsCoreSpaceMybatis.java

@@ -5,7 +5,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import pps.core.common.mybatis.MybaitisGlobalConfigSuppiler;
-import xstartup.service.mybatis.XMybatis;
+import pps.core.common.mybatis.XMybatis;
 
 
 /**

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/mybatis/PpsCorePredictionMybatis.java

@@ -5,7 +5,8 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import pps.core.common.mybatis.MybaitisGlobalConfigSuppiler;
-import xstartup.service.mybatis.XMybatis;
+import pps.core.common.mybatis.XMybatis;
+
 
 /**
  * mybatis 配置类

C13-middle/pps-core-middle/src/main/java/pps/core/middle/mybatis/PpsCoreMiddleMybatis.java

@@ -5,7 +5,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import pps.core.common.mybatis.MybaitisGlobalConfigSuppiler;
-import xstartup.service.mybatis.XMybatis;
+import pps.core.common.mybatis.XMybatis;
 
 
 /**

D03-deploy/deploy-pps-all/src/main/resources/deploy-pps-all.app.properties

@@ -30,12 +30,14 @@ x.db.url=@x.db.url@
 x.db.user=@x.db.user@
 x.db.password=@x.db.password@
 x.db.naming=@x.db.naming@
+x.db.databaseId=@x.db.databaseId@
 x.db.pps.core.middle.sharding=@x.db.pps.core.middle.sharding@
 x.db.pps.core.middle.driver=@x.db.pps.core.middle.driver@
 x.db.pps.core.middle.url=@x.db.pps.core.middle.url@
 x.db.pps.core.middle.user=@x.db.pps.core.middle.user@
 x.db.pps.core.middle.password=@x.db.pps.core.middle.password@
 x.db.pps.core.middle.naming=@x.db.pps.core.middle.naming@
+x.db.pps.core.middle.databaseId=@x.db.pps.core.middle.databaseId@
 # \u7981\u7528\u6821\u9A8C
 x.druid.validation-query=
 # \u81EA\u5B9A\u4E49\u914D\u7F6E

D03-deploy/filters/filter-dev.properties

@@ -25,12 +25,14 @@ x.db.url=jdbc:mysql://120.46.208.168:3306/gf_demo?allowPublicKeyRetrieval=true&c
 x.db.user=root
 x.db.password=vwy69PQDfShqozf4ISXEoQ==
 x.db.naming=snake-case
+x.db.databaseId=MySQL
 x.db.pps.core.middle.sharding=1
 x.db.pps.core.middle.driver=oracle.jdbc.OracleDriver
 x.db.pps.core.middle.url=jdbc:oracle:thin:@192.168.0.128:1521/ORCLPDB
 x.db.pps.core.middle.user=DB_CONTRACT
 x.db.pps.core.middle.password=BJ8HiKUS_Rg=
 x.db.pps.core.middle.naming=snake-case
+x.db.pps.core.middle.databaseId=Oracle
 # \u81EA\u5B9A\u4E49\u914D\u7F6E
 #weather.file.temp.path=D:/home/weather/temp/receive
 weather.file.temp.path=/home/weather-jar/temp/receive