Skip to content

B
baihang-report
Commit 44bdcc8e authored by haoyanhui's avatar haoyanhui
Browse files
Options

方法整理&优化

parent ff2b8787
Show whitespace changes
Inline Side-by-side
Showing with 105 additions and 97 deletions
src/main/java/cn/quantgroup/report/controller/external/ExZhuDaiBaiHangReSendController.java
View file @ 44bdcc8e
......@@ -43,11 +43,11 @@ public class ExZhuDaiBaiHangReSendController {
* 创建人: yanhui.Hao <br/>
* 创建时间: 2019.10.23 <br/>
*/
@RequestMapping("/manual/build/zhudai/stockLoanInfo")
/* @RequestMapping("/manual/build/zhudai/stockLoanInfo")
public GlobalResponse stockLoanInfoZhuDai(String startDate, String noEndDate){
String msg = baiHangZhuDaiService.stockLoanInfoZhuDai(startDate,noEndDate);
return GlobalResponse.generate(msg);
}
}*/
/**
* 描述: 百行-助贷还款&逾期存量数据 整理 <br/>
......@@ -56,11 +56,11 @@ public class ExZhuDaiBaiHangReSendController {
* 创建人: yanhui.Hao <br/>
* 创建时间: 2019.10.23 <br/>
*/
@RequestMapping("/manual/build/zhudai/stockRepayMentInfo")
/*@RequestMapping("/manual/build/zhudai/stockRepayMentInfo")
public GlobalResponse stockRepayMentInfoZhuDai(String startDate, String noEndDate){
String msg = baiHangZhuDaiService.stockRepayMentInfoZhuDai(startDate,noEndDate);
return GlobalResponse.generate(msg);
}
}*/
/**
* 描述: 百行-助贷申请存量数据 整理 <br/>
......@@ -69,12 +69,61 @@ public class ExZhuDaiBaiHangReSendController {
* 创建人: yanhui.Hao <br/>
* 创建时间: 2019.10.28 <br/>
*/
@RequestMapping("/manual/build/zhudai/stockApplyInfo")
/*@RequestMapping("/manual/build/zhudai/stockApplyInfo")
public GlobalResponse stockApplyInfoZhuDai(String startDate, String noEndDate){
String msg = baiHangZhuDaiService.stockApplyLoanInfoZhuDai(startDate,noEndDate);
return GlobalResponse.generate(msg);
}*/
//存量整理公共方法
@RequestMapping("/manual/build/zhuDaiStockSyn")
public String zhuDaiStockSyn(String type, String startDate, String noEndDate) {
if (StringUtils.isAnyBlank(type, startDate, noEndDate)) {
return "参数为空";
}
startDate=startDate+"T00:00:00";
noEndDate = noEndDate+"T00:00:00";
baiHangZhuDaiService.zhuDaiStockSyn(type, startDate, noEndDate);
return "请求type=" + type + ",startDate=" + startDate + ",noEndDate=" + noEndDate + ",调度结束";
}
//存量异步整理停止方法
@RequestMapping("/manual/build/zhuDaiStockStop")
public String zhuDaiStockStop(String type,String value) {
if (StringUtils.isAnyBlank(type)) {
return "参数为空";
}
boolean val = false;
if(StringUtils.isNotBlank(value) && "true".equals(value)){
val = true;
}
return baiHangZhuDaiService.zhuDaiStockStop(type,val);
}
//文件报送压缩加密、解密
@RequestMapping("/manual/dealWithFileCry")
public String dealWithFileCry(String filePath, String type) {
try {
//"2019-05-07T00:00:00"
if (StringUtils.isAnyBlank(filePath,type)) {
return "参数为空";
}
if ("zip".equalsIgnoreCase(type)) {
return baiHangZhuDaiService.fileUploadClient(filePath);
} else if ("unzip".equalsIgnoreCase(type)) {
return baiHangZhuDaiService.fileUploadValidationClient(filePath);
} else {
return "其他未知类型type=" + type;
}
} catch (Exception e) {
log.error("dealWithFileCry异常, {} , {} ", e.getMessage(), e);
return e.getMessage();
}
}
//---------------------------------------------------------------------
/**
......@@ -84,7 +133,7 @@ public class ExZhuDaiBaiHangReSendController {
* 创建人: yanhui.Hao <br/>
* 创建时间: 2019.10.29 <br/>
*/
@RequestMapping("/manual/mainApplySend")
@RequestMapping("/manual/buquan/mainApplySend")
public GlobalResponse mainApplySend(){
try{
baiHangZhuDaiService.sendHandApplyToBaiHang(true,null);
......@@ -102,7 +151,7 @@ public class ExZhuDaiBaiHangReSendController {
* 创建人: yanhui.Hao <br/>
* 创建时间: 2019.10.29 <br/>
*/
@RequestMapping("/manual/mainLoanInfoSend")
@RequestMapping("/manual/buquan/mainLoanInfoSend")
public GlobalResponse mainLoanInfoSend(){
try{
baiHangZhuDaiService.sendHandLoaInfoReportToBaiHang(true,null);
......@@ -120,7 +169,7 @@ public class ExZhuDaiBaiHangReSendController {
* 创建人: yanhui.Hao <br/>
* 创建时间: 2019.10.29 <br/>
*/
@RequestMapping("/manual/mainRepaymentLoanInfo")
@RequestMapping("/manual/buquan/mainRepaymentLoanInfo")
public GlobalResponse mainRepaymentLoanInfo(){
try{
baiHangZhuDaiService.sendHandRepaymentReportToBaiHang1(true,null);
......@@ -131,32 +180,14 @@ public class ExZhuDaiBaiHangReSendController {
}
}
//---------------------------------------------------------------------------
//test1.场景测试 数据进行脱敏
/* @RequestMapping("/test/dataTuoMin")
public String dataTuoMin(String type,String jsonFilePath) {
try{
return baiHangZhuDaiService.dataTuoMin(type,jsonFilePath);
}catch (Exception e){
log.error("dataTuoMin异常, {} , {} ", e.getMessage(), e);
return e.getMessage();
}
}*/
//test2.接口测试 手动调用
@RequestMapping("/test/apiSend")
public String apiSend(String type,String startDate, String endDate) {
try{
return baiHangZhuDaiService.apiSend(type,startDate,endDate);
}catch (Exception e){
log.error("dataTuoMin异常, {} , {} ", e.getMessage(), e);
return e.getMessage();
}
}
//test3.接口测试 手动调用
@RequestMapping("/test/scheduled")
/**
* 描述: 因数据同步失败，根据报送时间天，手动调用，报送一整天所有数据 <br/>
* 参数: [] <br/>
* 返回值: cn.quantgroup.report.response.GlobalResponse <br/>
* 创建人: yanhui.Hao <br/>
* 创建时间: 2019.10.29 <br/>
*/
@RequestMapping("/manual/scheduledSend")
public String scheduledSend(String type, String startDate, String endDate) {
try {
//"2019-05-07T00:00:00"
......@@ -193,58 +224,31 @@ public class ExZhuDaiBaiHangReSendController {
return type + "手动报送结束";
}
//test3.接口测试 手动调用
@RequestMapping("/manual/dealWithFileCry")
public String dealWithFileCry(String filePath, String type) {
try {
//"2019-05-07T00:00:00"
if (StringUtils.isAnyBlank(filePath,type)) {
return "参数为空";
}
if ("zip".equalsIgnoreCase(type)) {
return baiHangZhuDaiService.fileUploadClient(filePath);
} else if ("unzip".equalsIgnoreCase(type)) {
return baiHangZhuDaiService.fileUploadValidationClient(filePath);
//---------------------------------------------------------------------------
} else {
return "其他未知类型type=" + type;
}
} catch (Exception e) {
log.error("dealWithFileCry异常, {} , {} ", e.getMessage(), e);
//test1.场景测试 数据进行脱敏
/* @RequestMapping("/test/dataTuoMin")
public String dataTuoMin(String type,String jsonFilePath) {
try{
return baiHangZhuDaiService.dataTuoMin(type,jsonFilePath);
}catch (Exception e){
log.error("dataTuoMin异常, {} , {} ", e.getMessage(), e);
return e.getMessage();
}
}
@RequestMapping("/manual/build/zhuDaiStockSyn")
public String zhuDaiStockSyn(String type, String startDate, String noEndDate) {
if (StringUtils.isAnyBlank(type, startDate, noEndDate)) {
return "参数为空";
}
startDate=startDate+"T00:00:00";
noEndDate = noEndDate+"T00:00:00";
baiHangZhuDaiService.zhuDaiStockSyn(type, startDate, noEndDate);
return "请求type=" + type + ",startDate=" + startDate + ",noEndDate=" + noEndDate + ",调度结束";
}
}*/
@RequestMapping("/manual/build/zhuDaiStockStop")
public String zhuDaiStockStop(String type,String value) {
if (StringUtils.isAnyBlank(type)) {
return "参数为空";
}
boolean val = false;
if(StringUtils.isNotBlank(value) && "true".equals(value)){
val = true;
//test2.接口测试 手动调用
@RequestMapping("/test/apiSend")
public String apiSend(String type,String startDate, String endDate) {
try{
return baiHangZhuDaiService.apiSend(type,startDate,endDate);
}catch (Exception e){
log.error("dataTuoMin异常, {} , {} ", e.getMessage(), e);
return e.getMessage();
}
return baiHangZhuDaiService.zhuDaiStockStop(type,val);
}
//test
@RequestMapping("/test/bulidD3")
public String bulidD3(String type,String jsonFile) {
try{
......@@ -255,6 +259,7 @@ public class ExZhuDaiBaiHangReSendController {
}
}
//test
@RequestMapping("/test/bulidD2")
public GlobalResponse bulidD2(String jsonFile){
try{
......@@ -276,7 +281,7 @@ public class ExZhuDaiBaiHangReSendController {
}
}
//test
@RequestMapping("/test/bulidA1")
public GlobalResponse bulidA1(String jsonFile){
try{
......
src/main/java/cn/quantgroup/report/service/baihang/BaiHangZhuDaiService.java
View file @ 44bdcc8e
......@@ -188,8 +188,10 @@ public class BaiHangZhuDaiService {
Stopwatch sendWatch = Stopwatch.createStarted();
AtomicInteger atomicInteger = new AtomicInteger();
for (int i = 0; i < applyLoanInfos.size(); i++) {
String reqId_log = "";
try {
ApplyLoanInfoZhuDai applyLoanInfo = applyLoanInfos.get(i);
reqId_log = applyLoanInfo.getReqID();
applyLoanInfo.setName(interfaceUploadClient(applyLoanInfo.getName()));
applyLoanInfo.setMobile(interfaceUploadClient(applyLoanInfo.getMobile()));
applyLoanInfo.setPid(interfaceUploadClient(applyLoanInfo.getPid()));
......@@ -202,12 +204,12 @@ public class BaiHangZhuDaiService {
log.info("助贷贷款申请A1报送结果, param: {} , resultStr: {} ", JSON.toJSONString(applyLoanInfo), resultStr);
//if (Objects.isNull(resultStr) || !(resultStr.contains("queryHistory") && resultStr.contains("nonRevolvingLoan") && resultStr.contains("revolvingLoan"))) {
if (Objects.isNull(resultStr) || !"success".equalsIgnoreCase(JSON.parseObject(resultStr).getString("status"))) {
log.info("量化派助贷TO百行报送-贷款申请返回结果不正确, applyId: {} ", applyLoanInfo.getApplyId());
log.info("量化派助贷TO百行报送-贷款申请返回结果不正确, reqId_log: {} , applyId: {} ", reqId_log, applyLoanInfo.getApplyId());
} else {
atomicInteger.getAndIncrement();
}
} catch (Exception e) {
log.error("量化派助贷TO百行报送-贷款申请信息异常", e);
log.error("量化派助贷TO百行报送-贷款申请信息异常, reqId_log: {} ", reqId_log, e);
}
}
log.info("量化派助贷TO百行报送-贷款申请报送完成, 实际大小: {} , 报送成功大小: {} , 耗时: {} ", applyLoanInfos.size(), atomicInteger.get(), (sendWatch.stop().elapsed(TimeUnit.MILLISECONDS)/1000)+".s");
......@@ -255,7 +257,7 @@ public class BaiHangZhuDaiService {
loanInfozd_tmp.setTargetRepayDateList(String.join(",", targetRepaymentDayList));
//log.info("比较还款总期数&账单日列表totalTerm="+loanInfozd_tmp.getTotalTerm()+",targetRepaymentDayList size="+targetRepaymentDayList.size());
}else{
log.warn("比较还款总期数&账单日列表totalTerm="+loanInfozd_tmp.getTotalTerm()+",targetRepaymentDayList is null.");
log.warn("比较还款总期数&账单日列表loanInfoReqId: {} , totalTerm: {} , targetRepaymentDayList is null!", loanInfoReqId, loanInfozd_tmp.getTotalTerm());
}
String relationID = loanInfozd_tmp.getRelationID();
......@@ -271,7 +273,7 @@ public class BaiHangZhuDaiService {
loanInfozd_tmp.setRelationID("L"+tmp);
}
}else{
log.error("量化派助贷TO百行报送-放款返回结果不正确, 发现其他类型的relationID并且长度大于36,relationID="+relationID+",loanId="+loanInfozd_tmp.getLoanId());
log.warn("量化派助贷TO百行报送-放款返回结果不正确, 发现其他类型的relationID并且长度大于36, relationID: {} , loanInfoReqId: {} ", relationID, loanInfoReqId);
//continue;
loanInfozd_tmp.setRelationID("X"+relationID.substring(0,35));
}
......@@ -284,7 +286,7 @@ public class BaiHangZhuDaiService {
loanInfozd_tmp.setRecordId(id);
loanInfoDbMapper.saveLoanInfoRecordLog(loanInfozd_tmp);
}catch(Exception e){
log.error("量化派助贷TO百行报送-放款申请保存记录失败" , e);
log.error("量化派助贷TO百行报送-放款申请保存记录失败，loanInfoReqId: {} ", loanInfoReqId, e);
}
loanInfozd_tmp.setRecordId(null);
loanInfozd_tmp.setReqID(id);
......@@ -301,13 +303,13 @@ public class BaiHangZhuDaiService {
String resultStr = iHttpService.postBaiHang(baiHangLoanInfoUrl, getHeader(), JSON.toJSONString(loanInfo));
log.info("助贷放款用户报送结果, param: {} , resultStr: {} ", JSON.toJSONString(loanInfo), resultStr);
if (Objects.isNull(resultStr) || !"success".equalsIgnoreCase(JSON.parseObject(resultStr).getString("status"))) {
log.info("量化派助贷TO百行报送-放款返回结果不正确, recordId: {} , loanId: {} , bean: {} ", id, loanInfo.getLoanId(), JSON.toJSONString(loanInfo));
log.info("量化派助贷TO百行报送-放款返回结果不正确, loanInfoReqId:{} , recordId: {} , loanId: {} , bean: {} ", loanInfoReqId, id, loanInfo.getLoanId(), JSON.toJSONString(loanInfo));
loanInfoDbMapper.updateCurrentRecordEnableFalce(BaiHangUpDateRecord.builder().enable("0").recordId(id).build());
} else {
atomicInteger.getAndIncrement();
}
} catch (Exception e) {
log.error("量化派助贷TO百行报送-放款信息异常, recordId: {} , loanId: {} ", id, loanInfozd_tmp.getLoanId(), e);
log.error("量化派助贷TO百行报送-放款信息异常, loanInfoReqId: {} , recordId: {} , loanId: {} ", loanInfozd_tmp.getReqID(), id, loanInfozd_tmp.getLoanId(), e);
}
}
}catch(Exception e){
......@@ -318,7 +320,7 @@ public class BaiHangZhuDaiService {
/**
* 助贷模式-实时还款&实时逾期还款数据报送
* 助贷模式-实时还款&实时逾期还款D3数据报送
* Scheduled 还款&逾期（百行征信报送）
*/
public void sendZhuDaiRepaymentToBaiHang(String startnyr, String endnyr) {
......@@ -361,10 +363,11 @@ public class BaiHangZhuDaiService {
for (int i = 0; i < repaymentLoanInfos.size(); i++) {
RepaymentInfoZhuDai repaymentLoanInfo = repaymentLoanInfos.get(i);
String id = "";
String reqId_log = repaymentLoanInfo.getReqID();
try {
RepaymentInfoZhuDai repaymentLoanInfo1 = repaymentLoanInfoDbMapper.findLastOne(BaiHangRepayment.builder().loanId(repaymentLoanInfo.getLoanId()).termNo(repaymentLoanInfo.getTermNo()).build());
if (j > 0 && Objects.nonNull(repaymentLoanInfo1)) {
log.info("量化派助贷TO百行报送-实时还款逾期跳过报送, startnyr: {} , endnyr: {} , bean: {} ", startnyr, endnyr, JSON.toJSONString(repaymentLoanInfo1));
log.info("量化派助贷TO百行报送-实时还款逾期跳过报送, reqId_log: {} , loanId: {} , termNo: {} , startnyr: {} , endnyr: {} , bean: {} ", reqId_log, repaymentLoanInfo.getLoanId(), repaymentLoanInfo.getTermNo(), startnyr, endnyr, JSON.toJSONString(repaymentLoanInfo1));
continue;
}
......@@ -373,7 +376,7 @@ public class BaiHangZhuDaiService {
repaymentLoanInfo.setRecordId(id);
repaymentLoanInfoDbMapper.saveRepaymentLoanInfoLog(repaymentLoanInfo);
} catch (Exception e) {
log.error("量化派助贷TO百行报送-实时还款保存记录异常",e);
log.error("量化派助贷TO百行报送-实时还款保存记录异常, reqId_log: {} , loanId: {} , termNo: {} ", reqId_log, repaymentLoanInfo.getLoanId(), repaymentLoanInfo.getTermNo(), e);
}
repaymentLoanInfo.setRecordId(null);
repaymentLoanInfo.setReqID(id);
......@@ -385,13 +388,13 @@ public class BaiHangZhuDaiService {
String resultStr = iHttpService.postBaiHang(baiHangRepayMentLoanInfoUrl, getHeader(), JSON.toJSONString(repaymentLoanInfo));
log.info("助贷还款用户报送结果, param: {} , resultStr: {} ", JSON.toJSONString(repaymentLoanInfo), resultStr);
if (Objects.isNull(resultStr) || !"success".equalsIgnoreCase(JSON.parseObject(resultStr).getString("status"))) {
log.info("量化派助贷TO百行报送-还款返回结果不正确, 开始时间: {} , 结束时间: {} , recordId: {} , loanId: {} , bean: {} ", startnyr, endnyr, id, repaymentLoanInfo.getLoanId(), JSON.toJSONString(repaymentLoanInfo));
log.info("量化派助贷TO百行报送-还款返回结果不正确, 开始时间: {} , 结束时间: {} , reqId_log: {} , recordId: {} , loanId: {} , bean: {} ", startnyr, endnyr, reqId_log, id, repaymentLoanInfo.getLoanId(), JSON.toJSONString(repaymentLoanInfo));
repaymentLoanInfoDbMapper.updateCurrentRecordEnableFalse(BaiHangUpDateRecord.builder().enable("0").recordId(id).build());
} else {
atomicInteger.getAndIncrement();
}
} catch (Exception e) {
log.error("量化派助贷TO百行报送-还款信息异常, recordId: {} , loanId: {} ", id, repaymentLoanInfo.getLoanId(), e);
log.error("量化派助贷TO百行报送-还款信息异常, reqId_log: {} , recordId: {} , loanId: {} ", reqId_log, id, repaymentLoanInfo.getLoanId(), e);
}
}
log.info("量化派助贷TO百行报送-还款申请完成 J: {} , 开始时间: {} , 结束时间: {} , 实际大小: {} , 报送成功大小: {} , 耗时: {} ", j, startnyr, endnyr, repaymentLoanInfos.size(), atomicInteger.get(), (sendWatch.stop().elapsed(TimeUnit.MILLISECONDS)/1000)+".s");
......@@ -505,7 +508,7 @@ public class BaiHangZhuDaiService {
loanInfozd_tmp.setRelationID("L"+tmp);
}
}else{
log.error("众信利民助贷模式TO百行手动报送-数据不正确, 发现其他类型的relationID并且长度大于36,relationID="+relationID+",loanId="+loanInfozd_tmp.getLoanId());
log.warn("众信利民助贷模式TO百行手动报送-数据不正确, 发现其他类型的relationID并且长度大于36, relationID: {} , loanInfoReqId: {} ", relationID, loanInfoReqId);
//continue;
loanInfozd_tmp.setRelationID("X"+relationID.substring(0,35));
}
......@@ -516,7 +519,7 @@ public class BaiHangZhuDaiService {
loanInfozd_tmp.setRecordId(loanInfozd_tmp.getReqID());
loanInfoDbMapper.saveLoanInfoRecordLog(loanInfozd_tmp);
}catch(Exception e){
log.error("众信利民助贷模式TO百行手动报送-放款申请保存记录失败" , e);
log.error("众信利民助贷模式TO百行手动报送-放款申请保存记录失败, loanInfoReqId: {} ", loanInfoReqId, e);
}
loanInfozd_tmp.setRecordId(null);
......@@ -530,7 +533,7 @@ public class BaiHangZhuDaiService {
loanInfo.setPid(interfaceUploadClient(loanInfo.getPid()));
String resultStr = iHttpService.postBaiHang(baiHangLoanInfoUrl, getHeader(), JSON.toJSONString(loanInfo));
log.info("众信利民助贷模式TO百行手动报送放款记录 loanId: {} , bean: {} , result: {} ", loanInfo.getLoanId(), JSON.toJSONString(loanInfo), resultStr);
log.info("众信利民助贷模式TO百行手动报送放款记录 loanInfoReqId: {} , loanId: {} , bean: {} , result: {} ", loanInfoReqId, loanInfo.getLoanId(), JSON.toJSONString(loanInfo), resultStr);
//存量测试手动整理
......@@ -585,7 +588,7 @@ public class BaiHangZhuDaiService {
repaymentLoanInfo.setRecordId(repaymentLoanInfo.getReqID());
repaymentLoanInfoDbMapper.saveRepaymentLoanInfoLog(repaymentLoanInfo);
} catch (Exception e) {
log.error("众信利民助贷模式TO百行手动报送还款保存记录异常",e);
log.error("众信利民助贷模式TO百行手动报送还款保存记录异常, reqId_log: {} , loanId: {} , termNo: {} ", repaymentLoanInfo.getReqID(), repaymentLoanInfo.getLoanId(), repaymentLoanInfo.getTermNo() ,e);
}
repaymentLoanInfo.setRecordId(null);
......@@ -1297,7 +1300,7 @@ public class BaiHangZhuDaiService {
return type+"手动报送结束";
}
//test3
@Async
public void zhuDaiStockSyn(String type, String startDate, String noEndDate) {
//"2019-05-07T00:00:00"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment