From a642c5eaa53c18bdb60f2b5bce1ef8d814aa6b0a Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 16 Dec 2021 10:40:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8E=9F=E5=A7=8B=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FileMaterialController.java         |  1 +
 .../controller/SarStandFileEOController.java       | 11 ++++++++++-
 .../service/SarStandFileEOService.java             | 13 +++++++++++++
 .../service/impl/SarStandFileEOServiceImpl.java    | 14 ++++++++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java
index 646b7fc1..555d4d4d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java
@@ -49,6 +49,7 @@ public class FileMaterialController extends BaseController<FileMaterial> {
 //        SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat);
         material.setId(UUIDUtils.randomUUID20());
         material.setDataUploadTime(new Date());
+        material.setDelFlag("0");
         boolean save = iFileMaterialService.save(material);
 
         return Result.success(save);
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 b1027836..cceb64d5 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
@@ -140,7 +140,7 @@ public class SarStandFileEOController extends BaseController<SarStandFileEO> {
     }
 
 
-    @ApiOperation(value = "查询文本信息")
+    @ApiOperation(value = "查询转换后文本信息")
     @GetMapping("/queryFileInfo")
     public ResponseMessage<List<SarStandFileEO>> queryFileInfo(String standId){
 
@@ -156,4 +156,13 @@ public class SarStandFileEOController extends BaseController<SarStandFileEO> {
         return Result.success(sarStandFileEOS);
     }
 
+
+
+    @ApiOperation(value = "查询转原始文件信息")
+    @GetMapping("/querySourceFileInfo")
+    public ResponseMessage<List<SarStandFileEO>> querySourceFileInfo(String standId){
+
+        List<SarStandFileEO> sarStandFileEOS = sarStandFileEOService.selectFileByStandId(standId);
+        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 acd0004b..78c760dc 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
@@ -23,8 +23,21 @@ public interface SarStandFileEOService {
 
     List<SarStandFileEO> selectFileByAttId(String attId) throws Exception;
 
+    /**
+     * 查询转换后文件的文本信息
+     * @param standId
+     * @return
+     */
     List<SarStandFileEO> selectFileByStandId(String standId);
 
     List<SarStandFileEO> selectFileByStandIdOCR(String standId,String type) throws Exception;
 
+    /**
+     * 查询转原始文件的信息
+     * @param standId
+     * @return
+     */
+    List<SarStandFileEO> querySourceFileInfo(String standId);
+
+
 }
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 9bfa3851..4214ede6 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
@@ -78,6 +78,9 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService {
 
         queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","WEB_FILE");
         List<SarStandFileEO> sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper);
+        /**
+         * 询转换后文件信息 因为文件转换成pdf后会出现文件名位路径的情况,遍历查询文件的原始文件信息从中取出正确的文件名
+         */
         //开耀这地方我把selectOne改成了批量因为 查单个数据里面出了问题你看看给改一下
         sarStandFileEOS.forEach(item->{
             QueryWrapper<SarStandFileEO> wrapper = new QueryWrapper<>();
@@ -142,4 +145,15 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService {
         return sarStandFileEOS;
     }
 
+
+    @Override
+    public List<SarStandFileEO> querySourceFileInfo(String standId){
+        QueryWrapper<SarStandFileEO> queryWrapper= new QueryWrapper<>();
+
+        queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","SOURCE_FILE");
+        return sarStandFileEODao.selectList(queryWrapper);
+
+    }
+
+
 }