From 6178ba696c3b8e1e59460cf9b16903bad9fa803c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 24 Nov 2021 11:50:17 +0800 Subject: [PATCH] =?UTF-8?q?ocr=E6=8C=89=E9=92=AE=20=E5=92=8C=20=E6=8B=86?= =?UTF-8?q?=E5=88=86=E6=8C=89=E9=92=AE=20=E6=8F=90=E4=BE=9B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandFileEOController.java | 6 +++- .../service/SarStandFileEOService.java | 2 +- .../impl/SarStandFileEOServiceImpl.java | 34 +++++++++++++++++-- 3 files changed, 38 insertions(+), 4 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 bcedaae0..b1027836 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 @@ -3,6 +3,10 @@ package com.adc.da.slrs.standardSplit.controller; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.base.web.BaseController; import com.adc.da.http.PageInfo; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage; @@ -146,7 +150,7 @@ public class SarStandFileEOController extends BaseController { @ApiOperation(value = "查询文本信息") @GetMapping("/queryFileInfoNew") - public ResponseMessage> queryFileInfoNew(@RequestParam("standId") String standId,@RequestParam("type") String type){ + public ResponseMessage> queryFileInfoNew(@RequestParam("standId") String standId,@RequestParam("type") String type) throws Exception { List 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 4811a744..acd0004b 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,6 +25,6 @@ public interface SarStandFileEOService { List selectFileByStandId(String standId); - List selectFileByStandIdOCR(String standId,String type); + List selectFileByStandIdOCR(String standId,String type) throws Exception; } 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 1d2c9d55..3713a30a 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,5 +1,9 @@ package com.adc.da.slrs.standardSplit.service.impl; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.standardSplit.dao.SarStandFileEODao; import com.adc.da.slrs.standardSplit.entity.SarStandFileEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage; @@ -13,6 +17,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; +import java.util.Map; @Service @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) @@ -20,6 +25,10 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { @Autowired private SarStandFileEODao sarStandFileEODao; + @Autowired + private ISarStandardsInfoService sarStandardsInfoEOService; + @Autowired + private ISarBussionessStandService sarBussionessStandEOService; @Override @@ -81,10 +90,30 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { } //type == 0 是pdf type==1 是doc @Override - public List selectFileByStandIdOCR(String standId , String type) { + public List selectFileByStandIdOCR(String standId , String type) throws Exception { QueryWrapper queryWrapper= new QueryWrapper<>(); + List choose=new ArrayList<>(); + SarStandardsInfo result = sarStandardsInfoEOService.selectStandardsInfoByKey(standId); + SarBussionessStand result2 = sarBussionessStandEOService.selectStandardsInfoUpdateByKey(standId); + if (null!=result.getAttrInfoCaseMap()){ + Map map=result.getAttrInfoCaseMap(); + for (String key:result.getAttrInfoCaseMap().keySet()) { + if (null!=result.getAttrInfoCaseMap().get(key) && !"".equals(result.getAttrInfoCaseMap().get(key))){ + if (result.getAttrInfoCaseMap().get(key).toString().contains(",")){ + choose.add(result.getAttrInfoCaseMap().get(key).toString().replace(",","")); + }else { + choose.add(result.getAttrInfoCaseMap().get(key).toString()); + } + } + } + } + if (null!=result2){ + + } queryWrapper.eq("STAND_ID",standId); + queryWrapper.eq("USE_MODEL","SOURCE_FILE"); + queryWrapper.in("ATT_ID",choose); List sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper); if ("0".equals(type)){ @@ -98,7 +127,8 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { }else { List remove=new ArrayList<>(); sarStandFileEOS.forEach(sarStandFileEO -> { - if (!sarStandFileEO.getFileName().contains(".DOC") && !sarStandFileEO.getFileName().contains(".doc") ){ + if (!sarStandFileEO.getFileName().contains(".DOC") && !sarStandFileEO.getFileName().contains(".doc") && + !sarStandFileEO.getFileName().contains(".DOCX") && !sarStandFileEO.getFileName().contains(".docx")){ remove.add(sarStandFileEO); } });