FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ocr按钮 和 拆分按钮 提供数据接口 修改

Browse Source
This commit is contained in:
yuezhihang
2021-11-24 11:50:17 +08:00
parent 3c46d1f88d
commit 6178ba696c
3 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java
+5 -1
View File
@@ -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<SarStandFileEO> {
@ApiOperation(value = "查询文本信息")
@GetMapping("/queryFileInfoNew")
public ResponseMessage<List<SarStandFileEO>> queryFileInfoNew(@RequestParam("standId") String standId,@RequestParam("type") String type){
public ResponseMessage<List<SarStandFileEO>> queryFileInfoNew(@RequestParam("standId") String standId,@RequestParam("type") String type) throws Exception {
List<SarStandFileEO> sarStandFileEOS = sarStandFileEOService.selectFileByStandIdOCR(standId,type);
return Result.success(sarStandFileEOS);
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java
+1 -1
View File
@@ -25,6 +25,6 @@ public interface SarStandFileEOService {
List<SarStandFileEO> selectFileByStandId(String standId);
List<SarStandFileEO> selectFileByStandIdOCR(String standId,String type);
List<SarStandFileEO> selectFileByStandIdOCR(String standId,String type) throws Exception;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java
+32 -2
View File
@@ -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<SarStandFileEO> selectFileByStandIdOCR(String standId , String type) {
public List<SarStandFileEO> selectFileByStandIdOCR(String standId , String type) throws Exception {
QueryWrapper<SarStandFileEO> queryWrapper= new QueryWrapper<>();
List<String> 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<SarStandFileEO> sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper);
if ("0".equals(type)){
@@ -98,7 +127,8 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService {
}else {
List<SarStandFileEO> 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);
}
});