lin преди 4 години
родител
ревизия
252cd7ffb6

+ 2 - 2
src/main/java/com/zcxk/meterreadingsystemv2/controller/TestController.java

@@ -80,13 +80,13 @@ public class TestController {
         return new AjaxMessage<>(ResultStatus.OK);
     }
 
-    @GetMapping("suibinTasks")
+    /*@GetMapping("suibinTasks")
     @ApiOperation(value = "执行绥滨定时任务")
     public AjaxMessage suibinTasks(
     ) {
         meterReadingScheduleTask.suibinTasks();
         return new AjaxMessage<>(ResultStatus.OK);
-    }
+    }*/
 
     @GetMapping("suiyangTasks")
     @ApiOperation(value = "执行绥阳定时任务")

+ 2 - 2
src/main/java/com/zcxk/meterreadingsystemv2/kafka/AddAccountReceiver.java

@@ -63,7 +63,7 @@ public class AddAccountReceiver {
                 }
 
                 //绥滨自来水公司立户
-                else if("prd".equals(acceptData.getActive()) && acceptData.getCustomerId() == 33){
+                /*else if("prd".equals(acceptData.getActive()) && acceptData.getCustomerId() == 33){
                     DynamicDataSourceContextHolder.setDataSourceKey("suibin");
                     log.info("=====service当前连接的数据库是:" + DynamicDataSourceContextHolder.getDataSourceKey());
 
@@ -86,7 +86,7 @@ public class AddAccountReceiver {
                             ycblhbMapper.insertSelective(ycblhb);
                         }
                     }
-                }
+                }*/
 
                 //同江供水有限公司立户
                 else if("prd".equals(acceptData.getActive()) && acceptData.getCustomerId() == 57){

+ 2 - 2
src/main/java/com/zcxk/meterreadingsystemv2/kafka/ReplaceMaterReceiver.java

@@ -146,7 +146,7 @@ public class ReplaceMaterReceiver {
 
 
             }
-            if("prd".equals(data.getActive()) && data.getCustomerId() == 33){
+            /*if("prd".equals(data.getActive()) && data.getCustomerId() == 33){
                 //绥滨
                 DynamicDataSourceContextHolder.setDataSourceKey("suibin");
                 log.info("=====service当前连接的数据库是:" + DynamicDataSourceContextHolder.getDataSourceKey());
@@ -171,7 +171,7 @@ public class ReplaceMaterReceiver {
                 }else {
                     log.info("user not find");
                 }
-            }
+            }*/
             if("prd".equals(data.getActive()) && data.getCustomerId() == 25){
                 //萝北
                 DynamicDataSourceContextHolder.setDataSourceKey("lb");

+ 2 - 2
src/main/java/com/zcxk/meterreadingsystemv2/kafka/kafkaController.java

@@ -123,10 +123,10 @@ public class kafkaController {
                 }
 
                 //绥滨自来水公司立户
-                else if("prd".equals(acceptData.getActive()) && acceptData.getCustomerId() == 33){
+                /*else if("prd".equals(acceptData.getActive()) && acceptData.getCustomerId() == 33){
                     DynamicDataSourceContextHolder.setDataSourceKey("suibin");
                     log.info("=====service当前连接的数据库是:" + DynamicDataSourceContextHolder.getDataSourceKey());
-                }
+                }*/
                 else {
                     return "ok";
                 }

+ 3 - 3
src/main/java/com/zcxk/meterreadingsystemv2/scheduled/MeterReadingScheduleTask.java

@@ -428,8 +428,8 @@ public class MeterReadingScheduleTask {
     /**
      * 绥滨 每月27号推送
      */
-    @Scheduled(cron = "0 20 7 27 * ?")
-    public void suibinTasks() {
+    //@Scheduled(cron = "0 20 7 27 * ?")
+    /*public void suibinTasks() {
         log.info("开始执行绥滨定时任务");
         if(!"prd".equals(active)){
             return;
@@ -519,7 +519,7 @@ public class MeterReadingScheduleTask {
         }
 
         log.info("结束执行定时任务");
-    }
+    }*/
 
 
     /**

+ 6 - 6
src/main/resources/application-prd.properties

@@ -2,7 +2,7 @@ server.port=8328
 
 #日志配置
 logging.level.root=info
-logging.file.path=/opt/prd/meter-reading-system-v2/logs
+logging.file.path=/mnt/prd/meter-reading-system-v2/logs
 
 #spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
 #spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
@@ -34,11 +34,11 @@ db.lb.username=lbycb
 db.lb.password=lbzls
 
 #绥滨oracle
-db.suibin.driver-class-name=oracle.jdbc.OracleDriver
-db.suibin.type=com.alibaba.druid.pool.DruidDataSource
-db.suibin.url=jdbc:oracle:thin:@//114.135.61.186:31521/suibin
-db.suibin.username=suibinycb
-db.suibin.password=Suibinycb_2020
+#db.suibin.driver-class-name=oracle.jdbc.OracleDriver
+#db.suibin.type=com.alibaba.druid.pool.DruidDataSource
+#db.suibin.url=jdbc:oracle:thin:@//114.135.61.186:31521/suibin
+#db.suibin.username=suibinycb
+#db.suibin.password=Suibinycb_2020
 
 #同江oracle
 #db.tongjiang.driver-class-name=oracle.jdbc.OracleDriver