From 3474649cd571507f5514bbc30df3d72bb4199369 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Tue, 23 Nov 2021 09:48:09 +0800
Subject: [PATCH] =?UTF-8?q?ocr=E6=96=B0=E6=8C=89=E9=92=AE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SarStandFileEOController.java  |  8 +++++
 .../service/SarStandFileEOService.java        |  2 ++
 .../impl/SarStandFileEOServiceImpl.java       | 33 ++++++++++++++++---
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java
index 7ab8d9ff..bcedaae0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java
@@ -144,4 +144,12 @@ public class SarStandFileEOController extends BaseController<SarStandFileEO> {
         return Result.success(sarStandFileEOS);
     }
 
+    @ApiOperation(value = "查询文本信息")
+    @GetMapping("/queryFileInfoNew")
+    public ResponseMessage<List<SarStandFileEO>> queryFileInfoNew(@RequestParam("standId") String standId,@RequestParam("type") String type){
+
+        List<SarStandFileEO> sarStandFileEOS = sarStandFileEOService.selectFileByStandIdOCR(standId,type);
+        return Result.success(sarStandFileEOS);
+    }
+
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java
index 4d876d41..4811a744 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java
@@ -25,4 +25,6 @@ public interface SarStandFileEOService {
 
     List<SarStandFileEO> selectFileByStandId(String standId);
 
+    List<SarStandFileEO> selectFileByStandIdOCR(String standId,String type);
+
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java
index 4e6217d5..1d2c9d55 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java
@@ -1,6 +1,5 @@
 package com.adc.da.slrs.standardSplit.service.impl;
 
-import com.adc.da.slrs.standardSplit.dao.SarStandAttrDetailsEODao;
 import com.adc.da.slrs.standardSplit.dao.SarStandFileEODao;
 import com.adc.da.slrs.standardSplit.entity.SarStandFileEO;
 import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage;
@@ -12,17 +11,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class SarStandFileEOServiceImpl implements SarStandFileEOService {
-    private static final Logger logger = LoggerFactory.getLogger(SarStandFileEOServiceImpl.class);
 
     @Autowired
     private SarStandFileEODao sarStandFileEODao;
-    @Autowired
-    private SarStandAttrDetailsEODao sarStandAttrDetailsEODao;
+
 
     @Override
     public List<SarStandFileEO> getStandFileListByPage(SarStandFileEOPage stand){
@@ -80,8 +78,33 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService {
         });
 
         return sarStandFileEOS;
+    }
+    //type == 0 是pdf type==1 是doc
+    @Override
+    public List<SarStandFileEO> selectFileByStandIdOCR(String standId , String type) {
+        QueryWrapper<SarStandFileEO> queryWrapper= new QueryWrapper<>();
 
-//        return sarStandFileEODao.selectFileByStandId(standId);r
+        queryWrapper.eq("STAND_ID",standId);
+        List<SarStandFileEO> sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper);
+
+        if ("0".equals(type)){
+            List<SarStandFileEO> remove=new ArrayList<>();
+            sarStandFileEOS.forEach(sarStandFileEO -> {
+                if (!sarStandFileEO.getFileName().contains(".PDF") && !sarStandFileEO.getFileName().contains(".pdf")  ){
+                    remove.add(sarStandFileEO);
+                }
+            });
+            sarStandFileEOS.removeAll(remove);
+        }else {
+            List<SarStandFileEO> remove=new ArrayList<>();
+            sarStandFileEOS.forEach(sarStandFileEO -> {
+                if (!sarStandFileEO.getFileName().contains(".DOC") && !sarStandFileEO.getFileName().contains(".doc")  ){
+                    remove.add(sarStandFileEO);
+                }
+            });
+            sarStandFileEOS.removeAll(remove);
+        }
+        return sarStandFileEOS;
     }
 
 }