Skip to content

A
asset-distribution
Commit b437b517 authored by 郑建's avatar 郑建
Browse files
Options

6.6-2

parent e8f68eb9
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 13 deletions
src/main/java/com/quantgroup/asset/distribution/controller/FundModuleController.java
View file @ b437b517
......@@ -22,6 +22,8 @@ import com.quantgroup.asset.distribution.util.fund.module.ChannelFundConfigUtil;
import lombok.extern.slf4j.Slf4j;
import javax.persistence.criteria.CriteriaBuilder;
/**
* 资方模块Controller
* @author liwenbin
......@@ -59,11 +61,11 @@ public class FundModuleController {
@RequestMapping("/get_channel_fund_configs")
public GlobalResponse getChannelFundConfigs(String bizChannel, Long fundId, Integer pageNum, Integer pageSize) {
return getChannelFundsConfigCommon(bizChannel, fundId, pageNum, pageSize, 1);
return getChannelFundsConfigCommon(bizChannel, fundId, pageNum, pageSize, 1,null);
}
@RequestMapping("/get_audit_infos")
public GlobalResponse getAuditInfos(String targetName, Integer auditStatus, Integer auditType, Integer auditTarget, String applyStartTime, String applyEndTime, String user, Integer pageNum, Integer pageSize,Integer sortMode) {
public GlobalResponse getAuditInfos(String targetName, Integer auditStatus, Integer auditType, Integer auditTarget, String applyStartTime, String applyEndTime, String user, Integer pageNum, Integer pageSize) {
log.info("资方模块接口, 获取审批列表开始, targetName : {}, auditStatus : {}, auditType : {}, auditTarget : {}， applyStartTime : {}, applyEndTime : {}, user : {}, pageNum : {}, pageSize : {}", targetName, auditStatus, auditType, auditTarget, applyStartTime, applyEndTime, user, pageNum, pageSize);
if (pageNum == null || pageSize == null) {
return GlobalResponse.create(FundModuleResponse.PAGEING_CONDITIONS_IS_EMPTY);
......@@ -72,7 +74,7 @@ public class FundModuleController {
return GlobalResponse.create(FundModuleResponse.USER_IS_EMPTY);
}
Stopwatch stopwatch = Stopwatch.createStarted();
GlobalResponse response = fundModuleService.getAuditInfos(targetName, auditStatus, auditType, auditTarget, applyStartTime, applyEndTime, user, pageNum, pageSize,sortMode);
GlobalResponse response = fundModuleService.getAuditInfos(targetName, auditStatus, auditType, auditTarget, applyStartTime, applyEndTime, user, pageNum, pageSize);
log.info("资方模块接口, 获取审批列表结束, targetName : {}, auditStatus : {}, auditType : {}, auditTarget : {}， applyStartTime : {}, applyEndTime : {}, user : {}, pageNum : {}, pageSize : {}， 耗时 : {}, response : {}", targetName, auditStatus, auditType, auditTarget, applyStartTime, applyEndTime, user, pageNum, pageSize, stopwatch.stop().elapsed(TimeUnit.MILLISECONDS), JSON.toJSONString(response));
return response;
}
......@@ -104,8 +106,8 @@ public class FundModuleController {
}
@RequestMapping("/get_channel_fund_configs_new")
public GlobalResponse getChannelFundConfigsNew(String bizChannel, Long fundId, Integer pageNum, Integer pageSize) {
return getChannelFundsConfigCommon(bizChannel, fundId, pageNum, pageSize, 2);
public GlobalResponse getChannelFundConfigsNew(String bizChannel, Long fundId, Integer pageNum, Integer pageSize,Integer sortMode) {
return getChannelFundsConfigCommon(bizChannel, fundId, pageNum, pageSize, 2,sortMode);
}
@RequestMapping("/find_channel_fund_config_new")
......@@ -169,7 +171,7 @@ public class FundModuleController {
return response;
}
private GlobalResponse getChannelFundsConfigCommon(String bizChannel, Long fundId, Integer pageNum, Integer pageSize, int oldOrNew) {
private GlobalResponse getChannelFundsConfigCommon(String bizChannel, Long fundId, Integer pageNum, Integer pageSize, int oldOrNew,Integer sortMode) {
log.info("资方模块接口, 查询渠道资方配置信息开始, bizChannel : {}, fundId : {}, pageNum : {}, pageSize : {}", bizChannel, fundId, pageNum, pageSize);
if (pageNum == null || pageSize == null) {
return GlobalResponse.create(FundModuleResponse.PAGEING_CONDITIONS_IS_EMPTY);
......@@ -180,7 +182,7 @@ public class FundModuleController {
// 老接口
response = fundModuleService.getChannelFundConfigs(bizChannel, fundId, pageNum, pageSize);
} else {
response = fundModuleService.getChannelFundConfigsNew(bizChannel, fundId, pageNum, pageSize);
response = fundModuleService.getChannelFundConfigsNew(bizChannel, fundId, pageNum, pageSize,sortMode);
}
log.info("资方模块接口, 查询渠道资方配置信息结束, bizChannel : {}, fundId : {}, pageNum : {}, pageSize : {}, 耗时 : {}, response : {}", bizChannel, fundId, pageNum, pageSize, stopwatch.stop().elapsed(TimeUnit.MILLISECONDS), JSON.toJSONString(response));
......
src/main/java/com/quantgroup/asset/distribution/service/funding/IFundModuleChannelFundConfigNewService.java
View file @ b437b517
......@@ -28,5 +28,7 @@ public interface IFundModuleChannelFundConfigNewService {
public void clearChannelFundConfigCache(String bizChannel);
Map<String,Object> getChannelFundConfigsByChannelOrFundIdOrdered(String bizChannel, Long fundId, Integer pageNum, Integer pageSize);
public List<String> getAllConfigChanels();
}
src/main/java/com/quantgroup/asset/distribution/service/funding/IFundModuleService.java
View file @ b437b517
......@@ -65,7 +65,7 @@ public interface IFundModuleService {
* @param pageSize
* @return
*/
public GlobalResponse getChannelFundConfigsNew(String bizChannel, Long fundId, Integer pageNum, Integer pageSize);
public GlobalResponse getChannelFundConfigsNew(String bizChannel, Long fundId, Integer pageNum, Integer pageSize,Integer sortMode);
/**
* 获取审批列表
......@@ -80,7 +80,7 @@ public interface IFundModuleService {
* @param pageSize
* @return
*/
public GlobalResponse getAuditInfos(String targetName, Integer auditStatus, Integer auditType, Integer auditTarget, String applyStartTime, String applyEndTime, String user, Integer pageNum, Integer pageSize,Integer sortMode);
public GlobalResponse getAuditInfos(String targetName, Integer auditStatus, Integer auditType, Integer auditTarget, String applyStartTime, String applyEndTime, String user, Integer pageNum, Integer pageSize);
/**
* 根据Id获取资方配置
......
src/main/java/com/quantgroup/asset/distribution/service/funding/impl/FundModuleChannelFundConfigNewServiceImpl.java
View file @ b437b517
......@@ -8,6 +8,7 @@ import com.quantgroup.asset.distribution.exception.QGExceptionType;
import com.quantgroup.asset.distribution.model.response.GlobalResponse;
import com.quantgroup.asset.distribution.service.approval.IApprovalLogService;
import com.quantgroup.asset.distribution.service.funding.IFundModuleChannelFundConfigNewService;
import com.quantgroup.asset.distribution.service.jpa.entity.ApprovalLog;
import com.quantgroup.asset.distribution.service.jpa.entity.FundModuleChannelFundConfig;
import com.quantgroup.asset.distribution.service.jpa.entity.FundModuleChannelFundConfigNew;
import com.quantgroup.asset.distribution.service.jpa.repository.IFundModuleChannelFundConfigNewRepository;
......@@ -30,6 +31,7 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author : Hyuk
......@@ -155,6 +157,15 @@ public class FundModuleChannelFundConfigNewServiceImpl implements IFundModuleCha
log.info("渠道资方配置缓存清除, bizChannel : {}", bizChannel);
}
@Override
public Map<String, Object> getChannelFundConfigsByChannelOrFundIdOrdered(String bizChannel, Long fundId, Integer pageNum, Integer pageSize) {
Map<String,Object> map = approvalLogService.getApprovalLogs(bizChannel,null,null,1,null,null,null,pageNum,pageSize,1);
List<ApprovalLog> logs = (List<ApprovalLog>) map.get("list");
List<Long> configIds = logs.stream().collect(ArrayList::new,(l,i)-> l.add(i.getAuditConfigId()),ArrayList::addAll);
return null;
}
@Override
public List<String> getAllConfigChanels() {
return fundModuleChannelFundConfigNewRepository.getAllBizChannel();
......
src/main/java/com/quantgroup/asset/distribution/service/funding/impl/FundModuleServiceImpl.java
View file @ b437b517
......@@ -139,8 +139,13 @@ public class FundModuleServiceImpl implements IFundModuleService{
@HandleException
@Override
public GlobalResponse getChannelFundConfigsNew(String bizChannel, Long fundId, Integer pageNum, Integer pageSize) {
Map<String, Object> result = fundModuleChannelFundConfigNewService.getChannelFundConfigsByChannelOrFundId(bizChannel, fundId, pageNum, pageSize);
public GlobalResponse getChannelFundConfigsNew(String bizChannel, Long fundId, Integer pageNum, Integer pageSize,Integer sortMode) {
Map<String, Object> result;
if (sortMode == 2){
result = fundModuleChannelFundConfigNewService.getChannelFundConfigsByChannelOrFundIdOrdered(bizChannel, fundId, pageNum, pageSize);
}else{
result = fundModuleChannelFundConfigNewService.getChannelFundConfigsByChannelOrFundId(bizChannel, fundId, pageNum, pageSize);
}
if (result == null || result.size() == 0) {
return GlobalResponse.create(FundModuleResponse.HAS_NO_DATA);
}
......@@ -150,8 +155,8 @@ public class FundModuleServiceImpl implements IFundModuleService{
@HandleException
@Override
public GlobalResponse getAuditInfos(String targetName, Integer auditStatus, Integer auditType, Integer auditTarget,
String applyStartTime, String applyEndTime, String user, Integer pageNum, Integer pageSize,Integer sortMode) {
Map<String, Object> result = approvalLogService.getApprovalLogs(targetName, auditStatus, auditType, auditTarget, applyStartTime, applyEndTime, user, pageNum, pageSize,sortMode);
String applyStartTime, String applyEndTime, String user, Integer pageNum, Integer pageSize) {
Map<String, Object> result = approvalLogService.getApprovalLogs(targetName, auditStatus, auditType, auditTarget, applyStartTime, applyEndTime, user, pageNum, pageSize,null);
if (result.size() == 0) {
return GlobalResponse.create(FundModuleResponse.HAS_NO_DATA);
}
......
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