百行助贷-非联合贷实时，还款、逾期查询原始表，不查询bak临时表

src/main/java/cn/quantgroup/report/config/datasource/history/XyqbHistoryDataSourceConfig.java

@@ -4,9 +4,6 @@ package cn.quantgroup.report.config.datasource.history;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
-import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -14,8 +11,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.Primary;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 
@@ -30,11 +25,13 @@ public class XyqbHistoryDataSourceConfig {
 
     static final String PACKAGE = "cn.quantgroup.report.mapper.history";
 
-    //@Value("${baihang.mapper-locations}")
-    private String mapperLocations = "classpath:cn/quantgroup/report/mapper/history/*.xml";
+    @Value("${baihang.mapper-locations2}")
+    private String mapperLocations;
+    //private String mapperLocations = "classpath:cn/quantgroup/report/mapper/history/*.xml";
 
-    //@Value("${baihang.type-aliases-package}")
-    private String typeAliasesPackage = "cn.quantgroup.report.mapper.history";
+    @Value("${baihang.type-aliases-package2}")
+    private String typeAliasesPackage;
+    //private String typeAliasesPackage = "cn.quantgroup.report.mapper.history";
     
     @Value("${config-location}")
     private String configLocation;

src/main/java/cn/quantgroup/report/config/datasource/history/XyqbHistoryDataSourcePreperties.java

@@ -12,19 +12,21 @@ public class XyqbHistoryDataSourcePreperties {
 
     @Value("${db.driver}")
     private String driverClass;
-    @Value("${baihang.db.minPoolSize}")
+    @Value("${baihang.db.minPoolSize2}")
     private int minPoolSize;
-    @Value("${baihang.db.maxPoolSize}")
+    @Value("${baihang.db.maxPoolSize2}")
     private int maxPoolSize;
 
-    //@Value("${data.source.baihang.jdbcUrl}")
-    //private String jdbcUrl="jdbc:mysql://172.20.6.29:4010/rc_real_time_data_pool?useUnicode=true&characterEncoding=UTF8&useSSL=false";
-    private String jdbcUrl = "jdbc:mysql://172.20.6.21:4010/rc_real_time_data_pool?useUnicode=true&characterEncoding=UTF8&useSSL=false";
+    @Value("${data.source.baihang.jdbcUrl2}")
+    private String jdbcUrl;
+    //private String jdbcUrl = "jdbc:mysql://172.20.6.21:4010/rc_real_time_data_pool?useUnicode=true&characterEncoding=UTF8&useSSL=false";
 
-    //@Value("${data.source.baihang.username}")
-    private String username="xyqb_history_w";
+    @Value("${data.source.baihang.username2}")
+    private String username;
+    //private String username="xyqb_history_w";
 
-    //@Value("${data.source.baihang.password}")
-    private String password="KDb18asPu6iEz5lg";
+    @Value("${data.source.baihang.password2}")
+    private String password;
+    //private String password="KDb18asPu6iEz5lg";
 
 }

src/main/java/cn/quantgroup/report/job/QuantGroupZhuDaiReportToBaiHang.java

@@ -46,14 +46,15 @@ public class QuantGroupZhuDaiReportToBaiHang {
     private DingTalk dingTalk;
 
     @Async
-    //@Scheduled(cron = "0 0 05 * * ?")
+    @Scheduled(cron = "0 0 05 * * ?")
     public void startZhuDaiReport(){
         if(increment()){
             redisTemplate.expire(Constant.QG_ZHU_DAI_REPORT_LOCK_KEY, 10, TimeUnit.SECONDS);
 
             Stopwatch stopwatch = Stopwatch.createStarted();
 
-            boolean tableIsSyn = synLoanInfoHistoryTask.syn_historyAndplan_by_id();
+            //boolean tableIsSyn = synLoanInfoHistoryTask.syn_historyAndplan_by_id();
+            boolean tableIsSyn = true;
 
             if(tableIsSyn){
                 try{