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 { // 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 { } - @ApiOperation(value = "查询文本信息") + @ApiOperation(value = "查询转换后文本信息") @GetMapping("/queryFileInfo") public ResponseMessage> queryFileInfo(String standId){ @@ -156,4 +156,13 @@ public class SarStandFileEOController extends BaseController { return Result.success(sarStandFileEOS); } + + + @ApiOperation(value = "查询转原始文件信息") + @GetMapping("/querySourceFileInfo") + public ResponseMessage> querySourceFileInfo(String standId){ + + List 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 selectFileByAttId(String attId) throws Exception; + /** + * 查询转换后文件的文本信息 + * @param standId + * @return + */ List selectFileByStandId(String standId); List selectFileByStandIdOCR(String standId,String type) throws Exception; + /** + * 查询转原始文件的信息 + * @param standId + * @return + */ + List 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 sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper); + /** + * 询转换后文件信息 因为文件转换成pdf后会出现文件名位路径的情况,遍历查询文件的原始文件信息从中取出正确的文件名 + */ //开耀这地方我把selectOne改成了批量因为 查单个数据里面出了问题你看看给改一下 sarStandFileEOS.forEach(item->{ QueryWrapper wrapper = new QueryWrapper<>(); @@ -142,4 +145,15 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { return sarStandFileEOS; } + + @Override + public List querySourceFileInfo(String standId){ + QueryWrapper queryWrapper= new QueryWrapper<>(); + + queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","SOURCE_FILE"); + return sarStandFileEODao.selectList(queryWrapper); + + } + + }