From 3c46d1f88d4f4c139416228616f51c37eb5a986c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 24 Nov 2021 10:55:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?11.24=20=E5=BC=82=E6=AD=A5=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=B7=BB=E5=8A=A0=20=E5=AF=BC=E5=87=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=88=A0=E9=99=A4=20=E6=9F=A5=E8=AF=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandAttrDetailsController.java | 13 +++++++++++++ .../sarStandAttrDetails/entity/listDTO.java | 12 ++++++++++++ .../SarFileSplitItemsEOController.java | 2 +- .../SarStandCompareHisEOController.java | 18 +++++++++++++++--- .../entity/SarStandCompareHisEO.java | 3 +++ .../entity/SarStandCompareHisEOPage.java | 3 +++ .../service/SarStandCompareHisEOService.java | 2 +- .../impl/SarStandCompareHisEOServiceImpl.java | 13 +++++++------ .../SarStandCompareHisEOMapper.xml | 16 +++++++++++++--- 9 files changed, 68 insertions(+), 14 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/listDTO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java index 1a2c55e6..ae190b73 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java @@ -161,4 +161,17 @@ public class SarStandAttrDetailsController extends BaseController> selectFileFieldForSel1(){ return Result.success(sarStandAttrDetailsEOService.selectFileFieldForSel1(null)); } + + @ApiOperation(value = "|SarStandAttrDetailsEO|查询标准中所有文件类型") + @GetMapping("/getListData") +// @RequiresPermissions("lawss:sarStandAttrDetails:get") + public ResponseMessage> getListData(){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("ATTR_TYPE","file"); + List sarStandAttrDetails=sarStandAttrDetailsEOService.list(queryWrapper); + return Result.success(sarStandAttrDetails); + } + + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/listDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/listDTO.java new file mode 100644 index 00000000..0e4610b6 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/listDTO.java @@ -0,0 +1,12 @@ +package com.adc.da.slrs.sarStandAttrDetails.entity; + +import lombok.Data; + +@Data +public class listDTO { + + private String key; + + private String value; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java index 98287330..112b4ca0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java @@ -190,7 +190,7 @@ public class SarFileSplitItemsEOController extends BaseController> fullTextComparison(String leftStandard, String rightStandard) throws Exception { - Map resultMap = sarStandCompareHisEOService.fullTextComparison(leftStandard,rightStandard); - return Result.success(resultMap); + public ResponseMessage fullTextComparison(String leftStandard, String rightStandard) throws Exception { + String id=UUIDUtils.randomUUID(32); + SarStandCompareHisEO sarStandCompareHisEO =new SarStandCompareHisEO(); + sarStandCompareHisEO.setId(id); + sarStandCompareHisEO.setCompareStatus("比对中"); + sarStandCompareHisEO.setCompareType("全文比对"); + sarStandCompareHisEO.setCreateTime(new Date()); + dao.insertSelective(sarStandCompareHisEO); + Map resultMap = sarStandCompareHisEOService.fullTextComparison(leftStandard,rightStandard,id); + return Result.success("标准正在比对中请稍后查看结果"); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java index 8025b05a..5b075d27 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.standardSplit.entity; import com.adc.da.base.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import java.util.ArrayList; import java.util.Date; @@ -13,6 +14,7 @@ import java.util.List; * 日期： 2020-02-24
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +@Data public class SarStandCompareHisEO extends BaseEntity { private String compareType; @@ -36,6 +38,7 @@ public class SarStandCompareHisEO extends BaseEntity { private String newFileTypeShow; private String newSarType; private String collectId; + private String compareStatus; private List resLeftMapList = new ArrayList<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java index 3bf314dd..375a13ce 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.standardSplit.entity; import com.adc.da.base.page.BasePage; +import lombok.Data; /** * 功能：SAR_STAND_COMPARE_HIS SarStandCompareHisEOPage
@@ -8,6 +9,7 @@ import com.adc.da.base.page.BasePage; * 日期： 2020-02-24
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +@Data public class SarStandCompareHisEOPage extends BasePage { private String compareType; @@ -50,6 +52,7 @@ public class SarStandCompareHisEOPage extends BasePage { private String oldNumOrName; private String newNumOrName; + private String compareStatus; private String shunxu; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java index 1eb72339..d0dfd8a9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java @@ -21,5 +21,5 @@ public interface SarStandCompareHisEOService { Map clauseComparison(String oldItemId, String newItemId, String standHisId); - Map fullTextComparison(String leftStandard, String rightStandard) throws Exception; + Map fullTextComparison(String leftStandard, String rightStandard,String id) throws Exception; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java index 1033d3be..cf68b7c2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java @@ -245,9 +245,9 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ } return resultMap; } - + @Async @Override - public Map fullTextComparison(String leftStandard, String rightStandard) throws Exception{ + public Map fullTextComparison(String leftStandard, String rightStandard,String id) throws Exception{ Map resultMap = new HashMap(); List> leftMapList = fullTextComparePackageData(leftStandard); List> rightMapList = fullTextComparePackageData(rightStandard); @@ -281,7 +281,7 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ resultMap.put("resRightMapList",resRightMapList); } //往全文比对历史表中添加数据 - addStandCompareHis(leftStandard,rightStandard,"全文比对",resLeftMapList,resRightMapList); + addStandCompareHis(leftStandard,rightStandard,"全文比对",resLeftMapList,resRightMapList,id); return resultMap; } @@ -319,12 +319,12 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ **/ @Async public void addStandCompareHis(String leftStandId,String rightStandId,String compareType, - List> resLeftMapList,List> resRightMapList) throws Exception{ + List> resLeftMapList,List> resRightMapList,String id) throws Exception{ SarFileSplitInfoEO leftInfo = sarFileSplitInfoEOService.selectByPrimaryKey(leftStandId); SarFileSplitInfoEO rightInfo = sarFileSplitInfoEOService.selectByPrimaryKey(rightStandId); //保存标准比对历史表数据 SarStandCompareHisEO sarStandCompareHisEO = new SarStandCompareHisEO(); - String id = UUIDUtils.randomUUID20(); +// String id = UUIDUtils.randomUUID20(); sarStandCompareHisEO.setId(id); sarStandCompareHisEO.setOldStandId(leftStandId); sarStandCompareHisEO.setNewStandId(rightStandId); @@ -341,7 +341,8 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ sarStandCompareHisEO.setCreateUser(LoginUserUtil.getUserId()); sarStandCompareHisEO.setModifyUser(LoginUserUtil.getUserId()); sarStandCompareHisEO.setCompareType(compareType); - dao.insertSelective(sarStandCompareHisEO); + sarStandCompareHisEO.setCompareStatus("比对完成"); + dao.updateByPrimaryKeySelective(sarStandCompareHisEO); //保存标准的所有条款比对的历史数据 if(resLeftMapList!=null && !resLeftMapList.isEmpty()) { setStandCompareHisEO(resLeftMapList, id, "LEFT"); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml index 38a88987..430e0e6c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml @@ -19,11 +19,12 @@ + - compare_type, id, old_stand_id, old_stand_num, old_stand_name, new_stand_id, new_stand_num, new_stand_name, old_file_type, old_sar_type, create_user, create_time, modify_user, modify_time, new_file_type, new_sar_type + compare_type, id, old_stand_id, old_stand_num, old_stand_name, new_stand_id, new_stand_num, new_stand_name, old_file_type, old_sar_type, create_user, create_time, modify_user, modify_time, new_file_type, new_sar_type ,compare_status @@ -89,6 +90,9 @@ and new_sar_type ${newSarTypeOperator} #{newSarType} + + + and compare_status = #{compareStatus} and (old_stand_num like concat('%',#{oldNumOrName},'%') OR old_stand_name like concat('%',#{oldNumOrName},'%')) @@ -105,7 +109,7 @@ SELECT SEQ_SAR_STAND_COMPARE_HIS.NEXTVAL FROM DUAL --> insert into SAR_STAND_COMPARE_HIS() - values (#{compareType, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}, #{oldStandId, jdbcType=VARCHAR}, #{oldStandNum, jdbcType=VARCHAR}, #{oldStandName, jdbcType=VARCHAR}, #{newStandId, jdbcType=VARCHAR}, #{newStandNum, jdbcType=VARCHAR}, #{newStandName, jdbcType=VARCHAR}, #{oldFileType, jdbcType=VARCHAR}, #{oldSarType, jdbcType=VARCHAR}, #{createUser, jdbcType=VARCHAR}, #{createTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, #{modifyTime, jdbcType=TIMESTAMP}, #{newFileType, jdbcType=VARCHAR}, #{newSarType, jdbcType=VARCHAR}) + values (#{compareType, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}, #{oldStandId, jdbcType=VARCHAR}, #{oldStandNum, jdbcType=VARCHAR}, #{oldStandName, jdbcType=VARCHAR}, #{newStandId, jdbcType=VARCHAR}, #{newStandNum, jdbcType=VARCHAR}, #{newStandName, jdbcType=VARCHAR}, #{oldFileType, jdbcType=VARCHAR}, #{oldSarType, jdbcType=VARCHAR}, #{createUser, jdbcType=VARCHAR}, #{createTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, #{modifyTime, jdbcType=TIMESTAMP}, #{newFileType, jdbcType=VARCHAR}, #{newSarType, jdbcType=VARCHAR},#{compareStatus, jdbcType=VARCHAR}) @@ -131,6 +135,7 @@ modify_time, new_file_type, new_sar_type, + compare_status, #{compareType, jdbcType=VARCHAR}, @@ -149,6 +154,7 @@ #{modifyTime, jdbcType=TIMESTAMP}, #{newFileType, jdbcType=VARCHAR}, #{newSarType, jdbcType=VARCHAR}, + #{compareStatus, jdbcType=VARCHAR}, @@ -169,7 +175,8 @@ modify_user = #{modifyUser}, modify_time = #{modifyTime}, new_file_type = #{newFileType}, - new_sar_type = #{newSarType} + new_sar_type = #{newSarType}, + compare_status = #{compareStatus} where id = #{id} @@ -222,6 +229,9 @@ new_sar_type = #{newSarType}, + + compare_status = #{compareStatus}, + where id = #{id} From 6178ba696c3b8e1e59460cf9b16903bad9fa803c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 24 Nov 2021 11:50:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?ocr=E6=8C=89=E9=92=AE=20=E5=92=8C=20?= =?UTF-8?q?=E6=8B=86=E5=88=86=E6=8C=89=E9=92=AE=20=E6=8F=90=E4=BE=9B?= =?UTF-8?q?=E6=95=B0=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); } });