1、与算法对接类型18，并修改link部分的bug。

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

@@ -854,8 +854,8 @@ public class ParseUtils {
         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 sendAddress = checkOcrData(ocrData,"sendAddress");
+        map.put("sendAddress", compare(sendAddress,checkSourceData(sourceData,"sendAddress"),matchRes));
         String lenderSign = checkOcrData(ocrData,"lenderSign");
         map.put("lenderSign", compare(lenderSign,checkSourceData(sourceData,"lenderSign"),matchRes));
         return map;

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

@@ -22,8 +22,6 @@ public class Eighteen {
     private String mobile;
     @ApiModelProperty(value="住所")
     private String address;
-    @ApiModelProperty(value="签署日期")
-    private String dateSign;
     @ApiModelProperty(value="小写")
     private String lower;
     @ApiModelProperty(value="贷款期限")
@@ -35,7 +33,7 @@ public class Eighteen {
     @ApiModelProperty(value="贷款用途")
     private String loanType;
     @ApiModelProperty(value="乙方送达联系地址")
-    private String sendAdress;
+    private String sendAddress;
     @ApiModelProperty(value="对比日期")
     private String compareDate;
 }

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

@@ -18,8 +18,8 @@ import lombok.Setter;
 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);
+    public LinkEighteen(String lender, String idCode, String mobile, String address, String lower, String period,String account, String accountCode, String loanType,String sendAddress, String compareDate, String reqId) {
+        super(lender, idCode, mobile, address, lower, period,account, accountCode, loanType,sendAddress, compareDate);
         this.reqId = reqId;
     }
 }

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

@@ -18,8 +18,8 @@ import lombok.Setter;
 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);
+    public LinkOcrEighteen(String lender, String idCode, String mobile, String address,String lower, String period,String account, String accountCode, String loanType,String sendAddress, String compareDate, String reqId) {
+        super(lender, idCode, mobile, address,lower, period,account, accountCode, loanType,sendAddress, compareDate);
         this.reqId = reqId;
     }
 }

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

@@ -14,67 +14,28 @@ import lombok.*;
 @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 mobile;
+    @ApiModelProperty(value="住所")
+    private String address;
     @ApiModelProperty(value="小写")
     private String lower;
+    @ApiModelProperty(value="贷款期限")
+    private String period;
     @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="借款人签名")
+    @ApiModelProperty(value="贷款用途")
+    private String loanType;
+    @ApiModelProperty(value="乙方送达联系地址")
+    private String sendAddress;
+    @ApiModelProperty(value="乙方签名")
     private String lenderSign;
-    @ApiModelProperty(value="借款人身份证确认")
-    private String idCodeSign;
-    @ApiModelProperty(value="联系地址")
-    private String addressSign;
-    @ApiModelProperty(value="签名时间")
+    @ApiModelProperty(value="签署日期")
     private String dateSign;
-    //
-
-
 }

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

@@ -23,8 +23,6 @@ public class NewCreditContract {
     private BackData mobile;
     @ApiModelProperty(value="住所")
     private BackData address;
-    @ApiModelProperty(value="签署日期")
-    private BackData dateSign;
     @ApiModelProperty(value="小写")
     private BackData lower;
     @ApiModelProperty(value="贷款期限")
@@ -36,7 +34,9 @@ public class NewCreditContract {
     @ApiModelProperty(value="贷款用途")
     private BackData loanType;
     @ApiModelProperty(value="乙方送达联系地址")
-    private BackData sendAdress;
+    private BackData sendAddress;
     @ApiModelProperty(value="乙方签名")
     private BackData lenderSign;
+    @ApiModelProperty(value="签署日期")
+    private BackData dateSign;
 }

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

@@ -22,13 +22,12 @@ public class ContractEighteen {
     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 sendAddress;
     private String compareDate;
     private String operator;
     private String operatorId;

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

@@ -22,14 +22,14 @@ public class ContractEighteenBack {
     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 sendAddress;
     private String lenderSign;
+    private String dateSign;
     private String operator;
     private String operatorId;
     private String operateTime;

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")
@@ -23,7 +23,7 @@ import java.util.Map;
 // 测试环境
 // @FeignClient(value = "internalSendService",url = "http://180.76.146.227:8099")
 
-// @FeignClient(value = "internalSendService",url = "http://180.76.146.227:8089")
+@FeignClient(value = "internalSendService",url = "http://180.76.146.227:8089")
 // @FeignClient(value = "internalSendService",url = "http://180.76.146.227:18888")
 // 生产环境
 // @FeignClient(value = "internalSendService",url = "http://47.104.109.52:8089")

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

@@ -502,7 +502,7 @@ public class OcrServiceImpl implements OcrService {
             }
 
         } else {
-            // 处理类型1、2、3、4、5、6、7、8、9、12、13、14、15、16
+            // 处理类型1、2、3、4、5、6、7、8、9、12、13、14、15、16\17\18
             // 4，8，15，后期可能不要。
             ocrMap = getOcrMap(reqId, fileType, paths);
             ocr = internalSendService.ocr(ocrMap);

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

@@ -14,7 +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.eighteen.*;
 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;
@@ -33,6 +33,7 @@ import com.pavis.ai.app.fjsocrasy.form.seven.*;
 import com.pavis.ai.app.fjsocrasy.form.seventeen.LinkOcrSeventeen;
 import com.pavis.ai.app.fjsocrasy.form.seventeen.LinkSeventeen;
 import com.pavis.ai.app.fjsocrasy.form.seventeen.LoanApplicationFormEnjoyELoan;
+import com.pavis.ai.app.fjsocrasy.form.seventeen.MidSeventeen;
 import com.pavis.ai.app.fjsocrasy.form.six.ConsumerFinanceHandlingInstructions;
 import com.pavis.ai.app.fjsocrasy.form.six.LinkSix;
 import com.pavis.ai.app.fjsocrasy.form.six.MidSix;
@@ -928,9 +929,8 @@ public class UploadServiceImpl implements UploadService {
                         .account(newCreditContract.getAccount().getOcrRes())
                         .accountCode(newCreditContract.getAccountCode().getOcrRes())
                         .loanType(newCreditContract.getLoanType().getOcrRes())
-                        .sendAdress(newCreditContract.getSendAdress().getOcrRes())
+                        .sendAddress(newCreditContract.getSendAddress().getOcrRes())
                         .lenderSign(newCreditContract.getLenderSign().getOcrRes())
-                        .dateSign(newCreditContract.getDateSign().getOcrRes())
                         .operator(JSON.toJSONString(resData))
                         .operatorId("")
                         .operateIp("")
@@ -1284,7 +1284,6 @@ public class UploadServiceImpl implements UploadService {
                 } else {
                     contractTwelve = new ContractTwelve();
                 }
-
                 resData.setRes(contractTwelve);
                 saveId = contractTwelveMapper.insert(contractTwelve);
                 break;
@@ -1418,7 +1417,6 @@ public class UploadServiceImpl implements UploadService {
                 } else {
                     contractSixteen = new ContractSixteen();
                 }
-
                 resData.setRes(contractSixteen);
                 saveId = contractSixteenMapper.insert(contractSixteen);
                 break;
@@ -1473,9 +1471,9 @@ public class UploadServiceImpl implements UploadService {
             case "18":
                 ContractEighteen contractEighteen;
                 if (null != data) {
-                    Five five = JSONObject.parseObject(data.toJSONString(), Five.class);
+                    Eighteen eighteen = JSONObject.parseObject(data.toJSONString(), Eighteen.class);
                     contractEighteen = new ContractEighteen();
-                    BeanUtils.copyProperties(five, contractEighteen);
+                    BeanUtils.copyProperties(eighteen, contractEighteen);
                     contractEighteen.setReqId(reqId);
                     contractEighteen.setOperator("");
                     contractEighteen.setOperatorId("");
@@ -1832,6 +1830,45 @@ public class UploadServiceImpl implements UploadService {
                                         midSixteen : midSixteen : midSixteen : midSixteen : midSixteen
                 );
                 break;
+            case TYPE_SEVENTEEN:
+                // 待开发
+                List<ContractSeventeenBack> seventeens = contractSevenBackMapper.selectList(query(reqIdVal));
+                if (seventeens.size() > 0) {
+                    js = JSON.parseObject(seventeens.get(0).getRemarks());
+                }
+                MidSeventeen midSeventeen = new MidSeventeen("", "", "", "", "", "", "", "", "", "", "",
+                        "", "", "", "", "", "", "", "",
+                        "", "", "", "", "", "", "", "",
+                        "", "", "", "", "", "", "", "", "");
+                midOcr.add(
+                        seventeens.size() > 0 ? null != js ? js.containsKey("code") ? js.get("code").toString().equals("1") ?
+                                js.containsKey("data") ? JSONObject.parseObject(JSON.toJSONString(js.get("data")), MidSeventeen.class) :
+                                        midSeventeen : midSeventeen : midSeventeen : midSeventeen : midSeventeen
+                );
+                midOcr.add(
+                        seventeens.size() > 0 ? null != js ? js.containsKey("code") ? js.get("code").toString().equals("1") ?
+                                js.containsKey("data") ? JSONObject.parseObject(JSON.toJSONString(js.get("acc_json")), MidSeventeen.class) :
+                                        midSeventeen : midSeventeen : midSeventeen : midSeventeen : midSeventeen
+                );
+                break;
+            case TYPE_EIGHTEEN:
+                // 待开发
+                List<ContractEighteenBack> eighteens = contractEighteenBackMapper.selectList(query(reqIdVal));
+                if (eighteens.size() > 0) {
+                    js = JSON.parseObject(eighteens.get(0).getRemarks());
+                }
+                MidEighteen midEighteen = new MidEighteen("", "", "", "","", "", "", "","", "", "", "");
+                midOcr.add(
+                        eighteens.size() > 0 ? null != js ? js.containsKey("code") ? js.get("code").toString().equals("1") ?
+                                js.containsKey("data") ? JSONObject.parseObject(JSON.toJSONString(js.get("data")), MidEighteen.class) :
+                                        midEighteen : midEighteen : midEighteen : midEighteen : midEighteen
+                );
+                midOcr.add(
+                        eighteens.size() > 0 ? null != js ? js.containsKey("code") ? js.get("code").toString().equals("1") ?
+                                js.containsKey("data") ? JSONObject.parseObject(JSON.toJSONString(js.get("acc_json")), MidEighteen.class) :
+                                        midEighteen : midEighteen : midEighteen : midEighteen : midEighteen
+                );
+                break;
             default:
         }
         return midOcr;
@@ -1875,6 +1912,7 @@ public class UploadServiceImpl implements UploadService {
         List<ContractFifteen> fifteenSourceList = foundAssociate(TYPE_FIFTEEN, reqId, "0");
         List<ContractSixteen> sixteenSourceList = foundAssociate(TYPE_SIXTEEN, reqId, "0");
         List<ContractSeventeen> seventeenSourceList = foundAssociate(TYPE_SEVENTEEN, reqId, "0");
+        List<ContractEighteen> eighteenSourceList = foundAssociate(TYPE_EIGHTEEN, reqId, "0");
 
         List<ContractOneBack> oneOcrList = foundAssociate(TYPE_ONE, reqId, "1");
         List<ContractTwoBack> twoOcrList = foundAssociate(TYPE_TWO, reqId, "1");
@@ -1892,19 +1930,20 @@ public class UploadServiceImpl implements UploadService {
         List<ContractFourteenBack> fourteenOcrList = foundAssociate(TYPE_FOURTEEN, reqId, "1");
         List<ContractFifteenBack> fifteenOcrList = foundAssociate(TYPE_FIFTEEN, reqId, "1");
         List<ContractSixteenBack> sixteenOcrList = foundAssociate(TYPE_SIXTEEN, reqId, "1");
-        List<ContractSeventeenBack> seventeenOcrList = foundAssociate(TYPE_SEVENTEEN, reqId, "0");
+        List<ContractSeventeenBack> seventeenOcrList = foundAssociate(TYPE_SEVENTEEN, reqId, "1");
+        List<ContractEighteenBack> eighteenOcrList = foundAssociate(TYPE_EIGHTEEN, reqId, "1");
 
         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,eighteenSourceList);
 
         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,eighteenOcrList, 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,eighteenOcrList, false, ocr, fileType);
 
         // 20200525 新增filetype。
         List<String> types = new ArrayList<>();
@@ -2009,6 +2048,11 @@ public class UploadServiceImpl implements UploadService {
                 sourceLists = contractSeventeenMapper.selectList(query(reqIdVal));
                 ocrLists = contractSeventeenBackMapper.selectList(query(reqIdVal));
                 break;
+            case TYPE_EIGHTEEN:
+                // 待开发
+                sourceLists = contractEighteenMapper.selectList(query(reqIdVal));
+                ocrLists = contractEighteenBackMapper.selectList(query(reqIdVal));
+                break;
             default:
                 // 待开发
         }
@@ -2106,6 +2150,11 @@ public class UploadServiceImpl implements UploadService {
                         "");
                 list.add(seventeen);
                 break;
+            case TYPE_EIGHTEEN:
+                LinkEighteen eighteen = new LinkEighteen("", "", "", "", "", "", "", "", "", "", "",
+                        "");
+                list.add(eighteen);
+                break;
             default:
         }
         return list;
@@ -2117,7 +2166,7 @@ public class UploadServiceImpl implements UploadService {
                                          List<IdCodeFront> tenSourceList, List<IdCodeReverse> elevenSourceList, List<ContractTwelve> twelveSourceList,
                                          List<ContractThirteen> thirteenSourceList, List<ContractFourteen> fourteenSourceList,
                                          List<ContractFifteen> fifteenSourceList, List<ContractSixteen> sixteenSourceList,
-                                         List<ContractSeventeen> seventeenSourceList) {
+                                         List<ContractSeventeen> seventeenSourceList,List<ContractEighteen> eighteenSourceList) {
         Map<String, Object> sourceMap = new HashMap<>();
         if (oneSourceList.size() > 0) {
             sourceMap.put(TYPE_ONE, oneSourceList.size() > 0 ? JSONObject.parseObject(JSON.toJSONString(oneSourceList.get(0)), LinkOne.class) : createNullData(TYPE_ONE));
@@ -2170,6 +2219,9 @@ public class UploadServiceImpl implements UploadService {
         if (seventeenSourceList.size() > 0) {
             sourceMap.put(TYPE_SEVENTEEN, seventeenSourceList.size() > 0 ? JSONObject.parseObject(JSON.toJSONString(seventeenSourceList.get(0)), LinkSeventeen.class) : createNullData(TYPE_SEVENTEEN));
         }
+        if (eighteenSourceList.size() > 0) {
+            sourceMap.put(TYPE_EIGHTEEN, eighteenSourceList.size() > 0 ? JSONObject.parseObject(JSON.toJSONString(eighteenSourceList.get(0)), LinkEighteen.class) : createNullData(TYPE_EIGHTEEN));
+        }
         return sourceMap;
     }
 
@@ -2179,13 +2231,13 @@ public class UploadServiceImpl implements UploadService {
                                       List<IdCodeFrontBack> tenOcrList, List<IdCodeReverseBack> elevenOcrList, List<ContractTwelveBack> twelveOcrList,
                                       List<ContractThirteenBack> thirteenOcrList, List<ContractFourteenBack> fourteenOcrList,
                                       List<ContractFifteenBack> fifteenOcrList, List<ContractSixteenBack> sixteenOcrList,
-                                      List<ContractSeventeenBack> seventeenOcrList,
+                                      List<ContractSeventeenBack> seventeenOcrList,List<ContractEighteenBack> eighteenOcrList,
                                       Boolean flag, JSONObject ocr, String fileType) {
         Map<String, Object> ocrMap = new HashMap<>();
         if (fileType.equals(TYPE_ONE) || fileType.equals(TYPE_TWO) || fileType.equals(TYPE_THREE) || fileType.equals(TYPE_FOUR) ||
                 fileType.equals(TYPE_FIVE) || fileType.equals(TYPE_SIX) || fileType.equals(TYPE_SEVEN) || fileType.equals(TYPE_EIGHT) ||
                 fileType.equals(TYPE_NINE) || fileType.equals(TYPE_TEN) || fileType.equals(TYPE_ELEVEN) || fileType.equals(TYPE_TWELVE) ||
-                fileType.equals(TYPE_THIRTEEN) || fileType.equals(TYPE_FOURTEEN) || fileType.equals(TYPE_FIFTEEN) || fileType.equals(TYPE_SIXTEEN)) {
+                fileType.equals(TYPE_THIRTEEN) || fileType.equals(TYPE_FOURTEEN) || fileType.equals(TYPE_FIFTEEN) || fileType.equals(TYPE_SIXTEEN)|| fileType.equals(TYPE_SEVENTEEN)|| fileType.equals(TYPE_EIGHTEEN)) {
             if (flag) {
                 ocrMap.put(fileType, ocr.containsKey("data") ? ocr.get("data") : new JSONObject());
             } else {
@@ -2432,6 +2484,20 @@ public class UploadServiceImpl implements UploadService {
                         js.containsKey("acc_json") ? js.get("acc_json") : new JSONObject());
             }
 
+        }
+        if (eighteenOcrList.size() > 0) {
+            if (flag) {
+                ocrMap.put(TYPE_EIGHTEEN, TYPE_EIGHTEEN.equals(fileType) ?
+                        ocr.containsKey("data") ? ocr.get("data") : createNullData(TYPE_EIGHTEEN) :
+                        JSONObject.parseObject(JSON.toJSONString(eighteenOcrList.get(0)), LinkOcrEighteen.class));
+            } else {
+                JSONObject js = StringUtils.isEmpty(eighteenOcrList.get(0).getRemarks()) ? new JSONObject() :
+                        JSON.parseObject(eighteenOcrList.get(0).getRemarks());
+                ocrMap.put(TYPE_EIGHTEEN, TYPE_EIGHTEEN.equals(fileType) ?
+                        ocr.containsKey("acc_json") ? ocr.get("acc_json") : new JSONObject() :
+                        js.containsKey("acc_json") ? js.get("acc_json") : new JSONObject());
+            }
+
         }
         return ocrMap;
     }

src/main/resources/application.yml

@@ -13,7 +13,7 @@ spring:
   servlet:
     multipart:
       max-file-size: 50MB
-      max-request-size: 20MB
+      max-request-size: 50MB
 mybatis-plus:
   mapper-locations: classpath*:/mapper/*Mapper.xml
   typeAliasesPackage: com.pavis.ai.app.fjsocrasy.model

src/test/java/com/pavis/ai/app/fjsocrasy/FjsOcrAsyApplicationTests.java

@@ -1,26 +1,26 @@
-// package com.pavis.ai.app.fjsocrasy;
-//
-// import com.pavis.ai.app.fjsocrasy.form.res.ResData;
-// import com.pavis.ai.app.fjsocrasy.service.BackService;
-// import org.junit.Test;
-// import org.junit.runner.RunWith;
-// import org.springframework.beans.factory.annotation.Autowired;
-// import org.springframework.boot.test.context.SpringBootTest;
-// import org.springframework.test.context.junit4.SpringRunner;
-//
-// @RunWith(SpringRunner.class)
-// @SpringBootTest
-// public class FjsOcrAsyApplicationTests {
-//
-//     @Autowired
-//     private BackService backService;
-//
-//     @Test
-//     public void contextLoads() {
-//         ResData resData = new ResData();
-//         resData.setMidConfidence("2");
-//         resData.setOverallConfidence("2");
-//         backService.backToFjs(resData,"10",System.currentTimeMillis(),"1");
-//     }
-//
-// }
+package com.pavis.ai.app.fjsocrasy;
+
+import com.pavis.ai.app.fjsocrasy.form.res.ResData;
+import com.pavis.ai.app.fjsocrasy.service.BackService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class FjsOcrAsyApplicationTests {
+
+    @Autowired
+    private BackService backService;
+
+    @Test
+    public void contextLoads() {
+        ResData resData = new ResData();
+        resData.setMidConfidence("2");
+        resData.setOverallConfidence("2");
+        backService.backToFjs(resData,"10",System.currentTimeMillis(),"1");
+    }
+
+}