Merge remote-tracking branch 'origin/uat_code' into uat_code
This commit is contained in:
@ -6,6 +6,9 @@ package com.chinaunicom.mall.ebtp.extend.feign.client;
|
||||
* @date 2021/08/18
|
||||
*/
|
||||
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
|
||||
import com.chinaunicom.mall.ebtp.common.log.OperationLogDetail;
|
||||
import com.chinaunicom.mall.ebtp.common.log.enums.EbtpLogBusinessModule;
|
||||
import com.chinaunicom.mall.ebtp.common.log.enums.EbtpLogType;
|
||||
import com.chinaunicom.mall.ebtp.extend.feign.client.factory.RiskManageRegulationServiceFallbackFactory;
|
||||
import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulation;
|
||||
import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulationGroupApply;
|
||||
@ -26,6 +29,7 @@ public interface RiskManageRegulationService {
|
||||
* @return 返回结果
|
||||
*/
|
||||
@PostMapping({"/findRegulationParams"})
|
||||
@OperationLogDetail(businessModule = EbtpLogBusinessModule.OTHER,operationType = EbtpLogType.SELECT,detail = "风控中心- 查询规则模型列表接口")
|
||||
BaseResponse<List<RiskManageRegulationGroupOuterVO>> findRegulationParams(@RequestBody RiskManageRegulation riskManageRegulation);
|
||||
|
||||
/**
|
||||
@ -34,5 +38,6 @@ public interface RiskManageRegulationService {
|
||||
* @return 返回结果
|
||||
*/
|
||||
@PostMapping({"/applyRegulation"})
|
||||
@OperationLogDetail(businessModule = EbtpLogBusinessModule.OTHER,operationType = EbtpLogType.SELECT,detail = "风控中心- 执行风控规则")
|
||||
BaseResponse<Object> applyRegulation(@RequestBody RiskManageRegulationGroupApply regulationGroupApply);
|
||||
}
|
||||
|
@ -1,6 +1,9 @@
|
||||
package com.chinaunicom.mall.ebtp.extend.riskmanage.controller;
|
||||
|
||||
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
|
||||
import com.chinaunicom.mall.ebtp.common.log.OperationLogDetail;
|
||||
import com.chinaunicom.mall.ebtp.common.log.enums.EbtpLogBusinessModule;
|
||||
import com.chinaunicom.mall.ebtp.common.log.enums.EbtpLogType;
|
||||
import com.chinaunicom.mall.ebtp.extend.feign.client.RiskManageRegulationService;
|
||||
import com.chinaunicom.mall.ebtp.extend.feign.entity.risk.RiskManageRegulationGroupOuterVO;
|
||||
import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulation;
|
||||
@ -58,6 +61,7 @@ public class RiskManageController {
|
||||
* @return 返回结果
|
||||
*/
|
||||
@PostMapping({"/findApplyRegulation"})
|
||||
@OperationLogDetail(businessModule = EbtpLogBusinessModule.OTHER,operationType = EbtpLogType.SELECT,detail = "风控中心-风险管控规则调用")
|
||||
public BaseResponse<Object> findApplyRegulation(@RequestBody RiskManageRegulationVO riskManageRegulation){
|
||||
return riskManageService.findApplyRegulation(riskManageRegulation);
|
||||
}
|
||||
|
@ -17,7 +17,7 @@ import java.util.List;
|
||||
@ApiModel("风控规则对象")
|
||||
public class RiskManageRegulationGroupApply implements Serializable {
|
||||
|
||||
@ApiModelProperty("业务id")
|
||||
@ApiModelProperty("业务单据号(例如:询价单号)")
|
||||
private String businessId;
|
||||
|
||||
@ApiModelProperty("调用模块类别编号")
|
||||
@ -37,6 +37,18 @@ public class RiskManageRegulationGroupApply implements Serializable {
|
||||
|
||||
@ApiModelProperty("调用节点名称")
|
||||
private String callPointName;
|
||||
@ApiModelProperty("业务单据主键(例如:询价单id)")
|
||||
private String businessPrikey;
|
||||
@ApiModelProperty("业务标题(例如:询价单标题)")
|
||||
private String businessTitle;
|
||||
@ApiModelProperty("省ou")
|
||||
private String provinceOu;
|
||||
@ApiModelProperty("省名")
|
||||
private String provinceName;
|
||||
@ApiModelProperty("市ou")
|
||||
private String cityOu;
|
||||
@ApiModelProperty("市名")
|
||||
private String cityName;
|
||||
|
||||
@ApiModelProperty("应用规则所需的参数")
|
||||
private List<RiskManageRegulationGroupOuterVO> outerVoList;
|
||||
|
@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* 风险管控接口实现
|
||||
@ -43,9 +44,20 @@ public class RiskManageServiceImpl implements IRiskManageService {
|
||||
|
||||
//查询模型信息
|
||||
BaseResponse<List<RiskManageRegulationGroupOuterVO>> regulationParams = regulationService.findRegulationParams(regulation);
|
||||
|
||||
log.info("调用山分风控接口参数:regulationParams={}", JsonUtils.objectToJson(regulationParams));
|
||||
RiskManageRegulationGroupApply regulationGroupApply = new RiskManageRegulationGroupApply();
|
||||
regulationGroupApply.setBusinessId(params.get("id").toString());
|
||||
//id
|
||||
regulationGroupApply.setBusinessPrikey(Objects.isNull(params.get("id"))?"":params.get("id").toString());
|
||||
//项目编号
|
||||
regulationGroupApply.setBusinessId(params.get("businessId").toString());
|
||||
//项目名称(标段名称)
|
||||
regulationGroupApply.setBusinessTitle(params.get("businessTitle").toString());
|
||||
//项目所属省分
|
||||
regulationGroupApply.setProvinceOu(Objects.isNull(params.get("provinceOu"))?"":params.get("provinceOu").toString());
|
||||
regulationGroupApply.setProvinceName(Objects.isNull(params.get("provinceName"))?"":params.get("provinceName").toString());
|
||||
//项目所属市
|
||||
regulationGroupApply.setCityOu(Objects.isNull(params.get("cityOu"))?"":params.get("cityOu").toString());
|
||||
regulationGroupApply.setCityName(Objects.isNull(params.get("cityName"))?"":params.get("cityName").toString());
|
||||
//模块分类
|
||||
regulationGroupApply.setCallCategoryCode(regulation.getCallCategory());
|
||||
regulationGroupApply.setCallCategoryName(regulation.getCallCategoryName());
|
||||
|
@ -7,3 +7,7 @@ apollo:
|
||||
bootstrap:
|
||||
enabled: true
|
||||
namespace: application
|
||||
|
||||
jasypt:
|
||||
encryptor:
|
||||
bean: stringEncryptor
|
Reference in New Issue
Block a user