1、新增类型18前的一次提交。若回退可回退至此版本。

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

@@ -244,10 +244,10 @@ public class BackController {
     @PostMapping("/importRecommendInfo")
     public ResultBody importRecommendInfo(@RequestParam("files") MultipartFile[] files) {
         int savedId = recommendInfoService.recommdInfoImport(files);
-        if (savedId > 0 && savedId != 3) {
+        if (savedId > 0 && savedId != -3) {
             return ResultBody.ok().msg("数据导入成功").data(savedId);
         } else {
-            return ResultBody.failed().msg(savedId == 3 ? "该数据已存在请勿重复录入" : "数据导入失败").data(savedId);
+            return ResultBody.failed().msg(savedId == -3 ? "该数据已存在请勿重复录入" : "数据导入失败").data(savedId);
         }
     }
 
@@ -463,6 +463,15 @@ public class BackController {
                 .descriptionFour("1、优化识别速度；2、针对“推荐函”维护一份“推荐人员”及“推荐人员联系方式”的库，用来优化识别；3、印章识别优化目标检测算法。")
                 .build();
 
+        ProVersion pv17 = ProVersion.builder()
+                .date("2020-07-29 测试环境")
+                .version("V3.8")
+                .descriptionOne("1、针对日期手写字优化。")
+                .descriptionTwo("2020-08-03 生产环境")
+                .descriptionThree("V1.16")
+                .descriptionFour("1、针对日期手写字优化.2、多线程异常解决。")
+                .build();
+
         ver.add(pv1);
         ver.add(pv2);
         ver.add(pv3);
@@ -479,6 +488,7 @@ public class BackController {
         ver.add(pv14);
         ver.add(pv15);
         ver.add(pv16);
+        ver.add(pv17);
         return ver;
     }
 

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

@@ -26,9 +26,9 @@ import java.util.Map;
 // @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")
+// @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/OcrServiceImpl.java

@@ -472,6 +472,7 @@ public class OcrServiceImpl implements OcrService {
                     matchMap.put("ocr_data", ocrData);
                     matchMap.put("type",fileType);
                     matchMap.put("acc_json",ParseUtils.createIdCardAcc(fileType));
+                    matchMap.put("recommends",fileType.equals("3") ? JSON.toJSONString(recommendInfoService.findRecomInfo()) : "[]");
                     String matchRes = internalSendService.match(matchMap);
                     // String matchRes = internalSendService.link(matchMap);
                     ResData resData = ParseUtils.parseRes(reqId, fileType, JSON.parseObject(sourceData),

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

@@ -60,7 +60,8 @@ public class RecommendInfoServiceImpl implements RecommendInfoService {
             // 入库
             savedId = saveData(recommendedInfoExcelDatas);
         }
-        return savedId;
+        List<RecommendInfo> recommendInfos = findAll();
+        return savedId == -3 ? savedId : recommendInfos.size();
     }
 
     @Override
@@ -121,7 +122,7 @@ public class RecommendInfoServiceImpl implements RecommendInfoService {
         }else {
             long endTime = System.currentTimeMillis();
             log.info("excel finish excTime:{}", DateUtils.getExcTime(startTime,endTime));
-            return 3;
+            return -3;
         }
         long endTime = System.currentTimeMillis();
         log.info("excel finish excTime:{}", DateUtils.getExcTime(startTime,endTime));

src/main/resources/application.yml

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

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

@@ -1,7 +1,10 @@
 // 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;
 //
@@ -9,8 +12,15 @@
 // @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");
 //     }
 //
 // }