测试补报

src/main/java/cn/quantgroup/report/config/datasource/baihang/BaiHangDataSourceConfig.java

@@ -44,7 +44,6 @@ public class BaiHangDataSourceConfig {
     public DataSource baihangDataSource() {
         HikariConfig config = new HikariConfig();
         config.setJdbcUrl("jdbc:mysql://172.30.5.27:7434?useUnicode=true&characterEncoding=UTF8&useSSL=false");
-
         config.setPassword("AHvVRT3eOGsm3tHS");
         config.setUsername("jian.zheng");
         log.info("百行征信数据库地址:{}", "jdbc:mysql://172.30.5.27:7434?useUnicode=true&characterEncoding=UTF8&useSSL=false");

src/main/java/cn/quantgroup/report/controller/external/RepairController.java

+package cn.quantgroup.report.controller.external;
+
+import cn.quantgroup.report.service.repair.RepairService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author jian.zheng
+ * @date 2021/3/2 - 18:43
+ **/
+@Slf4j
+@RestController("/zhudai")
+public class RepairController {
+
+
+    @Autowired
+    RepairService repairService;
+    /**
+     * 修复数据
+     * pageNo 从0开始
+     */
+    @RequestMapping("/repair")
+    public String mainLoanInfoSend(int pageNo,String type){
+        try{
+            repairService.doRepair(pageNo,type);
+            log.info("数据补报成功");
+            return "数据补报成功";
+        }catch(Exception e){
+            log.error("数据补报出现异常", e);
+            return "数据补报出现异常";
+        }
+    }
+
+}

src/main/java/cn/quantgroup/report/domain/baihang/RepairDataPO.java

+package cn.quantgroup.report.domain.baihang;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author jian.zheng
+ * @date 2021/3/2 - 18:35
+ **/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RepairDataPO {
+
+    private String id;
+
+    private Long planId;
+
+    private String loanId;
+
+    private Long userId;
+
+    private Long termNo;
+
+    private String repayStatus;
+
+    private Long overdueDay;
+
+    private Long loanApplicationHistoryId;
+
+    private Boolean flag;
+
+    private Date deadline;
+
+    private Date repaidAt;
+
+    private Date loanPaidAt;
+
+}

src/main/java/cn/quantgroup/report/mapper/baihang/RepairDataPOMapper.java

+package cn.quantgroup.report.mapper.baihang;
+
+import cn.quantgroup.report.domain.baihang.RepairDataPO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+/**
+ * @author jian.zheng
+ * @date 2021/3/2 - 19:05
+ **/
+@Repository
+public interface RepairDataPOMapper {
+
+    List<RepairDataPO> findByPage(@Param("start") int start, @Param("size") int size, @Param("fundingId") Integer fundingIds);
+
+}

src/main/java/cn/quantgroup/report/mapper/baihang/RepaymentLoanInfoSycMapper.java

+package cn.quantgroup.report.mapper.baihang;
+
+import cn.quantgroup.report.domain.baihang.BaiHangRepayment;
+import cn.quantgroup.report.domain.baihang.BaiHangUpDateRecord;
+import cn.quantgroup.report.domain.baihang.RepaymentInfoZhuDai;
+import cn.quantgroup.report.domain.baihang.RepaymentLoanInfoLog;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * -----------------------------------------------------------------------------<br>
+ * 描述: 还款信息查询 <br>
+ * 作者：yanhui.Hao <br>
+ * 时间：2019.11.06 <br>
+ * 授权: (C) Copyright (c) 2017 <br>
+ * 公司: 北京众信利民信息技术有限公司 <br>
+ * -----------------------------------------------------------------------------
+ */
+@Repository
+public interface RepaymentLoanInfoSycMapper {
+
+    RepaymentInfoZhuDai findLastOne(BaiHangRepayment baiHangRepayment);
+
+}

src/main/resources/cn/quantgroup/report/mapper/baihang/RepairDataPOMapper.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="cn.quantgroup.report.mapper.baihang.RepairDataPOMapper">
+
+  <resultMap id="BaseResultMap" type="cn.quantgroup.report.domain.baihang.RepairDataPO">
+    <result column="id" jdbcType="INTEGER" property="id" />
+    <result column="loan_id" jdbcType="VARCHAR" property="loanId" />
+    <result column="user_id" jdbcType="INTEGER" property="userId" />
+    <result column="term_no" jdbcType="INTEGER" property="termNo" />
+    <result column="repay_status" jdbcType="VARCHAR" property="repayStatus" />
+    <result column="overdue_day" jdbcType="INTEGER" property="overdueDay" />
+    <result column="loan_application_history_id" jdbcType="INTEGER" property="loanApplicationHistoryId" />
+    <result column="flag" jdbcType="BOOLEAN" property="flag" />
+    <result column="deadline" jdbcType="DATE" property="deadline" />
+    <result column="repaid_at" jdbcType="DATE" property="repaidAt" />
+    <result column="loan_paid_at" jdbcType="DATE" property="loanPaidAt" />
+  </resultMap>
+
+  <select id="findByPage" resultMap="BaseResultMap">
+    select  * from risk_datasource.repair_data where (repay_status = 'overdue_repay' or repay_status = 'normal')
+    and funding_corp_id = #{fundingId}
+    limit #{start},#{size};
+  </select>
+
+</mapper>
\ No newline at end of file

src/main/resources/cn/quantgroup/report/mapper/baihang/RepaymentLoanInfoSycMapper.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="cn.quantgroup.report.mapper.baihang.RepaymentLoanInfoSycMapper">
+
+
+  <resultMap id="RepaymetnLoanInfoResultMap" type="cn.quantgroup.report.domain.baihang.RepaymentInfoZhuDai">
+    <result column="reqID" jdbcType="VARCHAR" property="req_id"/>
+    <result column="recordId" jdbcType="VARCHAR" property="record_id"/>
+    <result column="opCode" jdbcType="VARCHAR" property="op_code"/>
+    <result column="uploadTs" jdbcType="VARCHAR" property="upload_ts"/>
+    <result column="loanId" jdbcType="VARCHAR" property="loan_id"/>
+    <result column="name" jdbcType="VARCHAR" property="name"/>
+    <result column="pid" jdbcType="VARCHAR" property="pid"/>
+    <result column="mobile" jdbcType="VARCHAR" property="mobile"/>
+    <result column="termNo" jdbcType="INTEGER" property="term_no"/>
+    <result column="termStatus" jdbcType="VARCHAR" property="term_status"/>
+    <result column="targetRepaymentDate" jdbcType="VARCHAR" property="target_repayment_date"/>
+    <result column="realRepaymentDate" jdbcType="VARCHAR" property="real_repayment_date"/>
+    <result column="plannedPayment" jdbcType="DECIMAL" property="planned_payment"/>
+    <result column="targetRepayment" jdbcType="DECIMAL" property="target_repayment"/>
+    <result column="realRepayment" jdbcType="DECIMAL" property="real_repayment"/>
+    <result column="overdueStatus" jdbcType="VARCHAR" property="overdue_status"/>
+    <result column="statusConfirmAt" jdbcType="VARCHAR" property="status_confirm_at"/>
+    <result column="overdueAmount" jdbcType="DECIMAL" property="overdue_amount"/>
+    <result column="remainingAmount" jdbcType="DECIMAL" property="remaining_amount"/>
+    <result column="loanStatus" jdbcType="INTEGER" property="loan_status"/>
+  </resultMap>
+
+  <resultMap id="RepaymentLoanInfoVoResultMapByBS" type="cn.quantgroup.report.domain.baihang.RepaymentLoanInfoLog">
+
+    <result column="reqID" jdbcType="VARCHAR" property="req_id"/>
+    <result column="opCode" jdbcType="VARCHAR" property="op_code"/>
+    <result column="uploadTs" jdbcType="VARCHAR" property="upload_ts"/>
+    <result column="loanId" jdbcType="VARCHAR" property="loan_id"/>
+    <result column="name" jdbcType="VARCHAR" property="name"/>
+    <result column="pid" jdbcType="VARCHAR" property="pid"/>
+    <result column="mobile" jdbcType="VARCHAR" property="mobile"/>
+    <result column="termNo" jdbcType="INTEGER" property="term_no"/>
+    <result column="termStatus" jdbcType="VARCHAR" property="term_status"/>
+    <result column="targetRepaymentDate" jdbcType="VARCHAR" property="target_repayment_date"/>
+    <result column="realRepaymentDate" jdbcType="VARCHAR" property="real_repayment_date"/>
+    <result column="plannedPayment" jdbcType="DECIMAL" property="planned_payment"/>
+    <result column="targetRepayment" jdbcType="DECIMAL" property="target_repayment"/>
+    <result column="realRepayment" jdbcType="DECIMAL" property="real_repayment"/>
+    <result column="overdueStatus" jdbcType="VARCHAR" property="overdue_status"/>
+    <result column="statusConfirmAt" jdbcType="VARCHAR" property="status_confirm_at"/>
+    <result column="overdueAmount" jdbcType="DECIMAL" property="overdue_amount"/>
+    <result column="remainingAmount" jdbcType="DECIMAL" property="remaining_amount"/>
+    <result column="loanStatus" jdbcType="INTEGER" property="loan_status"/>
+
+    <result column="recordId" jdbcType="VARCHAR" property="record_id"/>
+    <result column="id" jdbcType="DECIMAL" property="id"/>
+    <result column="enable" jdbcType="INTEGER" property="enable"/>
+    <result column="createdAt" jdbcType="VARCHAR" property="created_at"/>
+    <result column="updatedAt" jdbcType="VARCHAR" property="updated_at"/>
+  </resultMap>
+
+  <select id="findLastOne" parameterType="cn.quantgroup.report.domain.baihang.BaiHangRepayment" resultType="cn.quantgroup.report.domain.baihang.RepaymentInfoZhuDai">
+        select id, record_id, req_id, loan_id, term_no, status_confirm_at, term_status
+         from risk_datasource.repayment_loan_info_zhudai where loan_id = #{loanId} and term_no = #{termNo}
+         <!--2020.01.07 17:55 值针对当天，还款报了，逾期又有一条的情况 DATE_FORMAT(now(),'%Y-%m-%d') -->
+         <!-- 2020.02.06 16:14和广达保持一致  and  created_at >= #{sendDate} -->
+        limit 1;
+  </select>
+
+</mapper>
\ No newline at end of file

src/test/java/cn/quantgroup/report/BaihangReportApplicationTests.java

@@ -30,47 +30,28 @@ public class BaihangReportApplicationTests {
 	@Test
 	public void testRepair(){
 		Stopwatch stopwatch = Stopwatch.createStarted();
-		boolean flag = false;
+		doRepair("normal_lh");
+		doRepair("overdue_lh");
+		doRepair("normal");
+		doRepair("overdue");
+		log.info("本次测试总耗时 {}",stopwatch.elapsed(TimeUnit.MILLISECONDS));
+	}
+
+	private void doRepair(String type) {
+		Stopwatch stopwatch = Stopwatch.createStarted();
+		log.info("开始报送 {}",type);
+		boolean flag = true;
 		int i=0;
-		while (!flag){
+		while (flag){
 			try {
-				flag = service.doRepair(i,"overdue_lh");
+				flag = service.doRepair(i,type);
 			} catch (Exception e) {
 				log.info("overdue_lh 第 {} 页 异常",i,e);
+				continue;
 			}
 			i++;
 		}
-		i = 0;
-		flag = false;
-		while (!flag){
-			try {
-				flag = service.doRepair(i,"overdue");
-			} catch (Exception e) {
-				log.info("overdue 第 {} 页 异常",i,e);
-			}
-			i++;
-		}
-		i = 0;
-		flag = false;
-		while (!flag){
-			try {
-				flag = service.doRepair(i,"normal_lh");
-			} catch (Exception e) {
-				log.info("normal_lh 第 {} 页 异常",i,e);
-			}
-			i++;
-		}
-		i = 0;
-		flag = false;
-		while (!flag){
-			try {
-				flag = service.doRepair(i,"normal");
-			} catch (Exception e) {
-				log.info("normal 第 {} 页 异常",i,e);
-			}
-			i++;
-		}
-		log.info("本次测试总耗时 {}",stopwatch.elapsed(TimeUnit.MILLISECONDS));
+		log.info("本次测试 {} 总耗时 {}",type,stopwatch.elapsed(TimeUnit.MILLISECONDS));
 	}
 
 }