模型调用

2026-01-21 15:58:39 +08:00
parent c4a05e1338
commit 0d061155ed
25 changed files with 1134 additions and 55 deletions
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/controller/LoanPricingWorkflowController.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/controller/LoanPricingWorkflowController.java
@@ -10,7 +10,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.page.TableSupport;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.loanpricing.domain.LoanPricingWorkflow;
+import com.ruoyi.loanpricing.domain.entity.LoanPricingWorkflow;
+import com.ruoyi.loanpricing.domain.vo.LoanPricingWorkflowVO;
 import com.ruoyi.loanpricing.service.ILoanPricingWorkflowService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -41,10 +42,6 @@ public class LoanPricingWorkflowController extends BaseController
    @PostMapping("/create")
    public AjaxResult create(@Validated @RequestBody LoanPricingWorkflow loanPricingWorkflow)
    {
-        // 设置创建者
-        loanPricingWorkflow.setCreateBy(SecurityUtils.getUsername());
-        loanPricingWorkflow.setUpdateBy(SecurityUtils.getUsername());
-
        LoanPricingWorkflow result = loanPricingWorkflowService.createLoanPricing(loanPricingWorkflow);
        return success(result);
    }
@@ -76,7 +73,7 @@ public class LoanPricingWorkflowController extends BaseController
            @Parameter(description = "业务方流水号")
            @PathVariable("serialNum") String serialNum)
    {
-        LoanPricingWorkflow workflow = loanPricingWorkflowService.selectLoanPricingBySerialNum(serialNum);
+        LoanPricingWorkflowVO workflow = loanPricingWorkflowService.selectLoanPricingBySerialNum(serialNum);
        if (workflow == null)
        {
            return error("记录不存在");
--- 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
@@ -0,0 +1,55 @@
+package com.ruoyi.loanpricing.controller;
+
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+
+import com.ruoyi.loanpricing.domain.dto.ModelInvokeDTO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.web.bind.annotation.*;
+
+
+import java.io.InputStream;
+
+
+/**
+ * @Author 吴凯程
+ * @Date 2025/11/10
+ **/
+@Tag(name = "测算测试接口")
+@RestController
+@RequestMapping("/rate/pricing/mock")
+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");
+        }
+
+        return new AjaxResult(10000, "success", jsonNodes);
+    }
+
+    private ObjectNode loadJsonFromResource(String resourcePath){
+        ClassPathResource classPathResource = new ClassPathResource(resourcePath);
+        try (InputStream inputStream = classPathResource.getInputStream();){
+
+            ObjectMapper objectMapper = new ObjectMapper();
+            return objectMapper.readValue(inputStream, ObjectNode.class);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+}
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/domain/dto/ModelInvokeDTO.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/domain/dto/ModelInvokeDTO.java
@@ -0,0 +1,153 @@
+package com.ruoyi.loanpricing.domain.dto;
+
+import lombok.Data;
+
+/**
+ * @Author 吴凯程
+ * @Date 2025/12/23
+ **/
+@Data
+public class ModelInvokeDTO {
+    /**
+     * 业务方流水号（必填）
+     * 可使用时间戳，或自定义随机生成
+     */
+    private String serialNum;
+
+    /**
+     * 机构编码（必填）
+     * 固定值：931000
+     */
+    private String orgCode;
+
+    /**
+     * 运行模式（必填）
+     * 固定值：1:同步
+     */
+    private String runType = "1";
+
+    /**
+     * 客户内码（必填）
+     */
+    private String custIsn;
+
+    /**
+     * 客户类型（必填）
+     * 可选值：个人/企业
+     */
+    private String custType;
+
+    /**
+     * 担保方式（必填）
+     * 可选值：信用,保证,抵押,质押
+     */
+    private String guarType;
+
+    /**
+     * 中间业务_个人_快捷支付（非必填）
+     * 可选值：true/false
+     */
+    private String midPerQuickPay;
+
+    /**
+     * 中间业务_个人_电费代扣（非必填）
+     * 可选值：true/false
+     */
+    private String midPerEleDdc;
+
+    /**
+     * 中间业务_企业_电费代扣（非必填）
+     * 可选值：true/false
+     */
+    private String midEntEleDdc;
+
+    /**
+     * 中间业务_企业_水费代扣（非必填）
+     * 可选值：true/false
+     */
+    private String midEntWaterDdc;
+
+    /**
+     * 申请金额（必填）
+     * 单位：元
+     */
+    private String applyAmt;
+
+    /**
+     * 净身企业（非必填）
+     * 可选值：true/false
+     */
+    private String isCleanEnt;
+
+    /**
+     * 开立基本结算账户（非必填）
+     * 可选值：true/false
+     */
+    private String hasSettleAcct;
+
+    /**
+     * 制造业企业（非必填）
+     * 可选值：true/false
+     */
+    private String isManufacturing;
+
+    /**
+     * 省农担担保贷款（非必填）
+     * 可选值：true/false
+     */
+    private String isAgriGuar;
+
+    /**
+     * 是否纳税信用等级A级（非必填）
+     * 可选值：true/false
+     */
+    private String isTaxA;
+
+    /**
+     * 是否县级及以上农业龙头企业（非必填）
+     * 可选值：true/false
+     */
+    private String isAgriLeading;
+
+    private String isInclusiveFinance;
+
+    /**
+     * 贷款用途（非必填）
+     * 可选值：consumer/business
+     */
+    private String loanPurpose;
+
+    /**
+     * 是否有经营佐证（非必填）
+     * 可选值：true/false
+     */
+    private String bizProof;
+
+    /**
+     * 抵质押类型（非必填）
+     * 可选值：抵押/质押
+     */
+    private String collType;
+
+    /**
+     * 抵质押物是否三方所有（非必填）
+     * 可选值：true/false
+     */
+    private String collThirdParty;
+
+//    /**
+//     * 贷款利率（必填）
+//     */
+//    private String loanRate;
+
+    /**
+     * 客户名称（非必填）
+     */
+    private String custName;
+
+    /**
+     * 证件类型（非必填）
+     */
+    private String idType;
+
+}
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/domain/entity/LoanPricingWorkflow.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/domain/entity/LoanPricingWorkflow.java
@@ -1,8 +1,6 @@
-package com.ruoyi.loanpricing.domain;
+package com.ruoyi.loanpricing.domain.entity;

-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -27,6 +25,9 @@ public class LoanPricingWorkflow implements Serializable
    @TableId(type = IdType.AUTO)
    private Long id;

+    /** 模型输出ID */
+    private Long modelOutputId;
+
    /** 业务方流水号 */
    private String serialNum;

@@ -108,16 +109,20 @@ public class LoanPricingWorkflow implements Serializable
    private String isInclusiveFinance;

    /** 创建者 */
+    @TableField(fill = FieldFill.INSERT)
    private String createBy;

    /** 创建时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(fill = FieldFill.INSERT)
    private Date createTime;

    /** 更新者 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
    private String updateBy;

    /** 更新时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateTime;
 }
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/domain/entity/ModelCorpOutputFields.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/domain/entity/ModelCorpOutputFields.java
@@ -0,0 +1,125 @@
+package com.ruoyi.loanpricing.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 贷款定价模型输入参数对象
+ *
+ * @author ruoyi
+ * @date 2025-01-21
+ */
+@Data
+public class ModelCorpOutputFields {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    // 客户内码
+    private String custIsn;
+    // 客户类型
+    private String custType;
+    // 担保方式
+    private String guarType;
+    // 客户名称
+    private String custName;
+    // 证件类型
+    private String idType;
+    // 证件号码
+    private String idNum;
+    // 基准利率
+    private String baseLoanRate;
+    // 我行首贷客户
+    private String isFirstLoan;
+    // 用信天数
+    private String faithDay;
+    // BP_首贷
+    private String bpFirstLoan;
+    // BP_贷龄
+    private String bpAgeLoan;
+    // TOTAL_BP_忠诚度
+    private String totalBpLoyalty;
+    // 存款年日均
+    private String balanceAvg;
+    // 贷款年日均
+    private String loanAvg;
+    // 派生率
+    private String derivationRate;
+    // TOTAL_BP_贡献度
+    private String totalBpContribution;
+    // 中间业务_企业_企业互联
+    private String midEntConnect;
+    // 中间业务_企业_有效价值客户
+    private String midEntEffect;
+    // 中间业务_企业_国际业务
+    private String midEntInter;
+    // 中间业务_企业_承兑
+    private String midEntAccept;
+    // 中间业务_企业_贴现
+    private String midEntDiscount;
+    // 中间业务_企业_电费代扣
+    private String midEntEleDdc;
+    // 中间业务_企业_水费代扣
+    private String midEntWaterDdc;
+    // 中间业务_企业_税务代扣
+    private String midEntTax;
+    // BP_中间业务
+    private String bpMid;
+    // 代发工资户数
+    private String payroll;
+    // 存量贷款余额
+    private String invLoanAmount;
+    // BP_代发工资
+    private String bpPayroll;
+    // 净身企业
+    private String isCleanEnt;
+    // 开立基本结算账户
+    private String hasSettleAcct;
+    // 省农担担保贷款
+    private String isAgriGuar;
+    // 绿色贷款
+    private String isGreenLoan;
+    // 科技型企业
+    private String isTechEnt;
+    // BP_企业客户类别
+    private String bpEntType;
+    // TOTAL_BP_关联度
+    private String totoalBpRelevance;
+    // 贷款期限
+    private String loanTerm;
+    // BP_贷款期限
+    private String bpLoanTerm;
+    // 申请金额
+    private String applyAmt;
+    // BP_贷款额度
+    private String bpLoanAmount;
+    // 抵质押类型
+    private String collType;
+    // 抵质押物是否三方所有
+    private String collThirdParty;
+    // BP_抵押物
+    private String bpCollateral;
+    // 灰名单客户
+    private String greyCust;
+    // 本金逾期
+    private String prinOverdue;
+    // 利息逾期
+    private String interestOverdue;
+    // 信用卡逾期
+    private String cardOverdue;
+    // BP_灰名单与逾期
+    private String bpGreyOverdue;
+    // TOTAL_BP_风险度
+    private String totoalBpRisk;
+    // 浮动BP
+    private String totalBp;
+    // 测算利率
+    private String calculateRate;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+}
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/domain/entity/ModelRetailOutputFields.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/domain/entity/ModelRetailOutputFields.java
@@ -0,0 +1,175 @@
+package com.ruoyi.loanpricing.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 贷款定价模型输入参数对象
+ *
+ * @author ruoyi
+ * @date 2025-01-21
+ */
+@Data
+public class ModelRetailOutputFields {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    // 客户内码
+    private String custIsn;
+
+    // 客户类型
+    private String custType;
+
+    // 担保方式
+    private String guarType;
+
+    // 客户名称
+    private String custName;
+
+    // 证件类型
+    private String idType;
+
+    // 证件号码
+    private String idNum;
+
+    // 基准利率
+    private String baseLoanRate;
+
+    // 我行首贷客户
+    private String isFirstLoan;
+
+    // 用信天数
+    private String faithDay;
+
+    // 客户年龄
+    private String custAge;
+
+    // BP_首贷
+    private String bpFirstLoan;
+
+    // BP_贷龄
+    private String bpAgeLoan;
+
+    // BP_年龄
+    private String bpAge;
+
+    // TOTAL_BP_忠诚度
+    private String totalBpLoyalty;
+
+    // 存款年日均
+    private String balanceAvg;
+
+    // 贷款年日均
+    private String loanAvg;
+
+    // 派生率
+    private String derivationRate;
+
+    // TOTAL_BP_贡献度
+    private String totalBpContribution;
+
+    // 中间业务_个人_信用卡
+    private String midPerCard;
+
+    // 中间业务_个人_一码通
+    private String midPerPass;
+
+    // 中间业务_个人_丰收互联
+    private String midPerHarvest;
+
+    // 中间业务_个人_有效客户
+    private String midPerEffect;
+
+    // 中间业务_个人_快捷支付
+    private String midPerQuickPay;
+
+    // 中间业务_个人_电费代扣
+    private String midPerEleDdc;
+
+    // 中间业务_个人_水费代扣
+    private String midPerWaterDdc;
+
+    // 中间业务_个人_华数费代扣
+    private String midPerHuashuDdc;
+
+    // 中间业务_个人_煤气费代扣
+    private String MidPerGasDdc;
+
+    // 中间业务_个人_市民卡
+    private String midPerCitizencard;
+
+    // 中间业务_个人_理财业务
+    private String midPerFinMan;
+
+    // 中间业务_个人_etc
+    private String midPerEtc;
+
+    // BP_中间业务
+    private String bpMid;
+
+    // TOTAL_BP_关联度（注意原字段名拼写错误：totoalBpRelevance，已保留原拼写）
+    private String totoalBpRelevance;
+
+    // 申请金额
+    private String applyAmt;
+
+    // BP_贷款额度
+    private String bpLoanAmount;
+
+    // 贷款用途
+    private String loanPurpose;
+
+    // 是否有经营佐证
+    private String bizProof;
+
+    // BP_贷款用途
+    private String bpLoanUse;
+
+    // 循环功能
+    private String loanLoop;
+
+    // BP_循环功能
+    private String bpLoanLoop;
+
+    // 抵质押类型
+    private String collType;
+
+    // 抵质押物是否三方所有
+    private String collThirdParty;
+
+    // BP_抵押物
+    private String bpCollateral;
+
+    // 灰名单客户
+    private String greyCust;
+
+    // 本金逾期
+    private String prinOverdue;
+
+    // 利息逾期
+    private String interestOverdue;
+
+    // 信用卡逾期
+    private String cardOverdue;
+
+    // BP_灰名单与逾期
+    private String bpGreyOverdue;
+
+    // TOTAL_BP_风险度（注意原字段名拼写错误：totoalBpRisk，已保留原拼写）
+    private String totoalBpRisk;
+
+    // 浮动BP
+    private String totalBp;
+
+    // 测算利率
+    private String calculateRate;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+}
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/domain/vo/LoanPricingWorkflowVO.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/domain/vo/LoanPricingWorkflowVO.java
@@ -0,0 +1,21 @@
+package com.ruoyi.loanpricing.domain.vo;
+
+import com.ruoyi.loanpricing.domain.entity.LoanPricingWorkflow;
+import com.ruoyi.loanpricing.domain.entity.ModelCorpOutputFields;
+import com.ruoyi.loanpricing.domain.entity.ModelRetailOutputFields;
+import lombok.Data;
+
+/**
+ * @Author: wkc
+ * @CreateTime: 2026-01-21
+ */
+@Data
+public class LoanPricingWorkflowVO {
+
+    private LoanPricingWorkflow loanPricingWorkflow;
+
+    private ModelRetailOutputFields modelRetailOutputFields;
+
+    private ModelCorpOutputFields modelCorpOutputFields;
+
+}
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/mapper/LoanPricingWorkflowMapper.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/mapper/LoanPricingWorkflowMapper.java
@@ -1,10 +1,7 @@
 package com.ruoyi.loanpricing.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.loanpricing.domain.LoanPricingWorkflow;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
+import com.ruoyi.loanpricing.domain.entity.LoanPricingWorkflow;

 /**
 * 利率定价流程Mapper接口
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/mapper/ModelCorpOutputFieldsMapper.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/mapper/ModelCorpOutputFieldsMapper.java
@@ -0,0 +1,15 @@
+package com.ruoyi.loanpricing.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.loanpricing.domain.entity.ModelCorpOutputFields;
+
+/**
+ * 对公贷款定价模型输出字段Mapper接口
+ *
+ * @author ruoyi
+ * @date 2025-01-21
+ */
+public interface ModelCorpOutputFieldsMapper extends BaseMapper<ModelCorpOutputFields>
+{
+
+}
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/mapper/ModelRetailOutputFieldsMapper.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/mapper/ModelRetailOutputFieldsMapper.java
@@ -0,0 +1,15 @@
+package com.ruoyi.loanpricing.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.loanpricing.domain.entity.ModelRetailOutputFields;
+
+/**
+ * 零售贷款定价模型输出字段Mapper接口
+ *
+ * @author ruoyi
+ * @date 2025-01-21
+ */
+public interface ModelRetailOutputFieldsMapper extends BaseMapper<ModelRetailOutputFields>
+{
+
+}
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/service/ILoanPricingWorkflowService.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/service/ILoanPricingWorkflowService.java
@@ -2,7 +2,8 @@ package com.ruoyi.loanpricing.service;

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.loanpricing.domain.LoanPricingWorkflow;
+import com.ruoyi.loanpricing.domain.entity.LoanPricingWorkflow;
+import com.ruoyi.loanpricing.domain.vo.LoanPricingWorkflowVO;

 import java.util.List;

@@ -45,5 +46,5 @@ public interface ILoanPricingWorkflowService
     * @param serialNum 业务方流水号
     * @return 利率定价流程
     */
-    public LoanPricingWorkflow selectLoanPricingBySerialNum(String serialNum);
+    public LoanPricingWorkflowVO selectLoanPricingBySerialNum(String serialNum);
 }
--- 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
@@ -0,0 +1,69 @@
+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;
+import com.ruoyi.loanpricing.domain.entity.ModelCorpOutputFields;
+import com.ruoyi.loanpricing.domain.entity.ModelRetailOutputFields;
+import com.ruoyi.loanpricing.mapper.LoanPricingWorkflowMapper;
+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;
+
+import java.util.Objects;
+
+/**
+ * @Author: wkc
+ * @CreateTime: 2026-01-21
+ */
+@Service
+@Slf4j
+@EnableAsync
+public class LoanPricingModelService {
+
+    @Resource
+    private ModelService modelService;
+
+    @Resource
+    private LoanPricingWorkflowMapper loanPricingWorkflowMapper;
+
+    @Resource
+    private ModelRetailOutputFieldsMapper modelRetailOutputFieldsMapper;
+
+    @Resource
+    private ModelCorpOutputFieldsMapper modelCorpOutputFieldsMapper;
+
+    public void invokeModelAsync(Long workflowId) {
+        LoanPricingWorkflow loanPricingWorkflow = loanPricingWorkflowMapper.selectById(workflowId);
+        if (Objects.isNull(loanPricingWorkflow)){
+            log.error("未找到对应的流程信息，未调用模型服务");
+            return;
+        }
+        ModelInvokeDTO modelInvokeDTO = new ModelInvokeDTO();
+        BeanUtils.copyProperties(loanPricingWorkflow, modelInvokeDTO);
+        JSONObject response = modelService.invokeModel(modelInvokeDTO);
+        if (loanPricingWorkflow.getCustType().equals("个人")){
+            // 个人模型
+            ModelRetailOutputFields modelRetailOutputFields = JSON.parseObject(response.toJSONString(), ModelRetailOutputFields.class);
+            modelRetailOutputFieldsMapper.insert(modelRetailOutputFields);
+            log.info("个人模型调用成功");
+            loanPricingWorkflow.setModelOutputId(modelRetailOutputFields.getId());
+            loanPricingWorkflowMapper.updateById(loanPricingWorkflow);
+            log.info("更新流程信息成功");
+        }else if (loanPricingWorkflow.getCustType().equals("企业")){
+            // 企业模型
+            ModelCorpOutputFields modelCorpOutputFields = JSON.parseObject(response.toJSONString(), ModelCorpOutputFields.class);
+            modelCorpOutputFieldsMapper.insert(modelCorpOutputFields);
+            log.info("企业模型调用成功");
+            loanPricingWorkflow.setModelOutputId(modelCorpOutputFields.getId());
+            loanPricingWorkflowMapper.updateById(loanPricingWorkflow);
+            log.info("更新流程信息成功");
+        }
+    }
+}
--- 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
@@ -7,14 +7,15 @@ 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.loanratepricing.domain.RatePricingProperties;
-import com.ruoyi.loanratepricing.domain.dto.ModelInvokeDTO;
-import com.ruoyi.loanratepricing.domain.entity.ModelOutputFields;
+import com.ruoyi.loanpricing.domain.dto.ModelInvokeDTO;
+import com.ruoyi.loanpricing.domain.entity.LoanPricingWorkflow;
+import org.springframework.beans.factory.annotation.Value;
+
+
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;

-import javax.annotation.Resource;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;

@@ -24,28 +25,28 @@ import java.util.Objects;
 **/
@Service
@Slf4j
+@EnableAsync
 public class ModelService {

-    @Resource
-    private RatePricingProperties ratePricingProperties;
+    @Value("${model.url}")
+    private String modelUrl;

-    @Resource
-    private RedisCache redisCache;

-    public ModelOutputFields invokeModel(ModelInvokeDTO modelInvokeDTO) {
+
+    public JSONObject invokeModel(ModelInvokeDTO modelInvokeDTO) {
        Map<String, String> requestBody = entityToMap(modelInvokeDTO);
-        JSONObject response = HttpUtils.doPostFormUrlEncoded(ratePricingProperties.getModelUrl(), requestBody, null, JSONObject.class);
+        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 JSON.parseObject(mappingOutputFields.toJSONString(), ModelOutputFields.class);
+            return mappingOutputFields;
        }else{
            log.error("------------------->调用模型失败,失败原因为:" + response.getString("message"));
            throw new ServiceException("调用模型失败");
        }
    }

-
    /**
     * 使用FastJSON将实体类转换为Map<String, String>
     * @param obj 待转换的实体类对象
@@ -60,16 +61,6 @@ public class ModelService {
        return JSON.parseObject(jsonStr, new TypeReference<Map<String, String>>() {});
    }

-    private void replaceIndicatorToVariableName(JSONObject jsonObject) {
-        List<SysDictData> variableNameList = redisCache.getCacheObject("sys_dict:model_indicator_metric");
-        variableNameList.forEach(sysDictData -> {
-            if (jsonObject.containsKey(sysDictData.getDictLabel())) {
-                jsonObject.put(sysDictData.getDictValue(), jsonObject.get(sysDictData.getDictLabel()));
-                jsonObject.remove(sysDictData.getDictLabel());
-            }
-        });
-    }
-



--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/service/impl/LoanPricingWorkflowServiceImpl.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/service/impl/LoanPricingWorkflowServiceImpl.java
@@ -3,16 +3,24 @@ package com.ruoyi.loanpricing.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.loanpricing.domain.LoanPricingWorkflow;
+import com.ruoyi.loanpricing.domain.entity.LoanPricingWorkflow;
+import com.ruoyi.loanpricing.domain.entity.ModelCorpOutputFields;
+import com.ruoyi.loanpricing.domain.entity.ModelRetailOutputFields;
+import com.ruoyi.loanpricing.domain.vo.LoanPricingWorkflowVO;
 import com.ruoyi.loanpricing.mapper.LoanPricingWorkflowMapper;
+import com.ruoyi.loanpricing.mapper.ModelCorpOutputFieldsMapper;
+import com.ruoyi.loanpricing.mapper.ModelRetailOutputFieldsMapper;
 import com.ruoyi.loanpricing.service.ILoanPricingWorkflowService;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.loanpricing.service.LoanPricingModelService;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;

 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;

 /**
 * 利率定价流程Service业务层处理
@@ -23,9 +31,19 @@ import java.util.List;
@Service
 public class LoanPricingWorkflowServiceImpl implements ILoanPricingWorkflowService
 {
-    @Autowired
+    @Resource
    private LoanPricingWorkflowMapper loanPricingWorkflowMapper;

+    @Resource
+    private LoanPricingModelService loanPricingModelService;
+
+    @Resource
+    private ModelRetailOutputFieldsMapper modelRetailOutputFieldsMapper;
+
+    @Resource
+    private ModelCorpOutputFieldsMapper modelCorpOutputFieldsMapper;
+
+
    /**
     * 发起利率定价流程
     *
@@ -33,6 +51,7 @@ public class LoanPricingWorkflowServiceImpl implements ILoanPricingWorkflowServi
     * @return 结果
     */
    @Override
+    @Transactional(rollbackFor = Exception.class)
    public LoanPricingWorkflow createLoanPricing(LoanPricingWorkflow loanPricingWorkflow)
    {
        // 自动生成业务方流水号(时间戳)
@@ -43,19 +62,16 @@ public class LoanPricingWorkflowServiceImpl implements ILoanPricingWorkflowServi
        // 设置默认值
        if (!StringUtils.hasText(loanPricingWorkflow.getOrgCode()))
        {
-            loanPricingWorkflow.setOrgCode("931000");
+            loanPricingWorkflow.setOrgCode("892000");
        }
        if (!StringUtils.hasText(loanPricingWorkflow.getRunType()))
        {
            loanPricingWorkflow.setRunType("1");
        }

-        // 设置创建时间和更新时间
-        Date now = new Date();
-        loanPricingWorkflow.setCreateTime(now);
-        loanPricingWorkflow.setUpdateTime(now);
-
        loanPricingWorkflowMapper.insert(loanPricingWorkflow);
+        loanPricingModelService.invokeModelAsync(loanPricingWorkflow.getId());
+
        return loanPricingWorkflow;
    }

@@ -97,11 +113,28 @@ public class LoanPricingWorkflowServiceImpl implements ILoanPricingWorkflowServi
     * @return 利率定价流程
     */
    @Override
-    public LoanPricingWorkflow selectLoanPricingBySerialNum(String serialNum)
+    public LoanPricingWorkflowVO selectLoanPricingBySerialNum(String serialNum)
    {
+        LoanPricingWorkflowVO loanPricingWorkflowVO = new LoanPricingWorkflowVO();
+
        LambdaQueryWrapper<LoanPricingWorkflow> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(LoanPricingWorkflow::getSerialNum, serialNum);
-        return loanPricingWorkflowMapper.selectOne(wrapper);
+        LoanPricingWorkflow loanPricingWorkflow = loanPricingWorkflowMapper.selectOne(wrapper);
+        loanPricingWorkflowVO.setLoanPricingWorkflow(loanPricingWorkflow);
+
+        if (Objects.nonNull(loanPricingWorkflow.getModelOutputId())){
+            if (loanPricingWorkflow.getCustType().equals("个人")){
+                ModelRetailOutputFields modelRetailOutputFields = modelRetailOutputFieldsMapper.selectById(loanPricingWorkflow.getModelOutputId());
+                loanPricingWorkflowVO.setModelRetailOutputFields(modelRetailOutputFields);
+            }
+            if (loanPricingWorkflow.getCustType().equals("企业")){
+                ModelCorpOutputFields modelCorpOutputFields = modelCorpOutputFieldsMapper.selectById(loanPricingWorkflow.getModelOutputId());
+                loanPricingWorkflowVO.setModelCorpOutputFields(modelCorpOutputFields);
+            }
+        }
+
+
+        return loanPricingWorkflowVO;
    }

    /**
--- a/ruoyi-loan-pricing/src/main/resources/data/corp_output.json
+++ b/ruoyi-loan-pricing/src/main/resources/data/corp_output.json
@@ -0,0 +1,68 @@
+{
+  "traceId": "350626558347246735E7F4722CUZRWOMNRR53O0",
+  "cost": 2267,
+  "tokenId": "17364055486305E7F4722M8IPFWNL8TOBEB",
+  "mappingOutputFields": {
+  "custIsn": "CUST20260121001",
+  "custType": "企业客户",
+  "guarType": "抵押担保",
+  "custName": "北京智联科技有限公司",
+  "idType": "营业执照",
+  "idNum": "91110108MA00XXXXXX",
+  "baseLoanRate": "3.45",
+  "isFirstLoan": "N",
+  "faithDay": "730",
+  "bpFirstLoan": "0",
+  "bpAgeLoan": "5.2",
+  "totalBpLoyalty": "8.5",
+  "balanceAvg": "5000000.00",
+  "loanAvg": "3000000.00",
+  "derivationRate": "1.8",
+  "totalBpContribution": "12.3",
+  "midEntConnect": "100000.00",
+  "midEntEffect": "50000.00",
+  "midEntInter": "80000.00",
+  "midEntAccept": "200000.00",
+  "midEntDiscount": "150000.00",
+  "midEntEleDdc": "30000.00",
+  "midEntWaterDdc": "10000.00",
+  "midEntTax": "40000.00",
+  "bpMid": "6.8",
+  "payroll": "200",
+  "invLoanAmount": "2500000.00",
+  "bpPayroll": "4.1",
+  "isCleanEnt": "Y",
+  "hasSettleAcct": "Y",
+  "isAgriGuar": "N",
+  "isGreenLoan": "Y",
+  "isTechEnt": "Y",
+  "bpEntType": "7.5",
+  "totoalBpRelevance": "9.2",
+  "loanTerm": "36",
+  "bpLoanTerm": "3.3",
+  "applyAmt": "5000000.00",
+  "bpLoanAmount": "5.8",
+  "collType": "房产抵押",
+  "collThirdParty": "N",
+  "bpCollateral": "4.5",
+  "greyCust": "N",
+  "prinOverdue": "N",
+  "interestOverdue": "N",
+  "cardOverdue": "N",
+  "bpGreyOverdue": "0",
+  "totoalBpRisk": "1.2",
+  "totalBp": "48.2",
+  "calculateRate": "3.932"
+  },
+  "extensionMap": {},
+  "reasonMessage": "Running successfully",
+  "bizTime": 1736405548630,
+  "outputFields": {},
+  "workflowCode": "TBKH",
+  "orgCode": "802000",
+  "bizId": "2025010914345",
+  "reasonCode": 200,
+  "workflowVersion": 14,
+  "callTime": 1736405548630,
+  "status": 1
+}
--- a/ruoyi-loan-pricing/src/main/resources/data/retail_output.json
+++ b/ruoyi-loan-pricing/src/main/resources/data/retail_output.json
@@ -0,0 +1,68 @@
+{
+  "traceId": "350626558347246735E7F4722CUZRWOMNRR53O0",
+  "cost": 2267,
+  "tokenId": "17364055486305E7F4722M8IPFWNL8TOBEB",
+  "mappingOutputFields": {
+    "custIsn": "CUST20260121001",
+    "custType": "个人",
+    "guarType": "信用担保",
+    "custName": "张三",
+    "idType": "身份证",
+    "idNum": "330106199001011234",
+    "baseLoanRate": "4.35",
+    "isFirstLoan": "是",
+    "faithDay": "365",
+    "custAge": "36",
+    "bpFirstLoan": "50",
+    "bpAgeLoan": "30",
+    "bpAge": "20",
+    "totalBpLoyalty": "95",
+    "balanceAvg": "50000.00",
+    "loanAvg": "100000.00",
+    "derivationRate": "1.2",
+    "totalBpContribution": "88",
+    "midPerCard": "1000.50",
+    "midPerPass": "500.00",
+    "midPerHarvest": "800.20",
+    "midPerEffect": "是",
+    "midPerQuickPay": "300.00",
+    "midPerEleDdc": "150.00",
+    "midPerWaterDdc": "80.00",
+    "midPerHuashuDdc": "120.00",
+    "MidPerGasDdc": "90.00",
+    "midPerCitizencard": "200.00",
+    "midPerFinMan": "5000.00",
+    "midPerEtc": "180.00",
+    "bpMid": "45",
+    "totoalBpRelevance": "90",
+    "applyAmt": "200000.00",
+    "bpLoanAmount": "60",
+    "loanPurpose": "个人消费",
+    "bizProof": "有",
+    "bpLoanUse": "55",
+    "loanLoop": "支持",
+    "bpLoanLoop": "40",
+    "collType": "无抵质押",
+    "collThirdParty": "否",
+    "bpCollateral": "0",
+    "greyCust": "否",
+    "prinOverdue": "否",
+    "interestOverdue": "否",
+    "cardOverdue": "否",
+    "bpGreyOverdue": "98",
+    "totoalBpRisk": "95",
+    "totalBp": "350",
+    "calculateRate": "6.15"
+  },
+  "extensionMap": {},
+  "reasonMessage": "Running successfully",
+  "bizTime": 1736405548630,
+  "outputFields": {},
+  "workflowCode": "TBKH",
+  "orgCode": "802000",
+  "bizId": "2025010914345",
+  "reasonCode": 200,
+  "workflowVersion": 14,
+  "callTime": 1736405548630,
+  "status": 1
+}