增加上报数据源

src/main/java/com/config/DataDataSourceConfig.java

+package com.config;
+
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+
+import javax.sql.DataSource;
+
+/**
+ * @author ：dongjianhua
+ * @date ：Created in 2019/10/29 19:44
+ * @description：数据源配置
+ * @modified By：
+ * @version: 1.0
+ */
+@Configuration
+@MapperScan(basePackages = "com.mapper.data",sqlSessionFactoryRef = "dataSqlSessionFactory")
+public class DataDataSourceConfig {
+
+    @Value("${db.driver}")
+    private String dataDriverClass;
+    @Value("${data.db.minPoolSize}")
+    private int dataMinPoolSize;
+    @Value("${data.db.maxPoolSize}")
+    private int dataMaxPoolSize;
+    @Value("${data.source.data.jdbcUrl}")
+    private String dataJdbcUrl;
+    @Value("${data.source.data.username}")
+    private String dataUsername;
+    @Value("${data.source.data.password}")
+    private String dataPassword;
+    @Value("${mapper.data.location}")
+    private String dataMapperLocations;
+    @Value("${config-location}")
+    private String mapperConfig;
+
+    @Bean(name = "dataDataSource")
+    public DataSource dataDatasource() {
+        HikariConfig dataconfig = new HikariConfig();
+        dataconfig.setJdbcUrl(dataJdbcUrl);
+        dataconfig.setUsername(dataUsername);
+        dataconfig.setPassword(dataPassword);
+        dataconfig.setMinimumIdle(dataMinPoolSize);
+        dataconfig.setMaximumPoolSize(dataMaxPoolSize);
+        return new HikariDataSource(dataconfig);
+    }
+
+    @Bean
+    public DataSourceTransactionManager reporDatasourceTransactionManager(@Qualifier("dataDataSource") DataSource datasource ) {
+        return  new DataSourceTransactionManager(datasource);
+    }
+
+    @Bean(name = "dataSqlSessionFactory")
+    public SqlSessionFactory dataSqlSessionFactory(@Qualifier("dataDataSource") DataSource dataSource) throws Exception {
+        final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+        sessionFactory.setDataSource(dataSource);
+        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
+                .getResources(dataMapperLocations));
+//        sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
+        sessionFactory.setConfigLocation(new PathMatchingResourcePatternResolver()
+                .getResource(mapperConfig));
+        return sessionFactory.getObject();
+    }
+}

src/main/java/com/config/ReportDataSourceConfig.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 
@@ -22,7 +23,7 @@ import javax.sql.DataSource;
  * @version: 1.0
  */
 @Configuration
-@MapperScan(basePackages = "com.mapper.report")
+@MapperScan(basePackages = "com.mapper.report",sqlSessionFactoryRef = "sqlSessionFactory")
 public class ReportDataSourceConfig {
 
     @Value("${db.driver}")
@@ -43,6 +44,7 @@ public class ReportDataSourceConfig {
     private String mapperConfig;
 
     @Bean(name = "reportDataSource")
+    @Primary
     public DataSource reportDatasource() {
         HikariConfig config = new HikariConfig();
         config.setJdbcUrl(jdbcUrl);

src/main/java/com/mapper/data/DataMapper.java

+package com.mapper.data;
+
+import com.entity.report.ReportRecord;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface DataMapper {
+    //获取每日放款数据
+    List<Map<String,Object>>getLoanDayData();
+    //获取每日还款数据
+    List<Map<String,Object>>getRepayDayData();
+    //获取每日逾期数据
+    List<Map<String,Object>>getOverDayData();
+    //获取上月逾期数据
+    List<Map<String,Object>>getOverMonthData();
+}
\ No newline at end of file

src/main/java/com/mapper/report/ReportRecordMapper.java

@@ -16,12 +16,5 @@ public interface ReportRecordMapper {
     int updateByPrimaryKeySelective(ReportRecord record);
     int updateByPrimaryKeySelectiveByFileName(ReportRecord record);
     int updateByPrimaryKey(ReportRecord record);
-    //获取每日放款数据
-    List<Map<String,Object>>getLoanDayData();
-    //获取每日还款数据
-    List<Map<String,Object>>getRepayDayData();
-    //获取每日逾期数据
-    List<Map<String,Object>>getOverDayData();
-    //获取上月逾期数据
-    List<Map<String,Object>>getOverMonthData();
+
 }
\ No newline at end of file

src/main/java/com/service/report/impl/IReportServiceImpl.java

@@ -9,6 +9,7 @@ import com.emums.InfoType;
 import com.emums.PathType;
 import com.entity.FileEntry;
 import com.entity.report.ReportRecord;
+import com.mapper.data.DataMapper;
 import com.mapper.report.ReportRecordMapper;
 import com.service.report.ReportService;
 import com.sun.jersey.api.client.ClientResponse;
@@ -48,6 +49,8 @@ public class IReportServiceImpl implements ReportService {
     @Autowired
     private ReportRecordMapper reportRecordMapper;
     @Autowired
+    private DataMapper dataMapper;
+    @Autowired
     private ReportConfig reportConfig;
     @Autowired
     private Utils utils;
@@ -353,7 +356,7 @@ public class IReportServiceImpl implements ReportService {
     public void reportLoanDayData() {
         try {
             log.info("开始上报T+1放款数据");
-            List<Map<String, Object>> loanDayData = reportRecordMapper.getLoanDayData();
+            List<Map<String, Object>> loanDayData = dataMapper.getLoanDayData();
             log.info("获取T+1放款数据条数 size : {} ", loanDayData.size());
             FileEntry fileEntry = creatZipFile(loanDayData, InfoType.CREDIT_FINANCING_INFO, BusinessType.LOAN);
             log.info("放款数据生成文件位置fileEntry : {}", fileEntry);
@@ -372,7 +375,7 @@ public class IReportServiceImpl implements ReportService {
     public void reportRepayDayData() {
         try {
             log.info("开始上报T+1还款数据");
-            List<Map<String, Object>> repayDayData = reportRecordMapper.getRepayDayData();
+            List<Map<String, Object>> repayDayData = dataMapper.getRepayDayData();
             log.info("获取T+1还款数据条数 size : {} ", repayDayData.size());
             FileEntry fileEntry = creatZipFile(repayDayData, InfoType.CREDIT_FINANCING_INFO, BusinessType.REPAYMENT);
             log.info("还款数据生成文件位置fileEntry : {}", fileEntry);
@@ -392,7 +395,7 @@ public class IReportServiceImpl implements ReportService {
     public void reportOverDayData() {
         try {
             log.info("开始上报T+1逾期数据");
-            List<Map<String, Object>> overDayData = reportRecordMapper.getOverDayData();
+            List<Map<String, Object>> overDayData = dataMapper.getOverDayData();
             log.info("获取T+1逾期数据条数 size : {} ", overDayData.size());
             FileEntry fileEntry = creatZipFile(overDayData, InfoType.CREDIT_FINANCING_INFO, BusinessType.OVERDUE);
             log.info("逾期数据生成文件位置fileEntry : {}", fileEntry);
@@ -412,7 +415,7 @@ public class IReportServiceImpl implements ReportService {
     public void reportOverMonthData() {
         try {
             log.info("开始上报月逾期数据");
-            List<Map<String, Object>> overMonthData = reportRecordMapper.getOverMonthData();
+            List<Map<String, Object>> overMonthData = dataMapper.getOverMonthData();
             log.info("获取月逾期数据条数 size : {} ", overMonthData.size());
             FileEntry fileEntry = creatZipFile(overMonthData, InfoType.CREDIT_FINANCING_INFO, BusinessType.OVERDUE);
             log.info("月逾期数据生成文件位置fileEntry : {}", fileEntry);

src/main/resources/mybatis/data/DataMapper.xml

+<?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.mapper.data.DataMapper">
+    <!-- 获取日放款数据 -->
+    <select id="getLoanDayData" resultType="map">
+      SELECT * from xyqb_i_repayment_record LIMIT 10
+  </select>
+    <!-- 获取日放款数据 -->
+    <select id="getRepayDayData" resultType="map">
+
+    </select>
+    <!-- 获取日逾期数据 -->
+    <select id="getOverDayData" resultType="map">
+
+    </select>
+    <!-- 获取月逾期数据 -->
+    <select id="getOverMonthData" resultType="map">
+
+    </select>
+</mapper>
\ No newline at end of file

src/main/resources/mybatis/report/ReportRecordMapper.xml

@@ -179,20 +179,5 @@
     createtime < date_add(NOW(),interval -10 minute)
     and issearch !=1
   </select>
-<!-- 获取日放款数据 -->
-<select id="getLoanDayData" resultType="map">
 
-</select>
- <!-- 获取日放款数据 -->
-<select id="getRepayDayData" resultType="map">
-
-</select>
-  <!-- 获取日逾期数据 -->
-<select id="getOverDayData" resultType="map">
-
-</select>
-<!-- 获取月逾期数据 -->
-<select id="getOverMonthData" resultType="map">
-
-</select>
 </mapper>
\ No newline at end of file