Split model URLs for personal and corporate clients

2026-04-27 15:22:08 +08:00
parent 5a80653917
commit 571f7bc075
20 changed files with 393 additions and 158 deletions
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/controller/LoanRatePricingMockController.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/controller/LoanRatePricingMockController.java
@@ -27,17 +27,17 @@ import java.io.InputStream;
 public class LoanRatePricingMockController extends BaseController {

    @Anonymous
-    @Operation(summary = "调用模型获取测算利率")
-    @PostMapping("/invokeModel")
-    public AjaxResult invokeModel( ModelInvokeDTO modelInvokeDTO) {
-        ObjectNode jsonNodes;
-        if (modelInvokeDTO.getCustType().equals("个人")) {
-            jsonNodes = loadJsonFromResource("data/retail_output.json");
-        } else {
-            jsonNodes = loadJsonFromResource("data/corp_output.json");
-        }
+    @Operation(summary = "调用个人模型获取测算利率")
+    @PostMapping("/invokeModel/personal")
+    public AjaxResult invokePersonalModel(ModelInvokeDTO modelInvokeDTO) {
+        return new AjaxResult(10000, "success", loadJsonFromResource("data/retail_output.json"));
+    }

-        return new AjaxResult(10000, "success", jsonNodes);
+    @Anonymous
+    @Operation(summary = "调用企业模型获取测算利率")
+    @PostMapping("/invokeModel/corporate")
+    public AjaxResult invokeCorporateModel(ModelInvokeDTO modelInvokeDTO) {
+        return new AjaxResult(10000, "success", loadJsonFromResource("data/corp_output.json"));
    }

    private ObjectNode loadJsonFromResource(String resourcePath){
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/domain/dto/CorporateLoanPricingCreateDTO.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/domain/dto/CorporateLoanPricingCreateDTO.java
@@ -41,9 +41,7 @@ public class CorporateLoanPricingCreateDTO implements Serializable {
    @NotBlank(message = "申请金额不能为空")
    private String applyAmt;

-    @Schema(description = "还款方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "分期", allowableValues = {"分期", "不分期"})
-    @NotBlank(message = "还款方式不能为空")
-    @Pattern(regexp = "^(分期|不分期)$", message = "还款方式必须是：分期、不分期之一")
+    @Schema(description = "还款方式", example = "分期", allowableValues = {"分期", "不分期"})
    private String repayMethod;

    @Schema(description = "借款期限（年）", requiredMode = Schema.RequiredMode.REQUIRED, example = "3")
@@ -56,9 +54,8 @@ public class CorporateLoanPricingCreateDTO implements Serializable {
    @Schema(description = "贸易和建筑业企业标识", example = "0")
    private String isTradeBuildEnt;

-    @Schema(description = "抵质押类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "一类", allowableValues = {"一类", "二类", "三类", "四类"})
-    @NotBlank(message = "抵质押类型不能为空")
-    @Pattern(regexp = "^(一类|二类|三类|四类)$", message = "抵质押类型必须是：一类、二类、三类、四类之一")
+    @Schema(description = "抵质押类型", example = "一类", allowableValues = {"一类", "二类", "三类", "四类", "其他", "存单质押"})
+    @Pattern(regexp = "^(一类|二类|三类|四类|其他|存单质押)$", message = "抵质押类型必须是：一类、二类、三类、四类、其他、存单质押之一")
    private String collType;

    @Schema(description = "抵质押物是否三方所有", example = "0")
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/service/LoanPricingModelService.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/service/LoanPricingModelService.java
@@ -1,7 +1,5 @@
 package com.ruoyi.loanpricing.service;

-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.loanpricing.domain.dto.ModelInvokeDTO;
 import com.ruoyi.loanpricing.domain.entity.LoanPricingWorkflow;
@@ -12,7 +10,6 @@ import com.ruoyi.loanpricing.mapper.ModelCorpOutputFieldsMapper;
 import com.ruoyi.loanpricing.mapper.ModelRetailOutputFieldsMapper;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;

@@ -68,10 +65,9 @@ public class LoanPricingModelService {
        {
            normalizeCorporateModelInvokeDTO(modelInvokeDTO);
        }
-        JSONObject response = modelService.invokeModel(modelInvokeDTO);
        if (loanPricingWorkflow.getCustType().equals("个人")){
            // 个人模型
-            ModelRetailOutputFields modelRetailOutputFields = JSON.parseObject(response.toJSONString(), ModelRetailOutputFields.class);
+            ModelRetailOutputFields modelRetailOutputFields = modelService.invokePersonalModel(modelInvokeDTO);
            modelRetailOutputFieldsMapper.insert(modelRetailOutputFields);
            log.info("个人模型调用成功");
            LoanPricingWorkflow workflowToUpdate = new LoanPricingWorkflow();
@@ -81,7 +77,7 @@ public class LoanPricingModelService {
            log.info("更新流程信息成功");
        }else if (loanPricingWorkflow.getCustType().equals("企业")){
            // 企业模型
-            ModelCorpOutputFields modelCorpOutputFields = JSON.parseObject(response.toJSONString(), ModelCorpOutputFields.class);
+            ModelCorpOutputFields modelCorpOutputFields = modelService.invokeCorporateModel(modelInvokeDTO);
            modelCorpOutputFieldsMapper.insert(modelCorpOutputFields);
            log.info("企业模型调用成功");
            LoanPricingWorkflow workflowToUpdate = new LoanPricingWorkflow();
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/service/ModelService.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/service/ModelService.java
@@ -3,12 +3,11 @@ package com.ruoyi.loanpricing.service;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
-import com.ruoyi.common.core.domain.entity.SysDictData;
-import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.http.HttpUtils;
 import com.ruoyi.loanpricing.domain.dto.ModelInvokeDTO;
-import com.ruoyi.loanpricing.domain.entity.LoanPricingWorkflow;
+import com.ruoyi.loanpricing.domain.entity.ModelCorpOutputFields;
+import com.ruoyi.loanpricing.domain.entity.ModelRetailOutputFields;
 import org.springframework.beans.factory.annotation.Value;


@@ -28,19 +27,29 @@ import java.util.Objects;
@EnableAsync
 public class ModelService {

-    @Value("${model.url}")
-    private String modelUrl;
+    @Value("${model.personal-url}")
+    private String personalModelUrl;
+
+    @Value("${model.corporate-url}")
+    private String corporateModelUrl;


+    public ModelRetailOutputFields invokePersonalModel(ModelInvokeDTO modelInvokeDTO) {
+        JSONObject mappingOutputFields = invokeModel(personalModelUrl, modelInvokeDTO);
+        return JSON.parseObject(mappingOutputFields.toJSONString(), ModelRetailOutputFields.class);
+    }

-    public JSONObject invokeModel(ModelInvokeDTO modelInvokeDTO) {
+    public ModelCorpOutputFields invokeCorporateModel(ModelInvokeDTO modelInvokeDTO) {
+        JSONObject mappingOutputFields = invokeModel(corporateModelUrl, modelInvokeDTO);
+        return JSON.parseObject(mappingOutputFields.toJSONString(), ModelCorpOutputFields.class);
+    }
+
+    private JSONObject invokeModel(String modelUrl, ModelInvokeDTO modelInvokeDTO) {
        Map<String, String> requestBody = entityToMap(modelInvokeDTO);
        JSONObject response = HttpUtils.doPostFormUrlEncoded(modelUrl, requestBody, null, JSONObject.class);
        log.info("------------------->调用模型返回结果:" + JSON.toJSONString(response));
        if(Objects.nonNull(response) && response.containsKey("code") && response.getInteger("code") == 10000){
-            JSONObject mappingOutputFields = response.getJSONObject("data").getJSONObject("mappingOutputFields");
-//            return JSON.parseObject(mappingOutputFields.toJSONString(), ModelOutputFields.class);
-            return mappingOutputFields;
+            return response.getJSONObject("data").getJSONObject("mappingOutputFields");
        }else{
            log.error("------------------->调用模型失败,失败原因为:" + response.getString("message"));
            throw new ServiceException("调用模型失败");