From d9baf0f8c45a59ef38a7c578bae6a64a85bc82e6 Mon Sep 17 00:00:00 2001 From: liao Date: Fri, 17 Nov 2023 17:47:27 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=9B=BD=E5=86=85=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/activiti/entity/ProcessNode.java | 6 +++ ...cessFbStandardConsultationServiceImpl.java | 49 ++++++++++++++++++- .../controller/LawsDomesticController.java | 13 +++++ .../controller/LawsOverseasController.java | 13 +++++ 4 files changed, 79 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessNode.java b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessNode.java index 17cdec93..bb26b480 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessNode.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessNode.java @@ -125,4 +125,10 @@ public class ProcessNode { @TableField(value = "branch_type") @ApiModelProperty(value = "企标立项变更 1 普通立项 2 普通变更 3 责任部门变更") private String branchType; + /** + * 是否显示（0否，1是） + */ + @TableField(value = "is_view") + @ApiModelProperty(value = "是否显示（0否，1是）") + private Integer isView; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java index b4f3d7a8..e4157cf7 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java @@ -3,6 +3,9 @@ package com.jero.modules.activiti.process.fb.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.ResultCommon; import com.jero.common.util.UUIDUtils; +import com.jero.modules.activiti.entity.ProcessNode; +import com.jero.modules.activiti.entity.ProcessNodeLink; +import com.jero.modules.activiti.enums.CommitFlagEnum; import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.fb.common.ConsultationTaskKey; import com.jero.modules.activiti.process.fb.common.ProcessDefinitionKey; @@ -17,6 +20,8 @@ import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultati import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessFbStandardConsultationVO; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; +import com.jero.modules.activiti.service.ProcessNodeLinkService; +import com.jero.modules.activiti.service.ProcessNodeService; import com.jero.modules.laws.common.util.CurrentUserUtil; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.RuntimeService; @@ -53,6 +58,10 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl processInfoVO) { + ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息 + ProcessFbConsultationUserLink userLink = businessInfoDTO.getProcessFbConsultationUserLink(); // 业务分派信息 + + String taskId = processInfoVO.getBasicTaskInfoDTO().getTaskId(); + Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); + String processInstanceId = task.getProcessInstanceId(); } @@ -192,7 +209,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl removeWrapper = new LambdaQueryWrapper<>(); removeWrapper.eq(ProcessFbConsultationUserLink::getBusinessId, processInfoVO.getBusinessId()); @@ -216,6 +233,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl userIdList) { + String processDefinitionId = runtimeService.createProcessInstanceQuery() + .processInstanceId(processInstanceId).singleResult().getProcessDefinitionId(); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ProcessNode::getProcessDefinitionId, processDefinitionId); + queryWrapper.eq(ProcessNode::getIsView, 1); + queryWrapper.eq(ProcessNode::getSort, sort); + ProcessNode processNode = processNodeService.getOne(queryWrapper, false); + + List linkList = new ArrayList<>(); + userIdList.forEach(userId -> { + ProcessNodeLink link = new ProcessNodeLink(); + link.setProcessDefinitionId(processDefinitionId); + link.setProcessNodeId(processNode.getId()); + link.setProcessInstanceId(processInstanceId); + link.setUserId(userId); + linkList.add(link); + }); + processNodeLinkService.saveBatch(linkList, linkList.size()); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java index 8e77cdbd..74217a14 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java @@ -19,6 +19,7 @@ import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -55,6 +56,7 @@ public class LawsDomesticController { @ApiOperation(value="国内法规标准-分页列表查询", notes="国内法规标准-分页列表查询") @PostMapping(value = "/getCommonPage") @ApiOperationSupport(order = 1) + @RequiresPermissions("domesticStandard:search") public Result>> getCommonPage(@RequestBody Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); return Result.OK(lawsCommonService.getCommonPage(parameterMap)); @@ -72,6 +74,7 @@ public class LawsDomesticController { @ApiOperation(value="国内法规标准-新增数据", notes="国内法规标准-新增数据") @PostMapping(value = "/commonAdd") @ApiOperationSupport(order = 3) + @RequiresPermissions("domesticStandard:add") public Result commonAdd(@RequestBody Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); return Result.OK(lawsCommonService.commonAdd(parameterMap)); @@ -81,6 +84,7 @@ public class LawsDomesticController { @ApiOperation(value="国内法规标准-编辑数据", notes="国内法规标准-编辑数据") @PostMapping(value = "/commonEdit") @ApiOperationSupport(order = 4) + @RequiresPermissions("domesticStandard:edit") public Result commonEdit(@RequestBody Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); return Result.OK(lawsCommonService.commonEdit(parameterMap)); @@ -106,6 +110,7 @@ public class LawsDomesticController { @ApiOperation(value="国内法规标准-根据id和模块标识获取信息", notes="国内法规标准-根据id和模块标识获取信息") @GetMapping(value = "getByIdAndModule") @ApiOperationSupport(order = 7) + @RequiresPermissions("domesticStandard:search") public Result> getByIdAndModule(@RequestParam(name="id") String id, @RequestParam(name="type") String type) { lawsCommonService.addLookHistory(id, type, MODULE_VALUE); @@ -116,6 +121,7 @@ public class LawsDomesticController { @ApiOperation(value="国内法规标准-根据ids和模块标识删除信息", notes="国内法规标准-根据ids和模块标识删除信息") @PostMapping(value = "deleteByIdsAndModule") @ApiOperationSupport(order = 8) + @RequiresPermissions("domesticStandard:delete") public Result deleteByIdsAndModule(@RequestBody Map parameterMap) { //删除标准时同步删除这个标准的收藏数据 lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids")); @@ -127,6 +133,7 @@ public class LawsDomesticController { @ApiOperation(value="国内法规标准-配置标准", notes="国内法规标准-配置标准") @GetMapping(value = "relatedStandard") @ApiOperationSupport(order = 9) + @RequiresPermissions("domesticStandard:configStandard") public Result relatedStandard(@RequestParam(name="nodeCode") String nodeCode, @RequestParam("ids") String ids) { lawsNodeRelationService.relatedStandard(nodeCode, ids); @@ -137,6 +144,7 @@ public class LawsDomesticController { @ApiOperation(value="国内法规标准-移除标准", notes="国内法规标准-移除标准") @GetMapping(value = "removeStandard") @ApiOperationSupport(order = 10) + @RequiresPermissions("domesticStandard:removeStandard") public Result removeStandard(@RequestParam(name="nodeCode") String nodeCode, @RequestParam("ids") String ids) { lawsNodeRelationService.removeStandard(nodeCode, ids); @@ -147,6 +155,7 @@ public class LawsDomesticController { @ApiOperation(value="国内法规标准-法规更新记录", notes="国内法规标准-法规更新记录") @GetMapping(value = "/getUpdateRecordList") @ApiOperationSupport(order = 11) + @RequiresPermissions("domesticStandard:updateRecord") public Result> getUpdateRecordList(@RequestParam("standardNumber") String standardNumber) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(LawsUpdateRecord::getUniqueRelationFlag, standardNumber); @@ -158,6 +167,7 @@ public class LawsDomesticController { @ApiOperation(value="国内法规标准-导出", notes="国内法规标准-导出") @PostMapping("/exportData") @ApiOperationSupport(order = 12) + @RequiresPermissions("domesticStandard:export") public void exportData(HttpServletResponse response, @RequestBody(required = false) Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); lawsCommonService.commonExport(response, parameterMap, "国内标准", "国内标准"); @@ -167,6 +177,7 @@ public class LawsDomesticController { @ApiOperation(value="国内法规标准-带文件导出", notes="国内法规标准-带文件导出") @PostMapping("/exportDataWithFile") @ApiOperationSupport(order = 13) + @RequiresPermissions("domesticStandard:exportFile") public void exportDataWithFile(HttpServletResponse response, @RequestBody(required = false) Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); lawsCommonService.exportDataWithFile(response, parameterMap, "国内标准", "国内标准"); @@ -176,6 +187,7 @@ public class LawsDomesticController { @ApiOperation(value="国内法规标准-模板下载", notes="国内法规标准-模板下载") @GetMapping("/templateDownload") @ApiOperationSupport(order = 14) + @RequiresPermissions("domesticStandard:downTemplate") public void templateDownload(HttpServletResponse response) { lawsCommonService.templateDownload(response, TableNameEnum.DOMESTIC_REGULATIONS.getTableName()); } @@ -184,6 +196,7 @@ public class LawsDomesticController { @ApiOperation(value="国内法规标准-导入", notes="国内法规标准-导入") @PostMapping("/importExcelWithData") @ApiOperationSupport(order = 15) + @RequiresPermissions("domesticStandard:import") public Result importExcelWithData(@RequestParam("file") MultipartFile file) { List errorMessages = lawsCommonService.importExcelWithData(file, TableNameEnum.DOMESTIC_REGULATIONS.getValue()); if (errorMessages.size() > 0) { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java index 41855eb6..ebbe55f1 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java @@ -19,6 +19,7 @@ import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -55,6 +56,7 @@ public class LawsOverseasController { @ApiOperation(value="海外法规标准-分页列表查询", notes="海外法规标准-分页列表查询") @PostMapping(value = "/getCommonPage") @ApiOperationSupport(order = 1) + @RequiresPermissions("overseasStandard:search") public Result>> getCommonPage(@RequestBody Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); return Result.OK(lawsCommonService.getCommonPage(parameterMap)); @@ -72,6 +74,7 @@ public class LawsOverseasController { @ApiOperation(value="海外法规标准-新增数据", notes="海外法规标准-新增数据") @PostMapping(value = "/commonAdd") @ApiOperationSupport(order = 3) + @RequiresPermissions("overseasStandard:add") public Result commonAdd(@RequestBody Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); return Result.OK(lawsCommonService.commonAdd(parameterMap)); @@ -81,6 +84,7 @@ public class LawsOverseasController { @ApiOperation(value="海外法规标准-编辑数据", notes="海外法规标准-编辑数据") @PostMapping(value = "/commonEdit") @ApiOperationSupport(order = 4) + @RequiresPermissions("overseasStandard:edit") public Result commonEdit(@RequestBody Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); return Result.OK(lawsCommonService.commonEdit(parameterMap)); @@ -106,6 +110,7 @@ public class LawsOverseasController { @ApiOperation(value="海外法规标准-根据id和模块标识获取信息", notes="海外法规标准-根据id和模块标识获取信息") @GetMapping(value = "getByIdAndModule") @ApiOperationSupport(order = 7) + @RequiresPermissions("overseasStandard:search") public Result> getByIdAndModule(@RequestParam(name="id") String id, @RequestParam(name="type") String type) { lawsCommonService.addLookHistory(id, type, MODULE_VALUE); @@ -116,6 +121,7 @@ public class LawsOverseasController { @ApiOperation(value="海外法规标准-根据ids和模块标识删除信息", notes="海外法规标准-根据ids和模块标识删除信息") @PostMapping(value = "deleteByIdsAndModule") @ApiOperationSupport(order = 8) + @RequiresPermissions("overseasStandard:delete") public Result deleteByIdsAndModule(@RequestBody Map parameterMap) { //删除标准时同步删除这个标准的收藏数据 lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids")); @@ -127,6 +133,7 @@ public class LawsOverseasController { @ApiOperation(value="海外法规标准-配置标准", notes="海外法规标准-配置标准") @GetMapping(value = "relatedStandard") @ApiOperationSupport(order = 9) + @RequiresPermissions("overseasStandard:configStandard") public Result relatedStandard(@RequestParam(name="nodeCode") String nodeCode, @RequestParam("ids") String ids) { lawsNodeRelationService.relatedStandard(nodeCode, ids); @@ -137,6 +144,7 @@ public class LawsOverseasController { @ApiOperation(value="海外法规标准-移除标准", notes="海外法规标准-移除标准") @GetMapping(value = "removeStandard") @ApiOperationSupport(order = 10) + @RequiresPermissions("overseasStandard:removeStandard") public Result removeStandard(@RequestParam(name="nodeCode") String nodeCode, @RequestParam("ids") String ids) { lawsNodeRelationService.removeStandard(nodeCode, ids); @@ -147,6 +155,7 @@ public class LawsOverseasController { @ApiOperation(value="海外法规标准-法规更新记录", notes="海外法规标准-法规更新记录") @GetMapping(value = "/getUpdateRecordList") @ApiOperationSupport(order = 11) + @RequiresPermissions("overseasStandard:updateRecord") public Result> getUpdateRecordList(@RequestParam("standardNumber") String standardNumber) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(LawsUpdateRecord::getUniqueRelationFlag, standardNumber); @@ -158,6 +167,7 @@ public class LawsOverseasController { @ApiOperation(value="海外法规标准-导出", notes="海外法规标准-导出") @PostMapping("/exportData") @ApiOperationSupport(order = 12) + @RequiresPermissions("overseasStandard:export") public void exportData(HttpServletResponse response, @RequestBody(required = false) Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); lawsCommonService.commonExport(response, parameterMap, "海外标准", "海外标准"); @@ -167,6 +177,7 @@ public class LawsOverseasController { @ApiOperation(value="海外法规标准-带文件导出", notes="海外法规标准-带文件导出") @PostMapping("/exportDataWithFile") @ApiOperationSupport(order = 13) + @RequiresPermissions("overseasStandard:exportFile") public void exportDataWithFile(HttpServletResponse response, @RequestBody(required = false) Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); lawsCommonService.exportDataWithFile(response, parameterMap, "海外标准", "海外标准"); @@ -176,6 +187,7 @@ public class LawsOverseasController { @ApiOperation(value="海外法规标准-模板下载", notes="海外法规标准-模板下载") @GetMapping("/templateDownload") @ApiOperationSupport(order = 14) + @RequiresPermissions("overseasStandard:downTemplate") public void templateDownload(HttpServletResponse response) { lawsCommonService.templateDownload(response, TableNameEnum.FOREIGN_REGULATIONS.getTableName()); } @@ -184,6 +196,7 @@ public class LawsOverseasController { @ApiOperation(value="海外法规标准-导入", notes="海外法规标准-导入") @PostMapping("/importExcelWithData") @ApiOperationSupport(order = 15) + @RequiresPermissions("overseasStandard:import") public Result importExcelWithData(@RequestParam("file") MultipartFile file) { List errorMessages = lawsCommonService.importExcelWithData(file, TableNameEnum.FOREIGN_REGULATIONS.getValue()); if (errorMessages.size() > 0) {