1、类型5和18的合并。

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

@@ -109,6 +109,7 @@ public class ParseUtils {
                     resData = loanApplicationFormEnjoyELoanRes(reqId, templateType, sourceData, ocrData, matchRes);
                     break;
                 case "18":
+                // case "5":
                     // 待开发
                     resData = newCreditContractRes(reqId, templateType, sourceData, ocrData, matchRes);
                     break;
@@ -1214,4 +1215,25 @@ public class ParseUtils {
         return backData;
     }
 
+    /**
+     * 类型5数据处理。
+     * @param data
+     * @return
+     */
+    public static String changeSourceDataBy18(String data){
+        JSONObject js = JSON.parseObject(data);
+        if (js.containsKey("postCode")){
+            js.remove("postCode");
+        }
+        if (js.containsKey("deadline")){
+            js.remove("deadline");
+        }
+        System.err.println(js.toJSONString());
+        if (js.containsKey("address")){
+            js.put("addressSign",js.get("address").toString());
+        }
+        return js.toJSONString();
+    }
+
+
 }

src/main/java/com/pavis/ai/app/fjsocrasy/controller/BackController.java

@@ -173,6 +173,7 @@ public class BackController {
             // if (fileType.equals(""))
             reqId = createReqId(reqId, fileType);
             if (data.contains("{") && GeneralUtils.checkJson(data) && !data.equals("{}")) {
+                fileType = fileType.equals("5") ? "18" : fileType;
                 Map<String, Object> resMap = ocrService.res(reqId, fileType, files, data, startTime);
                 long endTime = System.currentTimeMillis();
                 log.info("upload syn excTime:{}", DateUtils.getExcTime(startTime, endTime));
@@ -204,6 +205,7 @@ public class BackController {
     @ApiOperationSupport(order = 3)
     @PostMapping("/fjs/ocr")
     public ResultBody res(String reqId, String fileType, String data, @RequestParam("files") MultipartFile[] files) throws Exception {
+        fileType = fileType.equals("5") ? "18" :fileType;
         List<File> fileLists = new ArrayList<>();
         for (MultipartFile file : files) {
             File f = new File(commonProperties.getDir().getUpload() + file.getOriginalFilename());

src/main/java/com/pavis/ai/app/fjsocrasy/controller/OcrController.java

@@ -62,6 +62,7 @@ public class OcrController {
         long startTime = System.currentTimeMillis();
         if (!StringUtils.isEmpty(data) && !data.equals("null")){
             if (data.contains("{") && GeneralUtils.checkJson(data) && !data.equals("{}")){
+                fileType = fileType.equals("5") ? "18" : fileType;
                 List<FileDetails> paths = uploadService.upload(reqId,fileType,data,files,startTime);
                 // uploadService.upload(reqId,fileType,data,files,startTime);
                 long endTime = System.currentTimeMillis();
@@ -96,6 +97,7 @@ public class OcrController {
         long startTime = System.currentTimeMillis();
         if (!StringUtils.isEmpty(data) && !data.equals("null")){
             if (data.contains("{") && GeneralUtils.checkJson(data) && !data.equals("{}")){
+                fileType = fileType.equals("5") ? "18" : fileType;
                 Map<String,Object> resMap = ocrService.res(reqId,fileType,files,data,startTime);
                 long endTime = System.currentTimeMillis();
                 log.info("upload syn excTime:{}", DateUtils.getExcTime(startTime,endTime));

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

@@ -36,4 +36,8 @@ public class Eighteen {
     private String sendAddress;
     @ApiModelProperty(value="对比日期")
     private String compareDate;
+    @ApiModelProperty(value="邮编")
+    private String postCode;
+    @ApiModelProperty(value="使用期限")
+    private String deadline;
 }

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 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);
+    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 postCode,String deadline, String reqId) {
+        super(lender, idCode, mobile, address, lower, period,account, accountCode, loanType,sendAddress, compareDate,postCode,deadline);
         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 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);
+    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 postCode,String deadline,  String reqId) {
+        super(lender, idCode, mobile, address,lower, period,account, accountCode, loanType,sendAddress, compareDate,postCode,deadline);
         this.reqId = reqId;
     }
 }

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

@@ -33,7 +33,7 @@ public class MidEighteen {
     @ApiModelProperty(value="贷款用途")
     private String loanType;
     @ApiModelProperty(value="乙方送达联系地址")
-    private String sendAddress;
+    private String addressSign;
     @ApiModelProperty(value="乙方签名")
     private String lenderSign;
     @ApiModelProperty(value="签署日期")

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

@@ -34,7 +34,7 @@ public class NewCreditContract {
     @ApiModelProperty(value="贷款用途")
     private BackData loanType;
     @ApiModelProperty(value="乙方送达联系地址")
-    private BackData sendAddress;
+    private BackData addressSign;
     @ApiModelProperty(value="乙方签名")
     private BackData lenderSign;
     @ApiModelProperty(value="签署日期")

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

@@ -19,13 +19,21 @@ public class ContractEighteen {
     private String id;
     private String reqId;
     private String lender;
-    private String idCode;
-    private String mobile;
     private String address;
-    private String lower;
-    private String period;
+    private String mobile;
+    /**
+     * 新增字段。但是不用，勿删除。
+     */
+    private String postCode;
     private String account;
     private String accountCode;
+    private String idCode;
+    private String lower;
+    /**
+     * 新增字段，但是不用。勿删除。
+     */
+    private String deadline;
+    private String period;
     private String loanType;
     private String sendAddress;
     private String compareDate;

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

@@ -19,16 +19,16 @@ public class ContractEighteenBack {
     private String id;
     private String reqId;
     private String lender;
-    private String idCode;
-    private String mobile;
     private String address;
+    private String mobile;
+    private String idCode;
     private String lower;
-    private String period;
     private String account;
     private String accountCode;
+    private String period;
     private String loanType;
-    private String sendAddress;
     private String lenderSign;
+    private String addressSign;
     private String dateSign;
     private String operator;
     private String operatorId;

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

@@ -10,9 +10,9 @@ 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:52090")
 // 生产环境
 // @FeignClient(value = "eternalSendService",url = "http://61.155.215.241:53090")
 public interface EternalSendService {

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

@@ -23,7 +23,8 @@ import java.util.Map;
 // @FeignClient(value = "internalSendService",url = "http://192.168.1.200:28011")
 // @FeignClient(value = "internalSendService",url = "http://127.0.0.1:28011")
 // 测试环境
-@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:8099")
 // @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/OcrService.java

@@ -64,5 +64,6 @@ public interface OcrService {
      */
     Map<String, Object> res(String reqId, String fileType, MultipartFile[] files, String data, Long startTime) throws Exception;
 
+    Map<String, Object> singleFileOcrSyn(String reqId, String fileType, FileDetails parsedFilePath, List<FileDetails> paths, String sourceData,Long startTime) throws Exception;
 
 }

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

@@ -79,6 +79,7 @@ public class OcrServiceImpl implements OcrService {
     public void toOcr(String reqId, String fileType, String url, String fileName, String data, Long startTime) throws IOException {
         // 2.2 获取ocr返回值。
         log.info("step ***2: ocr***");
+        data = fileType.equals("18") ? ParseUtils.changeSourceDataBy18(data) : data;
         Map<String,Object> ocrMap = toOcrMap(reqId,fileType,url,fileName,data,startTime);
 
         if (null != ocrMap && ocrMap.containsKey("req_id")){
@@ -164,6 +165,7 @@ public class OcrServiceImpl implements OcrService {
     public Map<String,Object> toSingleFileOcr(String reqId, String fileType, FileDetails parsedFilePath, List<FileDetails> paths, String sourceData,Long startTime) {
         Map<String, Object> matchMap = new HashMap<>();
         Map<String, Object> ocrMap = new HashMap<>();
+        sourceData = fileType.equals("18") ? ParseUtils.changeSourceDataBy18(sourceData) : sourceData;
         JSONObject ocr = null;
         if (fileType.equals("10") || fileType.equals("11")) {
             try {
@@ -294,8 +296,11 @@ public class OcrServiceImpl implements OcrService {
      * @throws IOException
      */
     public void singleFileOcr(String reqId, String fileType, FileDetails parsedFilePath, List<FileDetails> paths, String sourceData,Long startTime) {
+        System.err.println(JSON.toJSONString(parsedFilePath));
+        System.err.println("paths>"+JSON.toJSONString(paths));
         Map<String, Object> matchMap = new HashMap<>();
         Map<String, Object> ocrMap = new HashMap<>();
+        sourceData = fileType.equals("18") ? ParseUtils.changeSourceDataBy18(sourceData) : sourceData;
         JSONObject ocr = null;
         if (fileType.equals("10") || fileType.equals("11")) {
             try {
@@ -445,9 +450,11 @@ public class OcrServiceImpl implements OcrService {
      * @return
      * @throws IOException
      */
+    @Override
     public Map<String, Object> singleFileOcrSyn(String reqId, String fileType, FileDetails parsedFilePath, List<FileDetails> paths, String sourceData,Long startTime) throws IOException {
         Map<String, Object> matchMap = new HashMap<>();
         Map<String, Object> ocrMap = new HashMap<>();
+        sourceData = fileType.equals("18") ? ParseUtils.changeSourceDataBy18(sourceData) : sourceData;
         JSONObject ocr = null;
         if (fileType.equals("10") || fileType.equals("11")) {
             try {
@@ -558,7 +565,7 @@ public class OcrServiceImpl implements OcrService {
             linkMap.put("req_id",reqId);
             return linkMap;
         }
-        matchMap.put("source_data", fileType.equals("2") || fileType.equals("13") || fileType.equals("14") || fileType.equals("17")
+        matchMap.put("source_data", fileType.equals("18") ? ParseUtils.changeSourceDataBy18(sourceData) : fileType.equals("2") || fileType.equals("13") || fileType.equals("14") || fileType.equals("17")
                 ? dealSource(sourceData) : sourceData);
         matchMap.put("ocr_data", JSON.toJSONString(ocr.get("data")));
         matchMap.put("type",fileType);

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

@@ -48,6 +48,5 @@ public class OtherServiceImpl implements OtherService {
         // 2.1、将ocr数据放入队列中。
         CorrelationData correlationData = new CorrelationData(reqId);
         dealService.sendMessage(Constants.ROUTING_OP_KEY, JSON.toJSONString(rbmqMap).getBytes(), correlationData);
-
     }
 }

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

@@ -930,7 +930,7 @@ public class UploadServiceImpl implements UploadService {
                         .account(newCreditContract.getAccount().getOcrRes())
                         .accountCode(newCreditContract.getAccountCode().getOcrRes())
                         .loanType(newCreditContract.getLoanType().getOcrRes())
-                        .sendAddress(newCreditContract.getSendAddress().getOcrRes())
+                        .addressSign(newCreditContract.getAddressSign().getOcrRes())
                         .lenderSign(newCreditContract.getLenderSign().getOcrRes())
                         .operator(JSON.toJSONString(resData))
                         .operatorId("")
@@ -1484,6 +1484,8 @@ public class UploadServiceImpl implements UploadService {
                     contractEighteen = new ContractEighteen();
                     BeanUtils.copyProperties(eighteen, contractEighteen);
                     contractEighteen.setReqId(reqId);
+                    contractEighteen.setPostCode("");
+                    contractEighteen.setDeadline("");
                     contractEighteen.setOperator("");
                     contractEighteen.setOperatorId("");
                     contractEighteen.setOperateIp("");
@@ -1493,6 +1495,7 @@ public class UploadServiceImpl implements UploadService {
                     contractEighteen = new ContractEighteen();
                 }
                 resData.setRes(contractEighteen);
+                System.err.println(JSON.toJSONString(contractEighteen));
                 saveId = contractEighteenMapper.insert(contractEighteen);
                 break;
             default:
@@ -2161,7 +2164,7 @@ public class UploadServiceImpl implements UploadService {
                 break;
             case TYPE_EIGHTEEN:
                 LinkEighteen eighteen = new LinkEighteen("", "", "", "", "", "", "", "", "", "", "",
-                        "");
+                        "","","");
                 list.add(eighteen);
                 break;
             default:

src/main/resources/application-dev.yml

@@ -2,13 +2,13 @@ spring:
   datasource:
 #    url: jdbc:mysql://192.168.1.73/fjs_ocr_11?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT
 #    url: jdbc:mysql://192.168.1.73/fjs_ocr_12?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT
-    url: jdbc:mysql://192.168.1.73/fjs_ocr_13?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT
+    url: jdbc:mysql://192.168.1.37/fjs_ocr_13?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT
 #    url: jdbc:mysql://192.168.1.73/fjs_ocr_14?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: root
   rabbitmq:
-    host: 192.168.1.73
+    host: 192.168.1.37
 #    host: 47.104.109.52
     port: 5672
     username: fjs
@@ -30,7 +30,7 @@ logging:
   level:
     org.springframework.cloud: debug
     org.springframework.boot: debug
-    com.pavis.ai.app.fjs_ocr.mapper: trace
+    com.pavis.ai.app.fjsocrasy.mapper: debug
 security:
   oauth2:
     client:

src/main/resources/application.yml

@@ -7,8 +7,8 @@ spring:
   application:
     name: fujisu-ocr-server
   profiles:
-#    active: dev
-    active: test
+    active: dev
+#    active: test
 #    active: prod
   servlet:
     multipart:

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

@@ -1,26 +1,103 @@
-// 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.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.pavis.ai.app.fjsocrasy.common.utils.DateUtils;
+import com.pavis.ai.app.fjsocrasy.form.FileDetails;
+import com.pavis.ai.app.fjsocrasy.form.eighteen.Eighteen;
+import com.pavis.ai.app.fjsocrasy.form.res.ResData;
+import com.pavis.ai.app.fjsocrasy.mapper.ContractEighteenMapper;
+import com.pavis.ai.app.fjsocrasy.model.ContractEighteen;
+import com.pavis.ai.app.fjsocrasy.service.BackService;
+import com.pavis.ai.app.fjsocrasy.service.OcrService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.io.IOException;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class FjsOcrAsyApplicationTests {
+
+    @Autowired
+    private BackService backService;
+
+    @Test
+    public void contextLoads() {
+        String data = "{ \"lender\":\"王俞\", \"address\":\"上海市上海市管辖区浦东新区祝桥镇千汇路750弄60号401室\", \"mobile\":\"18501631918\", \"postCode\":\"200000\", \"idCode\":\"310225198803253034\", \"lower\":\"200000\", \"account\":\"王俞\", \"accountCode\":\"6217900800003831631\", \"deadline\":\"36\" , \"compareDate\":\"2020.04.15\" }";
+
+        System.err.println(changeSourceDataBy18(data));
+        // ResData resData = new ResData();
+        // resData.setMidConfidence("2");
+        // resData.setOverallConfidence("2");
+        // backService.backToFjs(resData,"10",System.currentTimeMillis(),"1");
+    }
+
+    public String changeSourceDataBy18(String data){
+        JSONObject js = JSON.parseObject(data);
+        if (js.containsKey("postCode")){
+            js.remove("postCode");
+        }
+        if (js.containsKey("deadline")){
+            js.remove("deadline");
+        }
+        System.err.println(js.toJSONString());
+        if (js.containsKey("address")){
+            js.put("addressSign",js.get("address").toString());
+        }
+        return js.toJSONString();
+    }
+
+    @Autowired
+    private OcrService ocrService;
+
+
+
+    @Test
+    public void test() throws IOException {
+        String data = "{  \"lender\":\"占小琴\",  \"idCode\":\"420281198501257247\",  \"mobile\":\"13872114908\", \"address\":\"湖北省黄石市下陆区半山骊园6栋1单元304室\",  \"lower\":\"150000\",  \"postCode\":\"200000\",  \"deadline\":\"36\", \"period\":\"36\",  \"account\":\"占小琴\",  \"accountCode\":\"6217907600006022664\",  \"loanType\":\"装修\",  \"sendAddress\":\"湖北省黄石市下陆区半山骊园6栋1单元304室\" , \"compareDate\":\"2020.07.30\" }";
+        String reqId = "BO202008210002";
+        String fileType = "5";
+        String url = "";
+        String fileName = "";
+        Long startTime = System.currentTimeMillis();
+        // ocrService.toOcr(reqId,  fileType,  url,  fileName,  data,  startTime);
+        ocrService.toOcr(reqId,  fileType,  url,  fileName,  data,  startTime);
+        // ocrService.singleFileOcrSyn( reqId,  fileType, FileDetails parsedFilePath, List<FileDetails> paths,  sourceData, startTime);
+
+        System.err.println(changeSourceDataBy18(data));
+        // ResData resData = new ResData();
+        // resData.setMidConfidence("2");
+        // resData.setOverallConfidence("2");
+        // backService.backToFjs(resData,"10",System.currentTimeMillis(),"1");
+    }
+
+    @Autowired
+    private ContractEighteenMapper contractEighteenMapper;
+    @Test
+    public void test18(){
+        String data = "{\"account\":\"占小琴\",\"accountCode\":\"6217907600006022664\",\"address\":\"湖北省黄石市下陆区半山骊园6栋1单元304室\",\"compareDate\":\"2020.07.30\",\"deadline\":\"\",\"idCode\":\"420281198501257247\",\"lender\":\"占小琴\",\"loanType\":\"装修\",\"lower\":\"150000\",\"mobile\":\"13872114908\",\"operateIp\":\"\",\"operateTime\":\"2020-08-21 15:37:16\",\"operator\":\"\",\"operatorId\":\"\",\"period\":\"36\",\"postCode\":\"\",\"remarks\":\"1301.0ms\",\"reqId\":\"BO202008210005\",\"sendAddress\":\"湖北省黄石市下陆区半山骊园6栋1单元304室\"}\n";
+        ContractEighteen contractEighteen;
+        if (null != data) {
+            Eighteen eighteen = JSONObject.parseObject(JSON.parseObject(data).toJSONString(), Eighteen.class);
+            contractEighteen = new ContractEighteen();
+            BeanUtils.copyProperties(eighteen, contractEighteen);
+            contractEighteen.setReqId("1111111111111111111111");
+            contractEighteen.setPostCode("");
+            contractEighteen.setDeadline("");
+            contractEighteen.setOperator("");
+            contractEighteen.setOperatorId("");
+            contractEighteen.setOperateIp("");
+            contractEighteen.setOperateTime(DateUtils.now());
+            contractEighteen.setRemarks(String.valueOf(System.currentTimeMillis()));
+        } else {
+            contractEighteen = new ContractEighteen();
+        }
+        System.err.println(contractEighteenMapper.insert(contractEighteen));
+    }
+
+}