1、新增类18，同步异步接口，为与算法对接版本。

src/main/java/com/pavis/ai/app/fjsocrasy/common/utils/ocr/ParseUtils.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.pavis.ai.app.fjsocrasy.form.eight.EnjoyLoansToClient;
+import com.pavis.ai.app.fjsocrasy.form.eighteen.NewCreditContract;
 import com.pavis.ai.app.fjsocrasy.form.eleven.IdCardReverse;
 import com.pavis.ai.app.fjsocrasy.form.fifteen.LetterOfCreditCommitment;
 import com.pavis.ai.app.fjsocrasy.form.five.CreditLoanUseContract;
@@ -107,6 +108,10 @@ public class ParseUtils {
                     // 待开发
                     resData = loanApplicationFormEnjoyELoanRes(reqId, templateType, sourceData, ocrData, matchRes);
                     break;
+                case "18":
+                    // 待开发
+                    resData = newCreditContractRes(reqId, templateType, sourceData, ocrData, matchRes);
+                    break;
                 default:
                     // 待开发
             }
@@ -794,6 +799,69 @@ public class ParseUtils {
         return map;
     }
 
+    /**
+     * 18、新版信用贷合同。
+     * @param reqId
+     * @param templateType
+     * @param sourceData
+     * @param ocrData
+     * @param matchRes
+     * @return
+     */
+    public static ResData<NewCreditContract> newCreditContractRes(String reqId, String templateType, JSONObject sourceData, JSONObject ocrData, JSONObject matchRes) {
+        log.info("ocr-match res 5:{}" , JSON.toJSONString(matchRes));
+        if (matchRes.get("code").toString().equals("1")) {
+            NewCreditContract newCreditContract = JSONObject.parseObject(JSON.toJSONString(
+                    JSON.parseObject(matchRes.get("data").toString()).get(templateType)), NewCreditContract.class);
+            ResData<NewCreditContract> resData = new ResData<>();
+            resData.setRes(newCreditContract);
+            resData = parseResData(resData,reqId,templateType,matchRes);
+            return resData;
+        } else {
+            Map<String, Object> map = creditLoanUseContractResMap(ocrData, sourceData,matchRes);
+            if (null != map && map.containsKey("lender")) {
+                NewCreditContract newCreditContract = JSONObject.parseObject(JSON.toJSONString(map), NewCreditContract.class);
+                ResData<NewCreditContract> resData = new ResData<>();
+                resData.setRes(newCreditContract);
+                resData = parseResData(resData,reqId,templateType,matchRes);
+                return resData;
+            }
+        }
+        return new ResData<>();
+    }
+
+    public static Map<String, Object> newCreditContractResMap(JSONObject ocrData, JSONObject sourceData,JSONObject matchRes) {
+        Map<String, Object> map = new HashMap<>();
+        String lender = checkOcrData(ocrData,"lender");
+        map.put("lender", compare(lender,checkSourceData(sourceData,"lender"),matchRes));
+        String idCode = checkOcrData(ocrData,"idCode");
+        idCode = StringUtils.isEmpty(idCode) ? idCode : GeneralUtils.checkIdCode(idCode);
+        map.put("idCode", compare(idCode,checkSourceData(sourceData,"idCode"),matchRes));
+        String mobile = checkOcrData(ocrData,"mobile");
+        mobile = GeneralUtils.removePunctuation(GeneralUtils.checkIdCode(mobile));
+        map.put("mobile", compare(mobile,checkSourceData(sourceData,"postCode"),matchRes));
+        String address = checkOcrData(ocrData,"address");
+        map.put("address", compare(address,checkSourceData(sourceData,"address"),matchRes));
+        String dateSign = checkOcrData(ocrData,"dateSign");
+        map.put("dateSign", compare(dateSign,checkSourceData(sourceData,"dateSign"),matchRes));
+        String lower = checkOcrData(ocrData,"lower");
+        map.put("lower", compare(lower,checkSourceData(sourceData,"lower"),matchRes));
+        String period = checkOcrData(ocrData,"period");
+        map.put("period", compare(period,checkSourceData(sourceData,"period"),matchRes));
+        String account = checkOcrData(ocrData,"account");
+        map.put("account", compare(account,checkSourceData(sourceData,"account"),matchRes));
+        String accountCode = checkOcrData(ocrData,"accountCode");
+        map.put("accountCode", compare(accountCode,checkSourceData(sourceData,"accountCode"),matchRes));
+        String loanType = checkOcrData(ocrData,"loanType");
+        map.put("loanType", compare(loanType,checkSourceData(sourceData,"loanType"),matchRes));
+        String sendAdress = checkOcrData(ocrData,"sendAdress");
+        map.put("sendAdress", compare(sendAdress,checkSourceData(sourceData,"sendAdress"),matchRes));
+        String lenderSign = checkOcrData(ocrData,"lenderSign");
+        map.put("lenderSign", compare(lenderSign,checkSourceData(sourceData,"lenderSign"),matchRes));
+        return map;
+    }
+
+
 
     /**
      * 6.消费金融联名卡办理须知（虚拟信息）

src/main/java/com/pavis/ai/app/fjsocrasy/form/eighteen/Eighteen.java

@@ -0,0 +1,41 @@
+package com.pavis.ai.app.fjsocrasy.form.eighteen;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+/**
+ * @author guanhuijuan
+ * @create 2020-08-05 13:33
+ * @desc 18、新版信用贷合同
+ **/
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class Eighteen {
+    @ApiModelProperty(value="借款人")
+    private String lender;
+    @ApiModelProperty(value="身份证")
+    private String idCode;
+    @ApiModelProperty(value="电话")
+    private String mobile;
+    @ApiModelProperty(value="住所")
+    private String address;
+    @ApiModelProperty(value="签署日期")
+    private String dateSign;
+    @ApiModelProperty(value="小写")
+    private String lower;
+    @ApiModelProperty(value="贷款期限")
+    private String period;
+    @ApiModelProperty(value="账户名")
+    private String account;
+    @ApiModelProperty(value="账号")
+    private String accountCode;
+    @ApiModelProperty(value="贷款用途")
+    private String loanType;
+    @ApiModelProperty(value="乙方送达联系地址")
+    private String sendAdress;
+    @ApiModelProperty(value="对比日期")
+    private String compareDate;
+}

src/main/java/com/pavis/ai/app/fjsocrasy/form/eighteen/LinkEighteen.java

@@ -0,0 +1,25 @@
+package com.pavis.ai.app.fjsocrasy.form.eighteen;
+
+import com.pavis.ai.app.fjsocrasy.form.five.Five;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * @author guanhuijuan
+ * @create 2020-08-05 13:33
+ * @desc 18、新版信用贷合同
+ **/
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class LinkEighteen extends Eighteen{
+    private String reqId;
+
+    public LinkEighteen(String lender, String idCode, String mobile, String address, String dateSign, String lower, String period,String account, String accountCode, String loanType,String sendAdress, String compareDate, String reqId) {
+        super(lender, idCode, mobile, address, dateSign, lower, period,account, accountCode, loanType,sendAdress, compareDate);
+        this.reqId = reqId;
+    }
+}

src/main/java/com/pavis/ai/app/fjsocrasy/form/eighteen/LinkOcrEighteen.java

@@ -0,0 +1,25 @@
+package com.pavis.ai.app.fjsocrasy.form.eighteen;
+
+import com.pavis.ai.app.fjsocrasy.form.five.Five;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * @author guanhuijuan
+ * @create 2020-08-05 13:33
+ * @desc 18、新版信用贷合同
+ **/
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class LinkOcrEighteen extends Eighteen{
+    private String reqId;
+    private String lenderSign;
+    public LinkOcrEighteen(String lender, String idCode, String mobile, String address, String dateSign, String lower, String period,String account, String accountCode, String loanType,String sendAdress, String compareDate, String reqId) {
+        super(lender, idCode, mobile, address, dateSign, lower, period,account, accountCode, loanType,sendAdress, compareDate);
+        this.reqId = reqId;
+    }
+}

src/main/java/com/pavis/ai/app/fjsocrasy/form/eighteen/MidEighteen.java

@@ -0,0 +1,80 @@
+package com.pavis.ai.app.fjsocrasy.form.eighteen;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+/**
+ * @author guanhuijuan
+ * @create 2020-08-05 13:33
+ * @desc 18、新版信用贷合同
+ **/
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class MidEighteen {
+    /**
+     * todo 0312 删除字段
+     */
+    // @ApiModelProperty(value="年份")
+    // private BackData year;
+    // @ApiModelProperty(value="编码")
+    // private BackData code;
+    //
+
+    @ApiModelProperty(value="借款人")
+    private String lender;
+    @ApiModelProperty(value="住所")
+    private String address;
+    @ApiModelProperty(value="电话")
+    private String mobile;
+    @ApiModelProperty(value="邮编")
+    private String postCode;
+    @ApiModelProperty(value="身份证")
+    private String idCode;
+
+    /**
+     * todo 0312 删除字段
+     */
+    // @ApiModelProperty(value="币种")
+    // private String currency;
+    // @ApiModelProperty(value="大写")
+    // private String capital;
+    //
+
+    @ApiModelProperty(value="小写")
+    private String lower;
+    @ApiModelProperty(value="账户名")
+    private String account;
+    @ApiModelProperty(value="账号")
+    private String accountCode;
+    @ApiModelProperty(value="使用期限")
+    private String deadline;
+
+    /**
+     * todo 0312 删除字段。
+     */
+    // @ApiModelProperty(value="年利率")
+    // private String yearRate;
+    // @ApiModelProperty(value="违约金")
+    // private String breakRate;
+    // @ApiModelProperty(value="甲方邮寄地址")
+    // private String postAddressA;
+    // @ApiModelProperty(value="乙方邮寄地址")
+    // private String postAddressB;
+    /**
+     * todo 0320 新增字段。
+     */
+    @ApiModelProperty(value="借款人签名")
+    private String lenderSign;
+    @ApiModelProperty(value="借款人身份证确认")
+    private String idCodeSign;
+    @ApiModelProperty(value="联系地址")
+    private String addressSign;
+    @ApiModelProperty(value="签名时间")
+    private String dateSign;
+    //
+
+
+}

src/main/java/com/pavis/ai/app/fjsocrasy/form/eighteen/NewCreditContract.java

@@ -0,0 +1,42 @@
+package com.pavis.ai.app.fjsocrasy.form.eighteen;
+
+import com.pavis.ai.app.fjsocrasy.form.res.BackData;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+/**
+ * @author guanhuijuan
+ * @create 2020-08-05 14:27
+ * @desc 18.新版信用贷合同
+ **/
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class NewCreditContract {
+    @ApiModelProperty(value="借款人")
+    private BackData lender;
+    @ApiModelProperty(value="身份证")
+    private BackData idCode;
+    @ApiModelProperty(value="电话")
+    private BackData mobile;
+    @ApiModelProperty(value="住所")
+    private BackData address;
+    @ApiModelProperty(value="签署日期")
+    private BackData dateSign;
+    @ApiModelProperty(value="小写")
+    private BackData lower;
+    @ApiModelProperty(value="贷款期限")
+    private BackData period;
+    @ApiModelProperty(value="账户名")
+    private BackData account;
+    @ApiModelProperty(value="账号")
+    private BackData accountCode;
+    @ApiModelProperty(value="贷款用途")
+    private BackData loanType;
+    @ApiModelProperty(value="乙方送达联系地址")
+    private BackData sendAdress;
+    @ApiModelProperty(value="乙方签名")
+    private BackData lenderSign;
+}

src/main/java/com/pavis/ai/app/fjsocrasy/mapper/ContractEighteenBackMapper.java

@@ -0,0 +1,16 @@
+package com.pavis.ai.app.fjsocrasy.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pavis.ai.app.fjsocrasy.model.ContractEightBack;
+import com.pavis.ai.app.fjsocrasy.model.ContractEighteenBack;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author guanhuijuan
+ * @create 2020-08-05 14:37
+ * @desc ContractEightBackMapper
+ **/
+@Component
+public interface ContractEighteenBackMapper extends BaseMapper<ContractEighteenBack> {
+
+}

src/main/java/com/pavis/ai/app/fjsocrasy/mapper/ContractEighteenMapper.java

@@ -0,0 +1,16 @@
+package com.pavis.ai.app.fjsocrasy.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pavis.ai.app.fjsocrasy.model.ContractEight;
+import com.pavis.ai.app.fjsocrasy.model.ContractEighteen;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author guanhuijuan
+ * @create 2020-08-05 14:37
+ * @desc ContractEightMapper
+ **/
+@Component
+public interface ContractEighteenMapper extends BaseMapper<ContractEighteen> {
+
+}

src/main/java/com/pavis/ai/app/fjsocrasy/model/ContractEighteen.java

@@ -0,0 +1,39 @@
+package com.pavis.ai.app.fjsocrasy.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.*;
+
+/**
+ * @author guanhuijuan
+ * @create 2020-08-05 13:33
+ * @desc 18、新版信用贷合同
+ **/
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ContractEighteen {
+    @TableId(type = IdType.ID_WORKER_STR)
+    private String id;
+    private String reqId;
+    private String lender;
+    private String idCode;
+    private String mobile;
+    private String address;
+    private String dateSign;
+    private String lower;
+    private String period;
+    private String account;
+    private String accountCode;
+    private String loanType;
+    private String sendAdress;
+    private String compareDate;
+    private String operator;
+    private String operatorId;
+    private String operateTime;
+    private String operateIp;
+    private String remarks;
+
+}

src/main/java/com/pavis/ai/app/fjsocrasy/model/ContractEighteenBack.java

@@ -0,0 +1,42 @@
+package com.pavis.ai.app.fjsocrasy.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.*;
+
+/**
+ * @author guanhuijuan
+ * @create 2020-08-05 13:33
+ * @desc 18.新版信用贷合同
+ **/
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ContractEighteenBack {
+    @TableId(type = IdType.ID_WORKER_STR)
+    private String id;
+    private String reqId;
+    private String lender;
+    private String idCode;
+    private String mobile;
+    private String address;
+    private String dateSign;
+    private String lower;
+    private String period;
+    private String account;
+    private String accountCode;
+    private String loanType;
+    private String sendAdress;
+    private String lenderSign;
+    private String operator;
+    private String operatorId;
+    private String operateTime;
+    private String operateIp;
+    private String remarks;
+    private String overallConfidence;
+    private String midConfidence;
+    private String excTime;
+
+}

src/main/java/com/pavis/ai/app/fjsocrasy/service/EternalSendService.java

@@ -10,11 +10,11 @@ import org.springframework.web.bind.annotation.PostMapping;
  * @desc 回传数据富士通。
  **/
 // 本地测试环境
-// @FeignClient(value = "eternalSendService",url = "http://192.168.1.73:18000")
+@FeignClient(value = "eternalSendService",url = "http://192.168.1.73:18000")
 // 测试环境
 // @FeignClient(value = "eternalSendService",url = "http://61.155.215.241:52090")
 // 生产环境
-@FeignClient(value = "eternalSendService",url = "http://61.155.215.241:53090")
+// @FeignClient(value = "eternalSendService",url = "http://61.155.215.241:53090")
 public interface EternalSendService {
 
     /**

src/main/java/com/pavis/ai/app/fjsocrasy/service/InternalSendService.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * @desc 内部算法调用。
  **/
 // 本地测试
-// @FeignClient(value = "internalSendService",url = "http://192.168.1.202:8089")
+@FeignClient(value = "internalSendService",url = "http://192.168.1.202:8089")
 // 本地单个字段置信度。
 // @FeignClient(value = "internalSendService",url = "http://192.168.1.202:8099")
 // @FeignClient(value = "internalSendService",url = "http://192.168.1.200:28011")
@@ -28,7 +28,7 @@ import java.util.Map;
 // 生产环境
 // @FeignClient(value = "internalSendService",url = "http://47.104.109.52:8089")
 
-@FeignClient(value = "internalSendService",url = "http://47.104.109.52:8099")
+// @FeignClient(value = "internalSendService",url = "http://47.104.109.52:8099")
 // @FeignClient(value = "internalSendService",url = "http://47.104.109.52:18888")
 public interface InternalSendService {
 

src/main/java/com/pavis/ai/app/fjsocrasy/service/impl/BackServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.pavis.ai.app.fjsocrasy.common.utils.DateUtils;
 import com.pavis.ai.app.fjsocrasy.common.utils.ocr.ParseUtils;
 import com.pavis.ai.app.fjsocrasy.form.eight.EnjoyLoansToClient;
+import com.pavis.ai.app.fjsocrasy.form.eighteen.NewCreditContract;
 import com.pavis.ai.app.fjsocrasy.form.eleven.IdCardReverse;
 import com.pavis.ai.app.fjsocrasy.form.fifteen.LetterOfCreditCommitment;
 import com.pavis.ai.app.fjsocrasy.form.five.CreditLoanUseContract;
@@ -55,20 +56,20 @@ public class BackServiceImpl implements BackService {
     private EternalSendService eternalSendService;
 
     @Override
-    public void back(String fileType,String reqId,Long startTime,JSONObject ocr) {
+    public void back(String fileType, String reqId, Long startTime, JSONObject ocr) {
         // log.info("step ***4: back***");
-        if (fileType.equals("10") || fileType.equals("11")){
+        if (fileType.equals("10") || fileType.equals("11")) {
             // 类型10、11意常情况返回。
-            JSONObject midOcr = fileType.equals("10") ? ParseUtils.midOcrFront(false,"-1",fileType,"")
-                    : ParseUtils.midOcrReverse(false,"-1",fileType,"");
+            JSONObject midOcr = fileType.equals("10") ? ParseUtils.midOcrFront(false, "-1", fileType, "")
+                    : ParseUtils.midOcrReverse(false, "-1", fileType, "");
             // todo 直接返回，不用在调用match函数。
-            uploadService.saveBack(getNullBackResData(reqId, fileType), JSON.toJSONString(midOcr),startTime);
+            uploadService.saveBack(getNullBackResData(reqId, fileType), JSON.toJSONString(midOcr), startTime);
             boolean flag = null != ocr ? ocr.get("image_status").equals("non_idcard") ? true : false : false;
             backToFjs(getNullBackResData(reqId, fileType), reqId, startTime, flag ? "-1" : "0");
             long endTime = System.currentTimeMillis();
-            log.info("ocr-ex back excTime:{}", DateUtils.getExcTime(startTime,endTime));
+            log.info("ocr-ex back excTime:{}", DateUtils.getExcTime(startTime, endTime));
 
-        }else {
+        } else {
             if (null != ocr && ocr.get("code").toString().equals("-1")) {
                 // 图片不符情况返回。
                 // todo 直接返回，不用在调用match函数。
@@ -76,12 +77,12 @@ public class BackServiceImpl implements BackService {
                 backToFjs(getNullBackResData(reqId, fileType), reqId, startTime, ocr.get("code").toString());
                 long endTime = System.currentTimeMillis();
                 log.info("ocr-ex back excTime:{}", DateUtils.getExcTime(startTime, endTime));
-            }else {
+            } else {
                 // 算法异常情况返回。
-                uploadService.saveBack(getNullBackResData(reqId, fileType),JSON.toJSONString(ocr),startTime);
+                uploadService.saveBack(getNullBackResData(reqId, fileType), JSON.toJSONString(ocr), startTime);
                 backToFjs(getNullBackResData(reqId, fileType), reqId, startTime, ocr.get("code").toString());
                 long endTime = System.currentTimeMillis();
-                log.info("ocr-ex back excTime:{}", DateUtils.getExcTime(startTime,endTime));
+                log.info("ocr-ex back excTime:{}", DateUtils.getExcTime(startTime, endTime));
             }
         }
     }
@@ -109,7 +110,7 @@ public class BackServiceImpl implements BackService {
         String backRes = eternalSendService.send(result);
         long endTime = System.currentTimeMillis();
         String excTime = DateUtils.getExcTime(startTime, endTime);
-        log.info("fjs back time:{}",excTime);
+        log.info("fjs back time:{}", excTime);
         // todo ghj-online 上线时注释掉，本地自己接收。
         // SendData sendData = JSONObject.parseObject(result, SendData.class);
         // sendData.setData(resData);
@@ -129,8 +130,8 @@ public class BackServiceImpl implements BackService {
         map.put("fileType", resData.getType());
         map.put("data", resData.getRes());
         // 20200507 新增回传参数：
-        map.put("overallConfidence",code.equals("-1") ? "0" : resData.getOverallConfidence());
-        map.put("midConfidence",code.equals("-1") ? "0" : resData.getMidConfidence());
+        map.put("overallConfidence", code.equals("-1") ? "0" : resData.getOverallConfidence());
+        map.put("midConfidence", code.equals("-1") ? "0" : resData.getMidConfidence());
         return map;
     }
 
@@ -141,9 +142,9 @@ public class BackServiceImpl implements BackService {
             resData = new ResData();
             switch (templateType) {
                 case "1":
-                    PciiAuth pciiAuth = new PciiAuth(new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"));
+                    PciiAuth pciiAuth = new PciiAuth(new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"));
                     resData.setReqId(reqId);
                     resData.setType(templateType);
                     resData.setRes(pciiAuth);
@@ -152,16 +153,16 @@ public class BackServiceImpl implements BackService {
                     break;
                 case "2":
                     // 待开发
-                    LoanApplicationForm loanApplicationForm = new LoanApplicationForm(new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"));
+                    LoanApplicationForm loanApplicationForm = new LoanApplicationForm(new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"));
                     resData.setReqId(reqId);
                     resData.setType(templateType);
                     resData.setRes(loanApplicationForm);
@@ -170,9 +171,9 @@ public class BackServiceImpl implements BackService {
                     break;
                 case "3":
                     // 待开发
-                    RecommendationLetter recommendationLetter = new RecommendationLetter(new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"));
+                    RecommendationLetter recommendationLetter = new RecommendationLetter(new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"));
                     resData.setReqId(reqId);
                     resData.setType(templateType);
                     resData.setRes(recommendationLetter);
@@ -181,8 +182,8 @@ public class BackServiceImpl implements BackService {
                     break;
                 case "4":
                     // 待开发
-                    CreditConfirmationLetter creditConfirmationLetter = new CreditConfirmationLetter(new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"));
+                    CreditConfirmationLetter creditConfirmationLetter = new CreditConfirmationLetter(new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"));
                     resData.setReqId(reqId);
                     resData.setType(templateType);
                     resData.setRes(creditConfirmationLetter);
@@ -191,11 +192,11 @@ public class BackServiceImpl implements BackService {
                     break;
                 case "5":
                     // 待开发
-                    CreditLoanUseContract creditLoanUseContract = new CreditLoanUseContract(new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"));
+                    CreditLoanUseContract creditLoanUseContract = new CreditLoanUseContract(new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"));
                     resData.setReqId(reqId);
                     resData.setType(templateType);
                     resData.setRes(creditLoanUseContract);
@@ -204,7 +205,7 @@ public class BackServiceImpl implements BackService {
                     break;
                 case "6":
                     // 待开发
-                    ConsumerFinanceHandlingInstructions consumerFinanceHandlingInstructions = new ConsumerFinanceHandlingInstructions(new BackData("", "", "","0"));
+                    ConsumerFinanceHandlingInstructions consumerFinanceHandlingInstructions = new ConsumerFinanceHandlingInstructions(new BackData("", "", "", "0"));
                     resData.setReqId(reqId);
                     resData.setType(templateType);
                     resData.setRes(consumerFinanceHandlingInstructions);
@@ -213,8 +214,8 @@ public class BackServiceImpl implements BackService {
                     break;
                 case "7":
                     // 待开发
-                    LoanPurposeCommitment loanPurposeCommitment = new LoanPurposeCommitment(new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"));
+                    LoanPurposeCommitment loanPurposeCommitment = new LoanPurposeCommitment(new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"));
                     resData.setReqId(reqId);
                     resData.setType(templateType);
                     resData.setRes(loanPurposeCommitment);
@@ -223,7 +224,7 @@ public class BackServiceImpl implements BackService {
                     break;
                 case "8":
                     // 待开发
-                    EnjoyLoansToClient enjoyLoansToClient = new EnjoyLoansToClient(new BackData("", "", "","0"));
+                    EnjoyLoansToClient enjoyLoansToClient = new EnjoyLoansToClient(new BackData("", "", "", "0"));
                     resData.setReqId(reqId);
                     resData.setType(templateType);
                     resData.setRes(enjoyLoansToClient);
@@ -232,9 +233,9 @@ public class BackServiceImpl implements BackService {
                     break;
                 case "9":
                     // 待开发
-                    EnjoyLoansConfirm enjoyLoansConfirm = new EnjoyLoansConfirm(new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"));
+                    EnjoyLoansConfirm enjoyLoansConfirm = new EnjoyLoansConfirm(new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"));
                     resData.setReqId(reqId);
                     resData.setType(templateType);
                     resData.setRes(enjoyLoansConfirm);
@@ -243,8 +244,8 @@ public class BackServiceImpl implements BackService {
                     break;
                 case "10":
                     // 待开发
-                    IdCardFront idCardFront = new IdCardFront(new BackData("", "", "","0"),
-                            new BackData("", "", "","0"));
+                    IdCardFront idCardFront = new IdCardFront(new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"));
                     resData.setReqId(reqId);
                     resData.setType(templateType);
                     resData.setRes(idCardFront);
@@ -253,7 +254,7 @@ public class BackServiceImpl implements BackService {
                     break;
                 case "11":
                     // 待开发
-                    IdCardReverse idCardReverse = new IdCardReverse(new BackData("", "", "","0"));
+                    IdCardReverse idCardReverse = new IdCardReverse(new BackData("", "", "", "0"));
                     resData.setReqId(reqId);
                     resData.setType(templateType);
                     resData.setRes(idCardReverse);
@@ -262,9 +263,9 @@ public class BackServiceImpl implements BackService {
                     break;
                 case "12":
                     // 待开发
-                    PersonalInfoUseAuthorization personalInfoUseAuthorization = new PersonalInfoUseAuthorization(new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"));
+                    PersonalInfoUseAuthorization personalInfoUseAuthorization = new PersonalInfoUseAuthorization(new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"));
                     resData.setReqId(reqId);
                     resData.setType(templateType);
                     resData.setRes(personalInfoUseAuthorization);
@@ -273,16 +274,16 @@ public class BackServiceImpl implements BackService {
                     break;
                 case "13":
                     // 待开发
-                    PayAndEnjoyLoanApplicationForm payAndEnjoyLoanApplicationForm = new PayAndEnjoyLoanApplicationForm(new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"));
+                    PayAndEnjoyLoanApplicationForm payAndEnjoyLoanApplicationForm = new PayAndEnjoyLoanApplicationForm(new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"));
                     resData.setReqId(reqId);
                     resData.setType(templateType);
                     resData.setRes(payAndEnjoyLoanApplicationForm);
@@ -291,16 +292,16 @@ public class BackServiceImpl implements BackService {
                     break;
                 case "14":
                     // 待开发
-                    EnjoyLoanApplicationForm enjoyLoanApplicationForm = new EnjoyLoanApplicationForm(new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0")
+                    EnjoyLoanApplicationForm enjoyLoanApplicationForm = new EnjoyLoanApplicationForm(new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0")
                             // ,new BackData("", "", "","0")
                     );
                     resData.setReqId(reqId);
@@ -311,9 +312,9 @@ public class BackServiceImpl implements BackService {
                     break;
                 case "15":
                     // 待开发
-                    LetterOfCreditCommitment letterOfCreditCommitment = new LetterOfCreditCommitment(new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"));
+                    LetterOfCreditCommitment letterOfCreditCommitment = new LetterOfCreditCommitment(new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"));
                     resData.setReqId(reqId);
                     resData.setType(templateType);
                     resData.setRes(letterOfCreditCommitment);
@@ -322,9 +323,9 @@ public class BackServiceImpl implements BackService {
                     break;
                 case "16":
                     // 待开发
-                    LeEnjoyLoanCommitmentLetter leEnjoyLoanCommitmentLetter = new LeEnjoyLoanCommitmentLetter(new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"));
+                    LeEnjoyLoanCommitmentLetter leEnjoyLoanCommitmentLetter = new LeEnjoyLoanCommitmentLetter(new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"));
                     resData.setReqId(reqId);
                     resData.setType(templateType);
                     resData.setRes(leEnjoyLoanCommitmentLetter);
@@ -333,22 +334,42 @@ public class BackServiceImpl implements BackService {
                     break;
                 case "17":
                     // 待开发
-                    LoanApplicationFormEnjoyELoan loanApplicationFormEnjoyELoan = new LoanApplicationFormEnjoyELoan(new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"), new BackData("", "", "","0"),
-                            new BackData("", "", "","0"));
+                    LoanApplicationFormEnjoyELoan loanApplicationFormEnjoyELoan = new LoanApplicationFormEnjoyELoan(new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"));
                     resData.setReqId(reqId);
                     resData.setType(templateType);
                     resData.setRes(loanApplicationFormEnjoyELoan);
                     resData.setOverallConfidence("2");
                     resData.setMidConfidence("2");
                     break;
+                case "18":
+                    // 待开发
+                    NewCreditContract newCreditContract = new NewCreditContract(new BackData("", "", "",
+                            "0"), new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"),
+                            new BackData("", "", "", "0"));
+                    resData.setReqId(reqId);
+                    resData.setType(templateType);
+                    resData.setRes(newCreditContract);
+                    resData.setOverallConfidence("2");
+                    resData.setMidConfidence("2");
+                    break;
                 default:
                     // 待开发
             }

src/main/java/com/pavis/ai/app/fjsocrasy/service/impl/UploadServiceImpl.java

@@ -14,6 +14,7 @@ import com.pavis.ai.app.fjsocrasy.form.eight.Eight;
 import com.pavis.ai.app.fjsocrasy.form.eight.EnjoyLoansToClient;
 import com.pavis.ai.app.fjsocrasy.form.eight.LinkEight;
 import com.pavis.ai.app.fjsocrasy.form.eight.MidEight;
+import com.pavis.ai.app.fjsocrasy.form.eighteen.NewCreditContract;
 import com.pavis.ai.app.fjsocrasy.form.eleven.Eleven;
 import com.pavis.ai.app.fjsocrasy.form.eleven.IdCardReverse;
 import com.pavis.ai.app.fjsocrasy.form.eleven.LinkEleven;
@@ -107,6 +108,7 @@ public class UploadServiceImpl implements UploadService {
     private static final String TYPE_FIFTEEN = "15";
     private static final String TYPE_SIXTEEN = "16";
     private static final String TYPE_SEVENTEEN = "17";
+    private static final String TYPE_EIGHTEEN = "18";
 
     @Autowired
     private UploadMapper uploadMapper;
@@ -213,6 +215,12 @@ public class UploadServiceImpl implements UploadService {
     @Autowired
     private ContractSeventeenBackMapper contractSeventeenBackMapper;
 
+    @Autowired
+    private ContractEighteenMapper contractEighteenMapper;
+
+    @Autowired
+    private ContractEighteenBackMapper contractEighteenBackMapper;
+
     @Autowired
     private RecommendInfoService recommendInfoService;
 
@@ -221,6 +229,7 @@ public class UploadServiceImpl implements UploadService {
 
     /**
      * 本地测试接口。
+     *
      * @param reqId
      * @param fileType
      * @param data
@@ -230,8 +239,8 @@ public class UploadServiceImpl implements UploadService {
      * @throws Exception
      */
     @Override
-    public List<FileDetails> uploadAsync(String reqId, String fileType, String data,  Long startTime, List<FileDetails> parsedFilePaths) throws Exception {
-        otherService.uploading(reqId,fileType,data,null,startTime,parsedFilePaths);
+    public List<FileDetails> uploadAsync(String reqId, String fileType, String data, Long startTime, List<FileDetails> parsedFilePaths) throws Exception {
+        otherService.uploading(reqId, fileType, data, null, startTime, parsedFilePaths);
         // todo 待处理。
         // return "1";
         return parsedFilePaths;
@@ -242,7 +251,7 @@ public class UploadServiceImpl implements UploadService {
         // 1、将上传信息数据写入库，并将文件数据写入磁盘，同时返回待处理的图片路径。
         log.info("step ****1: save***");
         List<FileDetails> parsedFilePaths = writeToDisk(files, reqId, fileType, data, startTime);
-        otherService.uploading(reqId,fileType,data,files,startTime,parsedFilePaths);
+        otherService.uploading(reqId, fileType, data, files, startTime, parsedFilePaths);
         // todo 待处理。
         // return "1";
         return parsedFilePaths;
@@ -269,8 +278,8 @@ public class UploadServiceImpl implements UploadService {
         if (savedId > 0) {
             JSONObject dataJson = JSON.parseObject(data);
             // 原始数据入库。
-            int insertId = savedSourceData(reqId, type, dataJson,excTime);
-            log.info("insert result:{}",insertId);
+            int insertId = savedSourceData(reqId, type, dataJson, excTime);
+            log.info("insert result:{}", insertId);
             return insertId;
         } else {
             return 0;
@@ -278,14 +287,14 @@ public class UploadServiceImpl implements UploadService {
     }
 
     @Override
-    public void updateByReqIdAndType(String reqId, String type, String opTime,String ocrMap) {
+    public void updateByReqIdAndType(String reqId, String type, String opTime, String ocrMap) {
         QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("req_id",reqId);
-        queryWrapper.eq("operate_time",opTime);
+        queryWrapper.eq("req_id", reqId);
+        queryWrapper.eq("operate_time", opTime);
         switch (type) {
             case "1":
                 List<ContractOne> contractOnes = contractOneMapper.selectList(queryWrapper);
-                if(contractOnes.size() > 0){
+                if (contractOnes.size() > 0) {
                     ContractOne contractOne = contractOnes.get(0);
                     contractOne.setOperator(ocrMap);
                     contractOneMapper.updateById(contractOne);
@@ -293,7 +302,7 @@ public class UploadServiceImpl implements UploadService {
                 break;
             case "2":
                 List<ContractTwo> contractTwos = contractTwoMapper.selectList(queryWrapper);
-                if(contractTwos.size() > 0){
+                if (contractTwos.size() > 0) {
                     ContractTwo contractTwo = contractTwos.get(0);
                     contractTwo.setOperator(ocrMap);
                     contractTwoMapper.updateById(contractTwo);
@@ -301,7 +310,7 @@ public class UploadServiceImpl implements UploadService {
                 break;
             case "3":
                 List<ContractThree> contractThrees = contractThreeMapper.selectList(queryWrapper);
-                if(contractThrees.size() > 0){
+                if (contractThrees.size() > 0) {
                     ContractThree contractThree = contractThrees.get(0);
                     contractThree.setOperator(ocrMap);
                     contractThreeMapper.updateById(contractThree);
@@ -309,7 +318,7 @@ public class UploadServiceImpl implements UploadService {
                 break;
             case "4":
                 List<ContractFour> contractFours = contractFourMapper.selectList(queryWrapper);
-                if(contractFours.size() > 0){
+                if (contractFours.size() > 0) {
                     ContractFour contractFour = contractFours.get(0);
                     contractFour.setOperator(ocrMap);
                     contractFourMapper.updateById(contractFour);
@@ -317,7 +326,7 @@ public class UploadServiceImpl implements UploadService {
                 break;
             case "5":
                 List<ContractFive> contractFives = contractFiveMapper.selectList(queryWrapper);
-                if(contractFives.size() > 0){
+                if (contractFives.size() > 0) {
                     ContractFive contractFive = contractFives.get(0);
                     contractFive.setOperator(ocrMap);
                     contractFiveMapper.updateById(contractFive);
@@ -325,7 +334,7 @@ public class UploadServiceImpl implements UploadService {
                 break;
             case "6":
                 List<ContractSix> contractSixs = contractSixMapper.selectList(queryWrapper);
-                if(contractSixs.size() > 0){
+                if (contractSixs.size() > 0) {
                     ContractSix contractSix = contractSixs.get(0);
                     contractSix.setOperator(ocrMap);
                     contractSixMapper.updateById(contractSix);
@@ -333,7 +342,7 @@ public class UploadServiceImpl implements UploadService {
                 break;
             case "7":
                 List<ContractSeven> contractSevens = contractSevenMapper.selectList(queryWrapper);
-                if(contractSevens.size() > 0){
+                if (contractSevens.size() > 0) {
                     ContractSeven contractSeven = contractSevens.get(0);
                     contractSeven.setOperator(ocrMap);
                     contractSevenMapper.updateById(contractSeven);
@@ -341,7 +350,7 @@ public class UploadServiceImpl implements UploadService {
                 break;
             case "8":
                 List<ContractEight> contractEights = contractEightMapper.selectList(queryWrapper);
-                if(contractEights.size() > 0){
+                if (contractEights.size() > 0) {
                     ContractEight contractEight = contractEights.get(0);
                     contractEight.setOperator(ocrMap);
                     contractEightMapper.updateById(contractEight);
@@ -349,7 +358,7 @@ public class UploadServiceImpl implements UploadService {
                 break;
             case "9":
                 List<ContractNine> contractNines = contractNineMapper.selectList(queryWrapper);
-                if(contractNines.size() > 0){
+                if (contractNines.size() > 0) {
                     ContractNine contractNine = contractNines.get(0);
                     contractNine.setOperator(ocrMap);
                     contractNineMapper.updateById(contractNine);
@@ -357,7 +366,7 @@ public class UploadServiceImpl implements UploadService {
                 break;
             case "10":
                 List<IdCodeFront> idCodeFronts = idCodeFrontMapper.selectList(queryWrapper);
-                if(idCodeFronts.size() > 0){
+                if (idCodeFronts.size() > 0) {
                     IdCodeFront idCodeFront = idCodeFronts.get(0);
                     idCodeFront.setOperator(ocrMap);
                     idCodeFrontMapper.updateById(idCodeFront);
@@ -365,7 +374,7 @@ public class UploadServiceImpl implements UploadService {
                 break;
             case "11":
                 List<IdCodeReverse> idCodeReverses = idCodeReverseMapper.selectList(queryWrapper);
-                if(idCodeReverses.size() > 0){
+                if (idCodeReverses.size() > 0) {
                     IdCodeReverse idCodeReverse = idCodeReverses.get(0);
                     idCodeReverse.setOperator(ocrMap);
                     idCodeReverseMapper.updateById(idCodeReverse);
@@ -373,7 +382,7 @@ public class UploadServiceImpl implements UploadService {
                 break;
             case "12":
                 List<ContractTwelve> contractTwelves = contractTwelveMapper.selectList(queryWrapper);
-                if(contractTwelves.size() > 0){
+                if (contractTwelves.size() > 0) {
                     ContractTwelve contractTwelve = contractTwelves.get(0);
                     contractTwelve.setOperator(ocrMap);
                     contractTwelveMapper.updateById(contractTwelve);
@@ -381,7 +390,7 @@ public class UploadServiceImpl implements UploadService {
                 break;
             case "13":
                 List<ContractThirteen> contractThirteens = contractThirteenMapper.selectList(queryWrapper);
-                if(contractThirteens.size() > 0){
+                if (contractThirteens.size() > 0) {
                     ContractThirteen contractThirteen = contractThirteens.get(0);
                     contractThirteen.setOperator(ocrMap);
                     contractThirteenMapper.updateById(contractThirteen);
@@ -389,7 +398,7 @@ public class UploadServiceImpl implements UploadService {
                 break;
             case "14":
                 List<ContractFourteen> contractFourteens = contractFourteenMapper.selectList(queryWrapper);
-                if(contractFourteens.size() > 0){
+                if (contractFourteens.size() > 0) {
                     ContractFourteen contractFourteen = contractFourteens.get(0);
                     contractFourteen.setOperator(ocrMap);
                     contractFourteenMapper.updateById(contractFourteen);
@@ -397,7 +406,7 @@ public class UploadServiceImpl implements UploadService {
                 break;
             case "15":
                 List<ContractFifteen> contractFifteens = contractFifteenMapper.selectList(queryWrapper);
-                if(contractFifteens.size() > 0){
+                if (contractFifteens.size() > 0) {
                     ContractFifteen contractFifteen = contractFifteens.get(0);
                     contractFifteen.setOperator(ocrMap);
                     contractFifteenMapper.updateById(contractFifteen);
@@ -405,7 +414,7 @@ public class UploadServiceImpl implements UploadService {
                 break;
             case "16":
                 List<ContractSixteen> contractSixteens = contractSixteenMapper.selectList(queryWrapper);
-                if(contractSixteens.size() > 0){
+                if (contractSixteens.size() > 0) {
                     ContractSixteen contractSixteen = contractSixteens.get(0);
                     contractSixteen.setOperator(ocrMap);
                     contractSixteenMapper.updateById(contractSixteen);
@@ -413,12 +422,20 @@ public class UploadServiceImpl implements UploadService {
                 break;
             case "17":
                 List<ContractSeventeen> contractSeventeens = contractSeventeenMapper.selectList(queryWrapper);
-                if(contractSeventeens.size() > 0){
+                if (contractSeventeens.size() > 0) {
                     ContractSeventeen contractSeventeen = contractSeventeens.get(0);
                     contractSeventeen.setOperator(ocrMap);
                     contractSeventeenMapper.updateById(contractSeventeen);
                 }
                 break;
+            case "18":
+                List<ContractEighteen> contractEighteens = contractEighteenMapper.selectList(queryWrapper);
+                if (contractEighteens.size() > 0) {
+                    ContractEighteen contractEighteen = contractEighteens.get(0);
+                    contractEighteen.setOperator(ocrMap);
+                    contractEighteenMapper.updateById(contractEighteen);
+                }
+                break;
         }
     }
 
@@ -897,6 +914,34 @@ public class UploadServiceImpl implements UploadService {
                         .build();
                 contractSeventeenBackMapper.insert(contractSeventeenBack);
                 break;
+            case "18":
+                NewCreditContract newCreditContract = (NewCreditContract) resData.getRes();
+                ContractEighteenBack contractEighteenBack = ContractEighteenBack.builder()
+                        .reqId(resData.getReqId())
+                        .lender(newCreditContract.getLender().getOcrRes())
+                        .idCode(newCreditContract.getIdCode().getOcrRes())
+                        .mobile(newCreditContract.getMobile().getOcrRes())
+                        .address(newCreditContract.getAddress().getOcrRes())
+                        .dateSign(newCreditContract.getDateSign().getOcrRes())
+                        .lower(newCreditContract.getLower().getOcrRes())
+                        .period(newCreditContract.getPeriod().getOcrRes())
+                        .account(newCreditContract.getAccount().getOcrRes())
+                        .accountCode(newCreditContract.getAccountCode().getOcrRes())
+                        .loanType(newCreditContract.getLoanType().getOcrRes())
+                        .sendAdress(newCreditContract.getSendAdress().getOcrRes())
+                        .lenderSign(newCreditContract.getLenderSign().getOcrRes())
+                        .dateSign(newCreditContract.getDateSign().getOcrRes())
+                        .operator(JSON.toJSONString(resData))
+                        .operatorId("")
+                        .operateIp("")
+                        .operateTime(DateUtils.now())
+                        .remarks(ocrData)
+                        .overallConfidence(resData.getOverallConfidence())
+                        .midConfidence(resData.getMidConfidence())
+                        .excTime(DateUtils.getExcTime(startTime, endTime))
+                        .build();
+                contractEighteenBackMapper.insert(contractEighteenBack);
+                break;
             default:
         }
     }
@@ -995,7 +1040,7 @@ public class UploadServiceImpl implements UploadService {
      * @param data
      * @return
      */
-    public int savedSourceData(String reqId, String templateType, JSONObject data,String excTime) {
+    public int savedSourceData(String reqId, String templateType, JSONObject data, String excTime) {
         int saveId = 0;
         Map<String, Object> map = parsedTypeTwoContracts(templateType, data);
         ResData resData = new ResData();
@@ -1425,6 +1470,24 @@ public class UploadServiceImpl implements UploadService {
                 resData.setRes(contractSeventeen);
                 saveId = contractSeventeenMapper.insert(contractSeventeen);
                 break;
+            case "18":
+                ContractEighteen contractEighteen;
+                if (null != data) {
+                    Five five = JSONObject.parseObject(data.toJSONString(), Five.class);
+                    contractEighteen = new ContractEighteen();
+                    BeanUtils.copyProperties(five, contractEighteen);
+                    contractEighteen.setReqId(reqId);
+                    contractEighteen.setOperator("");
+                    contractEighteen.setOperatorId("");
+                    contractEighteen.setOperateIp("");
+                    contractEighteen.setOperateTime(DateUtils.now());
+                    contractEighteen.setRemarks(excTime);
+                } else {
+                    contractEighteen = new ContractEighteen();
+                }
+                resData.setRes(contractEighteen);
+                saveId = contractEighteenMapper.insert(contractEighteen);
+                break;
             default:
         }
         return saveId;
@@ -1833,15 +1896,15 @@ public class UploadServiceImpl implements UploadService {
 
         Map<String, Object> sourceMap = sourceMap(oneSourceList, twoSourceList, threeSourceList, fourSourceList, fiveSourceList, sixSourceList,
                 sevenSourceList, eightSourceList, nineSourceList, tenSourceList, elevenSourceList, twelveSourceList, thirteenSourceList,
-                fourteenSourceList, fifteenSourceList, sixteenSourceList,seventeenSourceList);
+                fourteenSourceList, fifteenSourceList, sixteenSourceList, seventeenSourceList);
 
         Map<String, Object> ocrMap = ocrMap(oneOcrList, twoOcrList, threeOcrList, fourOcrList, fiveOcrList, sixOcrList,
                 sevenOcrList, eightOcrList, nineOcrList, tenOcrList, elevenOcrList, twelveOcrList, thirteenOcrList, fourteenOcrList,
-                fifteenOcrList, sixteenOcrList,  seventeenOcrList,true, ocr, fileType);
+                fifteenOcrList, sixteenOcrList, seventeenOcrList, true, ocr, fileType);
 
         Map<String, Object> accMap = ocrMap(oneOcrList, twoOcrList, threeOcrList, fourOcrList, fiveOcrList, sixOcrList,
                 sevenOcrList, eightOcrList, nineOcrList, tenOcrList, elevenOcrList, twelveOcrList, thirteenOcrList, fourteenOcrList,
-                fifteenOcrList, sixteenOcrList, seventeenOcrList,false, ocr, fileType);
+                fifteenOcrList, sixteenOcrList, seventeenOcrList, false, ocr, fileType);
 
         // 20200525 新增filetype。
         List<String> types = new ArrayList<>();
@@ -1854,7 +1917,7 @@ public class UploadServiceImpl implements UploadService {
         linkMap.put("type", fileType);
         linkMap.put("req_id", reqId);
         // linkMap.put("types",JSON.toJSONString(types));
-        linkMap.put("recommends",fileType.equals("3") ? JSON.toJSONString(recommendInfoService.findRecomInfo()) : "[]");
+        linkMap.put("recommends", fileType.equals("3") ? JSON.toJSONString(recommendInfoService.findRecomInfo()) : "[]");
         return linkMap;
     }
 

src/main/resources/application.yml

@@ -1,8 +1,8 @@
 server:
 #  测试环境
-#  port: 8000
+  port: 8000
 #  生产环境
-  port: 18000
+#  port: 18000
 spring:
   application:
     name: fujisu-ocr-server