Quellcode durchsuchen

1、增加日志,为了抓取异常。

jessie vor 4 Jahren
Ursprung
Commit
bc7b786a11
25 geänderte Dateien mit 67 neuen und 35 gelöschten Zeilen
  1. 2 2
      src/main/java/com/pavis/ai/app/fjsocrasy/common/config/DiskRemindScheduleConfig.java
  2. 2 2
      src/main/java/com/pavis/ai/app/fjsocrasy/common/utils/DiskUtils.java
  3. 3 3
      src/main/java/com/pavis/ai/app/fjsocrasy/common/utils/ocr/AipOcrUtils.java
  4. 3 5
      src/main/java/com/pavis/ai/app/fjsocrasy/common/utils/ocr/GeneralUtils.java
  5. 4 3
      src/main/java/com/pavis/ai/app/fjsocrasy/common/utils/ocr/ParseUtils.java
  6. 3 3
      src/main/java/com/pavis/ai/app/fjsocrasy/controller/BackController.java
  7. 1 1
      src/main/java/com/pavis/ai/app/fjsocrasy/service/impl/BackServiceImpl.java
  8. 7 6
      src/main/java/com/pavis/ai/app/fjsocrasy/service/impl/OcrServiceImpl.java
  9. 2 2
      src/main/java/com/pavis/ai/app/fjsocrasy/service/impl/UploadServiceImpl.java
  10. 3 0
      src/main/resources/application-dev.yml
  11. 2 2
      src/main/resources/application.yml
  12. 30 4
      src/test/java/com/pavis/ai/app/fjsocrasy/FjsOcrAsyApplicationTests.java
  13. 3 0
      target/classes/application-dev.yml
  14. 2 2
      target/classes/application.yml
  15. BIN
      target/classes/com/pavis/ai/app/fjsocrasy/common/config/DiskRemindScheduleConfig.class
  16. BIN
      target/classes/com/pavis/ai/app/fjsocrasy/common/utils/DiskUtils.class
  17. BIN
      target/classes/com/pavis/ai/app/fjsocrasy/common/utils/ocr/AipOcrUtils.class
  18. BIN
      target/classes/com/pavis/ai/app/fjsocrasy/common/utils/ocr/GeneralUtils.class
  19. BIN
      target/classes/com/pavis/ai/app/fjsocrasy/common/utils/ocr/ParseUtils.class
  20. BIN
      target/classes/com/pavis/ai/app/fjsocrasy/controller/BackController.class
  21. BIN
      target/classes/com/pavis/ai/app/fjsocrasy/service/impl/BackServiceImpl.class
  22. BIN
      target/classes/com/pavis/ai/app/fjsocrasy/service/impl/OcrServiceImpl.class
  23. BIN
      target/classes/com/pavis/ai/app/fjsocrasy/service/impl/UploadServiceImpl.class
  24. BIN
      target/fjs-ocr-asy-1.0.0.jar
  25. BIN
      target/fjs-ocr-asy-1.0.0.jar.original

+ 2 - 2
src/main/java/com/pavis/ai/app/fjsocrasy/common/config/DiskRemindScheduleConfig.java

@@ -53,7 +53,7 @@ public class DiskRemindScheduleConfig implements SchedulingConfigurer {
                             // 通知邮件
                             Context context = new Context();
                             String url = "";
-                            System.out.println(activeUrl);
+                            log.info("activeUrl:{}",activeUrl);
                             switch (activeUrl){
                                 case "dev":
                                     url = "本地环境(192.168.1.37)";
@@ -66,7 +66,7 @@ public class DiskRemindScheduleConfig implements SchedulingConfigurer {
                                     break;
                                 default:
                             }
-                            System.out.println(url);
+                            log.info("url:{}",url);
                             context.setVariable("url", url);
                             String emailTemplate = templateEngine.process("notify", context);
                             // mailService.sendHtmlMail(Constants.ZK_MAIL, "磁盘空间使用量通知", emailTemplate);

+ 2 - 2
src/main/java/com/pavis/ai/app/fjsocrasy/common/utils/DiskUtils.java

@@ -76,11 +76,11 @@ public class DiskUtils {
             if (win.exists()) {
                 double freespace = win.getFreeSpace() / unit;
                 freespace = Math.ceil((freespace * 10)) / 10;
-                System.err.println(freespace);
+                // System.err.println(freespace);
                 long total = win.getTotalSpace();
                 long usableSpace = win.getUsableSpace();
                 double space = (double)(total - usableSpace) / total;
-                System.out.println(space);
+                // System.out.println(space);
                 // if(space > 0.8){
                 //     return space;
                 // }

+ 3 - 3
src/main/java/com/pavis/ai/app/fjsocrasy/common/utils/ocr/AipOcrUtils.java

@@ -36,7 +36,7 @@ public class AipOcrUtils {
      * @return
      */
     public static String sample(String image, String idCardSide) {
-        JSONObject res = null;
+        JSONObject res = new JSONObject();
         try {
             AipOcr client = initAipOcr();
             // 传入可选参数调用接口
@@ -60,10 +60,10 @@ public class AipOcrUtils {
             // System.out.println(res.toString(2));
 
         } catch (Exception e) {
-            e.printStackTrace();
+            e.getMessage();
+            log.info("baidu idcard error:{}",e.getMessage());
         }
         return res.toString();
-
     }
 
     // /**

+ 3 - 5
src/main/java/com/pavis/ai/app/fjsocrasy/common/utils/ocr/GeneralUtils.java

@@ -477,7 +477,6 @@ public class GeneralUtils {
             // date = StringUtils.remove(cleanDate, "-");
             // date = cleanDate;
             // System.err.println("dat>"+date);
-            System.out.println(date.length());
             if (date.length() != 8 && date.length() != 9) {
                 if (tmpDate.startsWith("-")) {
                     tmpDate = StringUtils.removeStart(tmpDate, "-");
@@ -487,7 +486,6 @@ public class GeneralUtils {
                 }
                 return tmpDate;
             }else{
-                System.out.println(date);
                 if (StringUtils.countMatches(date,"-") == 2){
                     String year = StringUtils.substringBefore(date, "-");
                     // System.err.println(year);
@@ -504,7 +502,7 @@ public class GeneralUtils {
                         }
                     }
                     date = year + month + day;
-                    System.out.println(date);
+                    // System.out.println(date);
                 }
                 if (date.length() == 10){
                     return finalDate(date);
@@ -541,9 +539,9 @@ public class GeneralUtils {
             int month = formatted.getMonthValue();
             int day = formatted.getDayOfMonth();
 
-            System.out.printf("Year : %d  Month : %d  day : %d t %n", year, month, day);
+            // System.out.printf("Year : %d  Month : %d  day : %d t %n", year, month, day);
             String resDate = year + "年" + month + "月" + day + "日";
-            System.out.println("resDate>" + resDate);
+            // System.out.println("resDate>" + resDate);
             return resDate;
         } catch (Exception e) {
             e.getMessage();

+ 4 - 3
src/main/java/com/pavis/ai/app/fjsocrasy/common/utils/ocr/ParseUtils.java

@@ -169,8 +169,10 @@ public class ParseUtils {
      * @return
      */
     public static JSONObject midOcrFront(boolean checked,String code,String fileType,String ocrData){
+        log.info("checked: " + !checked);
         Map<String, Object> ocrDataMap = new HashMap<>();
-        if (!checked){
+        if (checked == false){
+            log.info("cheked false");
             ocrDataMap.put("name", "");
             ocrDataMap.put("idCode", "");
         }
@@ -197,7 +199,7 @@ public class ParseUtils {
 
     public static JSONObject midOcrReverse(boolean checked,String code,String fileType,String ocrData){
         Map<String, Object> ocrDataMap = new HashMap<>();
-        if (!checked){
+        if (checked == false){
             ocrDataMap.put("expireDate", "");
         }
         JSONObject reverse = new JSONObject();
@@ -1282,7 +1284,6 @@ public class ParseUtils {
         if (js.containsKey("deadline")){
             js.remove("deadline");
         }
-        System.err.println(js.toJSONString());
         if (js.containsKey("address")){
             js.put("addressSign",js.get("address").toString());
         }

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

@@ -267,9 +267,9 @@ public class BackController {
     @ApiOperationSupport(order = 11)
     @PostMapping("/api/async")
     public ResultBody async(@RequestBody TestAsync testAsync) throws Exception {
-        System.err.println(testAsync.getReqId()+","+testAsync.getFileType()
-                +","+testAsync.getData()+","+testAsync.getStartTime()+","+
-                testAsync.getParsedFilePaths());
+        // System.err.println(testAsync.getReqId()+","+testAsync.getFileType()
+        //         +","+testAsync.getData()+","+testAsync.getStartTime()+","+
+        //         testAsync.getParsedFilePaths());
         uploadService.uploadAsync( testAsync.getReqId(),  testAsync.getFileType(),
                 testAsync.getData(),   testAsync.getStartTime(),testAsync.getParsedFilePaths());
         // uploadService.upload(reqId,fileType,data,startTime,parsedFilePaths);

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

@@ -63,7 +63,7 @@ public class BackServiceImpl implements BackService {
                     : ParseUtils.midOcrReverse(false, "-1", fileType, "");
             // todo 直接返回,不用在调用match函数。
             uploadService.saveBack(getNullBackResData(reqId, fileType), JSON.toJSONString(midOcr), startTime);
-            boolean flag = null != ocr ? ocr.get("image_status").equals("non_idcard") ? true : false : false;
+            boolean flag = null != ocr ? ocr.containsKey("image_status") ? ocr.get("image_status").equals("non_idcard") ? true : false : 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));

+ 7 - 6
src/main/java/com/pavis/ai/app/fjsocrasy/service/impl/OcrServiceImpl.java

@@ -60,7 +60,7 @@ public class OcrServiceImpl implements OcrService {
         log.info("step ***2: ocr***");
         data = fileType.equals("18") ? ParseUtils.changeSourceDataBy18(data) : data;
         Map<String,Object> ocrMap = toOcrMap(reqId,fileType,url,fileName,data,startTime);
-        log.info("match pre:{}",JSON.toJSONString(ocrMap));
+        log.info("match-pre,only ocr:{}",JSON.toJSONString(ocrMap));
         if (null != ocrMap && ocrMap.containsKey("req_id")){
             // 3、用户画像相似匹配。
             linkService.match(ocrMap.get("req_id").toString(),ocrMap.get("type").toString(),startTime,
@@ -69,6 +69,9 @@ public class OcrServiceImpl implements OcrService {
             long endTime = System.currentTimeMillis();
             String excTime = DateUtils.getExcTime(startTime, endTime);
             log.info("match exctime:{}",excTime);
+        }else{
+            // backService.back(fileType,reqId,startTime,new JSONObject());
+            log.info("step 2 error,maybe ocrmap null....");
         }
     }
 
@@ -151,7 +154,7 @@ public class OcrServiceImpl implements OcrService {
                 long endTime = System.currentTimeMillis();
                 log.info("step2 ocr excTime:{}", DateUtils.getExcTime(startTime,endTime));
                 log.info("ocr-mid res:{}", JSON.toJSONString(ocr));
-                if (null != ocr && ocr.get("image_status").toString().equals("normal")) {
+                if (null != ocr && ocr.containsKey("image_status") && ocr.get("image_status").toString().equals("normal")) {
                     // 解析ocr数据。
                     JSONObject midOcr = new JSONObject();
                     String ocrData = "";
@@ -274,8 +277,6 @@ 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;
@@ -286,7 +287,7 @@ public class OcrServiceImpl implements OcrService {
                 long endTime = System.currentTimeMillis();
                 log.info("ocr excTime:{}", DateUtils.getExcTime(startTime,endTime));
                 log.info("ocr-mid res:{}", JSON.toJSONString(ocr));
-                if (null != ocr && ocr.get("image_status").toString().equals("normal")) {
+                if (null != ocr && ocr.containsKey("image_status") && ocr.get("image_status").toString().equals("normal")) {
                     // 解析ocr数据。
                     JSONObject midOcr = new JSONObject();
                     String ocrData = "";
@@ -315,7 +316,7 @@ public class OcrServiceImpl implements OcrService {
                     JSONObject midOcr = fileType.equals("10") ? ParseUtils.midOcrFront(false,"-1",fileType,"")
                             : ParseUtils.midOcrReverse(false,"-1",fileType,"");
                     uploadService.saveBack(backService.getNullBackResData(reqId, fileType),JSON.toJSONString(midOcr),startTime);
-                    boolean flag = null != ocr ? ocr.get("image_status").equals("non_idcard") ? true : false : false;
+                    boolean flag = null != ocr ? ocr.containsKey("image_status") ? ocr.get("image_status").equals("non_idcard") ? true : false : false : false;
                     back(backService.getNullBackResData(reqId, fileType), reqId, fileType, flag ? "-1" : "0");
                     endTime = System.currentTimeMillis();
                     log.info("ocr back excTime:{}", DateUtils.getExcTime(startTime,endTime));

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

@@ -1526,7 +1526,7 @@ public class UploadServiceImpl implements UploadService {
                     contractEighteen = new ContractEighteen();
                 }
                 resData.setRes(contractEighteen);
-                System.err.println(JSON.toJSONString(contractEighteen));
+                // System.err.println(JSON.toJSONString(contractEighteen));
                 saveId = contractEighteenMapper.insert(contractEighteen);
                 break;
             case "19":
@@ -1547,7 +1547,7 @@ public class UploadServiceImpl implements UploadService {
                     contractNineTeen = new ContractNineteen();
                 }
                 resData.setRes(contractNineTeen);
-                System.err.println(JSON.toJSONString(contractNineTeen));
+                // System.err.println(JSON.toJSONString(contractNineTeen));
                 saveId = contractNineTeenMapper.insert(contractNineTeen);
                 break;
             default:

+ 3 - 0
src/main/resources/application-dev.yml

@@ -43,5 +43,8 @@ logging:
     org.springframework.boot: debug
     com.pavis.ai.app.fjsocrasy.mapper: debug
 alg-client:
+  # 测试时使用,与测试环境保持一致.
   internal: http://180.76.146.227:8099
+  # 使用场景: 生产环境部署时,调试后再上线.
+#  internal: http://47.104.109.52:8089
   eternal: http://192.168.1.37:8000

+ 2 - 2
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:

+ 30 - 4
src/test/java/com/pavis/ai/app/fjsocrasy/FjsOcrAsyApplicationTests.java

@@ -106,11 +106,11 @@
 //         }
 //         System.err.println(canPath);
 //         System.err.println(absPath);
-//         double canSpace = DiskUtils.getWinDiskStoresInfo(canPath);
-//         System.err.println(canSpace);
+//         // double canSpace = DiskUtils.getWinDiskStoresInfo(canPath);
+//         // System.err.println(canSpace);
 //
-//         double absSpace = DiskUtils.getWinDiskStoresInfo(absPath);
-//         System.err.println(absSpace);
+//         // double absSpace = DiskUtils.getWinDiskStoresInfo(absPath);
+//         // System.err.println(absSpace);
 //
 //
 //     }
@@ -194,8 +194,34 @@
 //     @Autowired
 //     private OcrService ocrService;
 //
+//     @Test
+//     public void testjs(){
+//         JSONObject ocr = null;
+//         System.err.println(JSON.toJSONString(ocr));
+//         org.json.JSONObject res = new org.json.JSONObject();
+//         try {
+//             String resStr = res.toString();
+//             ocr = JSON.parseObject(resStr);
+//
+//             System.err.println("ocr 2:"+JSON.toJSONString(ocr));
+//         }catch (Exception e){
+//             e.getMessage();
+//             System.err.println(e.getMessage());
+//         }
+//         String resstr = res.toString();
+//         ocr = res.equals("noneex") ? ocr : JSON.parseObject(resstr);
+//         System.err.println("ocr 4:"+JSON.toJSONString(ocr));
 //
 //
+//         ocr = JSON.parseObject(resstr);
+//
+//         System.err.println("ocr 3:"+JSON.toJSONString(ocr));
+//         if (null != ocr && ocr.containsKey("image_status") && ocr.get("image_status").toString().equals("normal")) {
+//             System.err.println("...");
+//         }
+//
+//     }
+//
 //     @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\" }";

+ 3 - 0
target/classes/application-dev.yml

@@ -43,5 +43,8 @@ logging:
     org.springframework.boot: debug
     com.pavis.ai.app.fjsocrasy.mapper: debug
 alg-client:
+  # 测试时使用,与测试环境保持一致.
   internal: http://180.76.146.227:8099
+  # 使用场景: 生产环境部署时,调试后再上线.
+#  internal: http://47.104.109.52:8089
   eternal: http://192.168.1.37:8000

+ 2 - 2
target/classes/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:

BIN
target/classes/com/pavis/ai/app/fjsocrasy/common/config/DiskRemindScheduleConfig.class


BIN
target/classes/com/pavis/ai/app/fjsocrasy/common/utils/DiskUtils.class


BIN
target/classes/com/pavis/ai/app/fjsocrasy/common/utils/ocr/AipOcrUtils.class


BIN
target/classes/com/pavis/ai/app/fjsocrasy/common/utils/ocr/GeneralUtils.class


BIN
target/classes/com/pavis/ai/app/fjsocrasy/common/utils/ocr/ParseUtils.class


BIN
target/classes/com/pavis/ai/app/fjsocrasy/controller/BackController.class


BIN
target/classes/com/pavis/ai/app/fjsocrasy/service/impl/BackServiceImpl.class


BIN
target/classes/com/pavis/ai/app/fjsocrasy/service/impl/OcrServiceImpl.class


BIN
target/classes/com/pavis/ai/app/fjsocrasy/service/impl/UploadServiceImpl.class


BIN
target/fjs-ocr-asy-1.0.0.jar


BIN
target/fjs-ocr-asy-1.0.0.jar.original