更换数据库

src/main/java/com/zcxk/meterreadingsystemv2/dbs/DataSourceConfigurer.java

@@ -86,7 +86,7 @@ public class DataSourceConfigurer {
         DruidDataSource suibinDataSource = createDataSource("suibin");
 
         //创建同江数据库连接对象
-        DruidDataSource tongjiangDataSource = createDataSource("tongjiang");
+        //DruidDataSource tongjiangDataSource = createDataSource("tongjiang");
 
         //创建绥滨数据库连接对象
         DruidDataSource jlDataSource = createDataSource("jl");
@@ -95,13 +95,16 @@ public class DataSourceConfigurer {
         DruidDataSource suiyangDataSource = createDataSource("suiyang");
 
         //创建巴里坤数据库连接对象
-        DruidDataSource balikunDataSource = createDataSource("balikun");
+        //DruidDataSource balikunDataSource = createDataSource("balikun");
 
         //创建泾阳数据库连接对象
-        DruidDataSource jingyangDataSource = createDataSource("jingyang");
+        //DruidDataSource jingyangDataSource = createDataSource("jingyang");
 
         //创建泾阳数据库连接对象
-        DruidDataSource huichuanDataSource = createDataSource("huichuan");
+        //DruidDataSource huichuanDataSource = createDataSource("huichuan");
+
+        //创建通用数据库连接对象
+        DruidDataSource commonDataSource = createDataSource("common");
 
         //创建物联网云平台数据库连接对象
         DruidDataSource smartCityDataSource = createDataSource("smart-city");
@@ -112,11 +115,12 @@ public class DataSourceConfigurer {
         map.put("xp", xpDataSource);
         map.put("lb", lbDataSource);
         map.put("suibin", suibinDataSource);
-        map.put("tongjiang", tongjiangDataSource);
+        //map.put("tongjiang", tongjiangDataSource);
         map.put("suiyang", suiyangDataSource);
-        map.put("balikun", balikunDataSource);
-        map.put("jingyang", jingyangDataSource);
-        map.put("huichuan", huichuanDataSource);
+        //map.put("balikun", balikunDataSource);
+        //map.put("jingyang", jingyangDataSource);
+        //map.put("huichuan", huichuanDataSource);
+        map.put("common", commonDataSource);
         map.put("jl", jlDataSource);
         map.put("smart-city", smartCityDataSource);
         dynamicDataSource.setTargetDataSources(map);

src/main/java/com/zcxk/meterreadingsystemv2/kafka/AddAccountReceiver.java

@@ -90,7 +90,7 @@ public class AddAccountReceiver {
 
                 //同江供水有限公司立户
                 else if("prd".equals(acceptData.getActive()) && acceptData.getCustomerId() == 57){
-                    DynamicDataSourceContextHolder.setDataSourceKey("tongjiang");
+                    DynamicDataSourceContextHolder.setDataSourceKey("common");
                     log.info("＝＝＝＝＝service当前连接的数据库是:" + DynamicDataSourceContextHolder.getDataSourceKey());
                     commOrgLevel = "10001014";
                     commOrgIdenty = "10001014";
@@ -123,7 +123,7 @@ public class AddAccountReceiver {
 
                 //泾阳立户
                 else if("prd".equals(acceptData.getActive()) && acceptData.getCustomerId() == 22){
-                    DynamicDataSourceContextHolder.setDataSourceKey("jingyang");
+                    DynamicDataSourceContextHolder.setDataSourceKey("common");
                     log.info("＝＝＝＝＝service当前连接的数据库是:" + DynamicDataSourceContextHolder.getDataSourceKey());
                     commOrgLevel = "10001017";
                     commOrgIdenty = "10001017";
@@ -156,7 +156,7 @@ public class AddAccountReceiver {
 
                 //汇川立户
                 else if("prd".equals(acceptData.getActive()) && acceptData.getCustomerId() == 38){
-                    DynamicDataSourceContextHolder.setDataSourceKey("huichuan");
+                    DynamicDataSourceContextHolder.setDataSourceKey("common");
                     log.info("＝＝＝＝＝service当前连接的数据库是:" + DynamicDataSourceContextHolder.getDataSourceKey());
                     commOrgLevel = "10001002";
                     commOrgIdenty = "10001002";

src/main/java/com/zcxk/meterreadingsystemv2/kafka/ReplaceMaterReceiver.java

@@ -36,7 +36,7 @@ public class ReplaceMaterReceiver {
             String commOrgIdenty = null;
             if("prd".equals(data.getActive()) && data.getCustomerId() == 66){
                 //巴里坤
-                DynamicDataSourceContextHolder.setDataSourceKey("balikun");
+                DynamicDataSourceContextHolder.setDataSourceKey("common");
                 log.info("＝＝＝＝＝service当前连接的数据库是:" + DynamicDataSourceContextHolder.getDataSourceKey());
                 commOrgLevel = "10001013";
                 commOrgIdenty = "10001013";
@@ -64,7 +64,7 @@ public class ReplaceMaterReceiver {
             }
             if("prd".equals(data.getActive()) && data.getCustomerId() == 57){
                 //同江
-                DynamicDataSourceContextHolder.setDataSourceKey("tongjiang");
+                DynamicDataSourceContextHolder.setDataSourceKey("common");
                 log.info("＝＝＝＝＝service当前连接的数据库是:" + DynamicDataSourceContextHolder.getDataSourceKey());
                 commOrgLevel = "10001014";
                 commOrgIdenty = "10001014";
@@ -92,7 +92,7 @@ public class ReplaceMaterReceiver {
             }
             if("prd".equals(data.getActive()) && data.getCustomerId() == 22){
                 //泾阳
-                DynamicDataSourceContextHolder.setDataSourceKey("jingyang");
+                DynamicDataSourceContextHolder.setDataSourceKey("common");
                 log.info("＝＝＝＝＝service当前连接的数据库是:" + DynamicDataSourceContextHolder.getDataSourceKey());
                 commOrgLevel = "10001017";
                 commOrgIdenty = "10001017";
@@ -120,7 +120,7 @@ public class ReplaceMaterReceiver {
             }
             if("prd".equals(data.getActive()) && data.getCustomerId() == 38){
                 //汇川
-                DynamicDataSourceContextHolder.setDataSourceKey("huichuan");
+                DynamicDataSourceContextHolder.setDataSourceKey("common");
                 log.info("＝＝＝＝＝service当前连接的数据库是:" + DynamicDataSourceContextHolder.getDataSourceKey());
                 commOrgLevel = "10001002";
                 commOrgIdenty = "10001002";

src/main/java/com/zcxk/meterreadingsystemv2/kafka/ValveStateReceiver.java

@@ -41,7 +41,7 @@ public class ValveStateReceiver {
             if("prd".equals(data.getActive()) && data.getCustomerId() == 66){
                 log.info("ValveControlDataDto data = {}", JSON.toJSONString(data));
                 //巴里坤
-                DynamicDataSourceContextHolder.setDataSourceKey("balikun");
+                DynamicDataSourceContextHolder.setDataSourceKey("common");
                 log.info("＝＝＝＝＝service当前连接的数据库是:" + DynamicDataSourceContextHolder.getDataSourceKey());
                 commOrgLevel = "10001013";
                 commOrgIdenty = "10001013";

src/main/java/com/zcxk/meterreadingsystemv2/scheduled/MeterReadingScheduleTask.java

@@ -623,7 +623,7 @@ public class MeterReadingScheduleTask {
         if(!"prd".equals(active)){
             return;
         }
-        String originName = "balikun";
+        String originName = "common";
         Integer customerId = 66;
 
         Integer startDate = null;
@@ -716,7 +716,7 @@ public class MeterReadingScheduleTask {
         if(!"prd".equals(active)){
             return;
         }
-        String originName = "jingyang";
+        String originName = "common";
         Integer customerId = 22;
 
         Integer startDate = null;
@@ -819,7 +819,7 @@ public class MeterReadingScheduleTask {
             log.info("不是最后一天");
             return;
         }*/
-        String originName = "tongjiang";
+        String originName = "common";
         Integer customerId = 57;
 
         Integer startDate = null;
@@ -912,7 +912,7 @@ public class MeterReadingScheduleTask {
         if(!"prd".equals(active)){
             return;
         }
-        String originName = "huichuan";
+        String originName = "common";
         Integer customerId = 38;
 
         Integer startDate = null;

src/main/resources/application-prd.properties

@@ -46,11 +46,11 @@ db.lb.password=lbzls
 #db.tongjiang.url=jdbc:oracle:thin:@//114.135.61.189:31521/tjzls
 #db.tongjiang.username=tjycb
 #db.tongjiang.password=tjzls
-db.tongjiang.driver-class-name=oracle.jdbc.OracleDriver
-db.tongjiang.type=com.alibaba.druid.pool.DruidDataSource
-db.tongjiang.url=jdbc:oracle:thin:@//101.200.189.198:1521/xdkjys
-db.tongjiang.username=xdycb_zs
-db.tongjiang.password=whxdkj
+#db.tongjiang.driver-class-name=oracle.jdbc.OracleDriver
+#db.tongjiang.type=com.alibaba.druid.pool.DruidDataSource
+#db.tongjiang.url=jdbc:oracle:thin:@//101.200.189.198:1521/xdkjys
+#db.tongjiang.username=xdycb_zs
+#db.tongjiang.password=whxdkj
 
 
 #绥阳oracle
@@ -69,28 +69,35 @@ db.suiyang.password=syzls
 #db.balikun.url=jdbc:oracle:thin:@//101.200.189.198:1521/xdkjys
 #db.balikun.username=blkycb
 #db.balikun.password=blkzls
-db.balikun.driver-class-name=oracle.jdbc.OracleDriver
-db.balikun.type=com.alibaba.druid.pool.DruidDataSource
-db.balikun.url=jdbc:oracle:thin:@//101.200.189.198:1521/xdkjys
-db.balikun.username=xdycb_zs
-db.balikun.password=whxdkj
+#db.balikun.driver-class-name=oracle.jdbc.OracleDriver
+#db.balikun.type=com.alibaba.druid.pool.DruidDataSource
+#db.balikun.url=jdbc:oracle:thin:@//101.200.189.198:1521/xdkjys
+#db.balikun.username=xdycb_zs
+#db.balikun.password=whxdkj
 
 #泾阳oracle
-db.jingyang.driver-class-name=oracle.jdbc.OracleDriver
-db.jingyang.type=com.alibaba.druid.pool.DruidDataSource
-db.jingyang.url=jdbc:oracle:thin:@//101.200.189.198:1521/xdkjys
-#db.jingyang.username=xdycb_cs
-#db.jingyang.password=xdkj
-db.jingyang.username=xdycb_zs
-db.jingyang.password=whxdkj
+#db.jingyang.driver-class-name=oracle.jdbc.OracleDriver
+#db.jingyang.type=com.alibaba.druid.pool.DruidDataSource
+#db.jingyang.url=jdbc:oracle:thin:@//101.200.189.198:1521/xdkjys
+##db.jingyang.username=xdycb_cs
+##db.jingyang.password=xdkj
+#db.jingyang.username=xdycb_zs
+#db.jingyang.password=whxdkj
 
 
 #汇川oracle
-db.huichuan.driver-class-name=oracle.jdbc.OracleDriver
-db.huichuan.type=com.alibaba.druid.pool.DruidDataSource
-db.huichuan.url=jdbc:oracle:thin:@//101.200.189.198:1521/xdkjys
-db.huichuan.username=xdycb_zs
-db.huichuan.password=whxdkj
+#db.huichuan.driver-class-name=oracle.jdbc.OracleDriver
+#db.huichuan.type=com.alibaba.druid.pool.DruidDataSource
+#db.huichuan.url=jdbc:oracle:thin:@//101.200.189.198:1521/xdkjys
+#db.huichuan.username=xdycb_zs
+#db.huichuan.password=whxdkj
+
+#通用oracle（同江、汇川、泾阳、巴里坤）
+db.common.driver-class-name=oracle.jdbc.OracleDriver
+db.common.type=com.alibaba.druid.pool.DruidDataSource
+db.common.url=jdbc:oracle:thin:@//123.56.85.128:1521/xdkj
+db.common.username=xdycb_zs
+db.common.password=whxdkj
 
 
 #监利sql server