Skip to content

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

方法整理&优化

parent ff2b8787
Expand all Hide 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{
......
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