From 5ac7a31ebc4afb1ab06bbf0907d544f151fee89f Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 6 Sep 2022 16:20:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=20=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E7=9A=84=20=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E8=AF=84=E4=BC=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3=20=EF=BC=88=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=9C=A8=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E8=A1=A8=E4=B8=AD=E6=B2=A1=E6=9C=89=E7=9A=84?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/config/shiro/ShiroConfig.java | 1 + .../ConditionAssessmentEOController.java | 11 +++++ .../IConditionAssessmentEOService.java | 6 +++ .../ConditionAssessmentEOServiceImpl.java | 45 +++++++++++++++++++ .../impl/DocumentSearchServiceImpl.java | 2 +- 5 files changed, 64 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index dc48bf546..9b47168c2 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -155,6 +155,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/lark/larkEventSubscriptionConfig", "anon"); //飞书调用接口，事件订阅配置。 filterChainDefinitionMap.put("/lark/larkCardMessageConfig", "anon"); //飞书调用接口，卡片消息配置。 filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口 + filterChainDefinitionMap.put("/project/projectTaskInventoryConditionAssessmentEO/initConditionAssessment", "anon"); // 初始化项目当前状态数据接口 // 添加自己的过滤器并且取名为jwt Map filterMap = new HashMap(1); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java index 197e40252..ad06d8cf6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java @@ -195,4 +195,15 @@ public class ConditionAssessmentEOController extends JeroController addOrUpdateConditionAssessmentBatch(@RequestBody ConditionAssessmentVO conditionAssessmentVO) { return conditionAssessmentEOService.addOrUpdateBatch(conditionAssessmentVO); } + + /** + * 初始化当前项目状态评估数据 （法规清单在项目状态评估表中没有的） + */ + @AutoLog(value = "任务清单-项目状态评估表-初始化当前项目状态评估数据") + @ApiOperation(value="任务清单-项目状态评估表-初始化当前项目状态评估数据", notes="任务清单-项目状态评估表-初始化当前项目状态评估数据") + @GetMapping(value = "/initConditionAssessment") + public Result initConditionAssessment(@RequestParam Map params) { + this.conditionAssessmentEOService.initConditionAssessment(params); + return Result.OK("初始化数据成功！"); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java index ff5ad39bd..da659aaea 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java @@ -98,4 +98,10 @@ public interface IConditionAssessmentEOService extends IService addOrUpdateBatch(ConditionAssessmentVO conditionAssessmentVO); + + /** + * 初始化项目当前状态数据 + * @param params + */ + void initConditionAssessment(Map params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java index 2f28cb299..a09f4568d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java @@ -5,14 +5,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.Result; import com.jero.common.system.vo.LoginUser; import com.jero.modules.project.entity.ConditionAssessmentEO; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectTaskInventoryEO; +import com.jero.modules.project.enums.CurrentProjectStatusEnum; import com.jero.modules.project.enums.ProjectRoleEnum; import com.jero.modules.project.mapper.ConditionAssessmentEOMapper; import com.jero.modules.project.service.IConditionAssessmentEOService; +import com.jero.modules.project.service.IProjectLawsInventoryEOService; import com.jero.modules.project.vo.ConditionAssessmentVO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; @@ -27,6 +31,9 @@ import java.util.stream.Collectors; @Service public class ConditionAssessmentEOServiceImpl extends ServiceImpl implements IConditionAssessmentEOService { + @Autowired + private IProjectLawsInventoryEOService projectLawsInventoryEOService; + /** * 保存 * @@ -317,4 +324,42 @@ public class ConditionAssessmentEOServiceImpl extends ServiceImpl params) { + String projectLibraryId = (String) params.get("projectLibraryId"); + + QueryWrapper lawsInventoryQueryWrapper = new QueryWrapper<>(); + if(StringUtils.isNotEmpty(projectLibraryId)){ + //如果项目库id不为空，只处理这一个项目下的数据。 + lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); + } + List lawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryQueryWrapper); + if(CollectionUtils.isNotEmpty(lawsInventoryEOList)){ + QueryWrapper conditionAssessmentQueryWrapper = new QueryWrapper<>(); + List conditionAssessmentEOList = this.baseMapper.selectList(conditionAssessmentQueryWrapper); + + //过滤出，没有项目当前状态数据的法规清单数据 + lawsInventoryEOList = lawsInventoryEOList.stream().filter(lawsInventory -> { + boolean flag = true; + for (ConditionAssessmentEO conditionAssessmentEO : conditionAssessmentEOList) { + if(StringUtils.equals(lawsInventory.getId(),conditionAssessmentEO.getProjectLawsInventoryId())){ + flag = false; + break; + } + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(lawsInventoryEOList)){ + for (ProjectLawsInventoryEO lawsInventory : lawsInventoryEOList) { + ConditionAssessmentEO conditionAssessmentEO = new ConditionAssessmentEO(); + conditionAssessmentEO.setRoleCode(ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue()); + conditionAssessmentEO.setProjectLawsInventoryId(lawsInventory.getId()); + conditionAssessmentEO.setConditionAssessment(CurrentProjectStatusEnum.BLUE.getValue()); + this.addOrUpdate(conditionAssessmentEO); + } + } + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 8b96ccbf8..a3082a93e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -1519,7 +1519,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { list1.add(""); mapTemp.put("pre_tags", list); mapTemp.put("post_tags", list1); - mapTemp.put("fragment_size", 280);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 + mapTemp.put("fragment_size", 500);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段 mapTemp.put("type", "plain"); mapHighlight.put(key, mapTemp);