From 0bc4961694e9d3806a6df6e8ecc9e1afd26766eb Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Wed, 18 Mar 2026 17:25:55 +0800 Subject: [PATCH 01/13] =?UTF-8?q?add=20=E5=A2=9E=E5=8A=A0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=AE=9A=E4=B9=89=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlwDefinitionController.java | 14 ++++++++++++++ script/sql/oracle/oracle_ry_workflow.sql | 13 ++++++++++++- script/sql/postgres/postgres_ry_workflow.sql | 13 ++++++++++++- script/sql/ry_workflow.sql | 13 ++++++++++++- 4 files changed, 50 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java index 54e412ae0..2b1e3be72 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java @@ -1,5 +1,6 @@ package org.dromara.workflow.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; @@ -45,6 +46,7 @@ public class FlwDefinitionController extends BaseController { * @param pageQuery 分页 */ @GetMapping("/list") + @SaCheckPermission("workflow:definition:list") public TableDataInfo list(FlowDefinition flowDefinition, PageQuery pageQuery) { return flwDefinitionService.queryList(flowDefinition, pageQuery); } @@ -56,6 +58,7 @@ public class FlwDefinitionController extends BaseController { * @param pageQuery 分页 */ @GetMapping("/unPublishList") + @SaCheckPermission("workflow:definition:list") public TableDataInfo unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery) { return flwDefinitionService.unPublishList(flowDefinition, pageQuery); } @@ -66,6 +69,7 @@ public class FlwDefinitionController extends BaseController { * @param id 流程定义id */ @GetMapping(value = "/{id}") + @SaCheckPermission("workflow:definition:query") public R getInfo(@PathVariable Long id) { return R.ok(defService.getById(id)); } @@ -79,6 +83,7 @@ public class FlwDefinitionController extends BaseController { @PostMapping @RepeatSubmit() @Transactional(rollbackFor = Exception.class) + @SaCheckPermission("workflow:definition:add") public R add(@RequestBody FlowDefinition flowDefinition) { return R.ok(defService.checkAndSave(flowDefinition)); } @@ -92,6 +97,7 @@ public class FlwDefinitionController extends BaseController { @PutMapping @RepeatSubmit() @Transactional(rollbackFor = Exception.class) + @SaCheckPermission("workflow:definition:edit") public R edit(@RequestBody FlowDefinition flowDefinition) { return R.ok(defService.updateById(flowDefinition)); } @@ -104,6 +110,7 @@ public class FlwDefinitionController extends BaseController { @Log(title = "流程定义", businessType = BusinessType.INSERT) @PutMapping("/publish/{id}") @RepeatSubmit() + @SaCheckPermission("workflow:definition:publish") public R publish(@PathVariable Long id) { return R.ok(flwDefinitionService.publish(id)); } @@ -117,6 +124,7 @@ public class FlwDefinitionController extends BaseController { @PutMapping("/unPublish/{id}") @RepeatSubmit() @Transactional(rollbackFor = Exception.class) + @SaCheckPermission("workflow:definition:publish") public R unPublish(@PathVariable Long id) { return R.ok(defService.unPublish(id)); } @@ -126,6 +134,7 @@ public class FlwDefinitionController extends BaseController { */ @Log(title = "流程定义", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") + @SaCheckPermission("workflow:definition:remove") public R remove(@PathVariable List ids) { return toAjax(flwDefinitionService.removeDef(ids)); } @@ -139,6 +148,7 @@ public class FlwDefinitionController extends BaseController { @PostMapping("/copy/{id}") @RepeatSubmit() @Transactional(rollbackFor = Exception.class) + @SaCheckPermission("workflow:definition:copy") public R copy(@PathVariable Long id) { return R.ok(defService.copyDef(id)); } @@ -151,6 +161,7 @@ public class FlwDefinitionController extends BaseController { */ @Log(title = "流程定义", businessType = BusinessType.IMPORT) @PostMapping("/importDef") + @SaCheckPermission("workflow:definition:import") public R importDef(MultipartFile file, String category) { return R.ok(flwDefinitionService.importJson(file, category)); } @@ -164,6 +175,7 @@ public class FlwDefinitionController extends BaseController { */ @Log(title = "流程定义", businessType = BusinessType.EXPORT) @PostMapping("/exportDef/{id}") + @SaCheckPermission("workflow:definition:export") public void exportDef(@PathVariable Long id, HttpServletResponse response) throws IOException { flwDefinitionService.exportDef(id, response); } @@ -174,6 +186,7 @@ public class FlwDefinitionController extends BaseController { * @param id 流程定义id */ @GetMapping("/xmlString/{id}") + @SaCheckPermission("workflow:definition:query") public R xmlString(@PathVariable Long id) { return R.ok("操作成功", defService.exportJson(id)); } @@ -188,6 +201,7 @@ public class FlwDefinitionController extends BaseController { @PutMapping("/active/{id}") @Transactional(rollbackFor = Exception.class) @Log(title = "流程定义", businessType = BusinessType.UPDATE) + @SaCheckPermission("workflow:definition:active") public R active(@PathVariable Long id, @RequestParam boolean active) { return R.ok(active ? defService.active(id) : defService.unActive(id)); } diff --git a/script/sql/oracle/oracle_ry_workflow.sql b/script/sql/oracle/oracle_ry_workflow.sql index 9cbc830f9..df1d03dc1 100644 --- a/script/sql/oracle/oracle_ry_workflow.sql +++ b/script/sql/oracle/oracle_ry_workflow.sql @@ -473,7 +473,7 @@ INSERT INTO sys_menu VALUES ('11618', '我的任务', '0', '7', 'task', '', '', INSERT INTO sys_menu VALUES ('11619', '我的待办', '11618', '2', 'taskWaiting', 'workflow/task/taskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, SYSDATE, NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11632', '我的已办', '11618', '3', 'taskFinish', 'workflow/task/taskFinish', '', '1', '1', 'C', '0', '0', '', 'finish', 103, 1, SYSDATE, NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11633', '我的抄送', '11618', '4', 'taskCopyList', 'workflow/task/taskCopyList', '', '1', '1', 'C', '0', '0', '', 'my-copy', 103, 1, SYSDATE, NULL, NULL, ''); -INSERT INTO sys_menu VALUES ('11620', '流程定义', '11616', '3', 'processDefinition', 'workflow/processDefinition/index', '', '1', '1', 'C', '0', '0', '', 'process-definition', 103, 1, SYSDATE, NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11620', '流程定义', '11616', '3', 'processDefinition', 'workflow/processDefinition/index', '', '1', '1', 'C', '0', '0', 'workflow:definition:list', 'process-definition', 103, 1, SYSDATE, NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11621', '流程实例', '11630', '1', 'processInstance', 'workflow/processInstance/index', '', '1', '1', 'C', '0', '0', '', 'tree-table', 103, 1, SYSDATE, NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11622', '流程分类', '11616', '1', 'category', 'workflow/category/index', '', '1', '0', 'C', '0', '0', 'workflow:category:list', 'category', 103, 1, SYSDATE, NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11629', '我发起的', '11618', '1', 'myDocument', 'workflow/task/myDocument', '', '1', '1', 'C', '0', '0', '', 'guide', 103, 1, SYSDATE, NULL, NULL, ''); @@ -488,6 +488,17 @@ INSERT INTO sys_menu VALUES ('11625', '流程分类修改', '11622', '3', '#', ' INSERT INTO sys_menu VALUES ('11626', '流程分类删除', '11622', '4', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:remove', '#', 103, 1, SYSDATE, NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11627', '流程分类导出', '11622', '5', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:export', '#', 103, 1, SYSDATE, NULL, NULL, ''); +-- 流程定义管理相关按钮 +INSERT INTO sys_menu VALUES ('11644', '流程定义查询', '11620', '1', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:query', '#', 103, 1, SYSDATE, NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11645', '流程定义新增', '11620', '2', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:add', '#', 103, 1, SYSDATE, NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11646', '流程定义修改', '11620', '3', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:edit', '#', 103, 1, SYSDATE, NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11647', '流程定义删除', '11620', '4', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:remove', '#', 103, 1, SYSDATE, NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11648', '流程定义导出', '11620', '5', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:export', '#', 103, 1, SYSDATE, NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11649', '流程定义导入', '11620', '6', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:import', '#', 103, 1, SYSDATE, NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11650', '流程定义发布/取消发布', '11620', '7', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:publish', '#', 103, 1, SYSDATE, NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11651', '流程定义复制', '11620', '8', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:copy', '#', 103, 1, SYSDATE, NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11652', '流程定义激活/挂起', '11620', '9', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:active', '#', 103, 1, SYSDATE, NULL, NULL, ''); + INSERT INTO sys_menu VALUES ('11801', '流程表达式', '11616', 2, 'spel', 'workflow/spel/index', '', 1, 0, 'C', '0', '0', 'workflow:spel:list', 'input', 103, 1, SYSDATE, 1, SYSDATE, '流程达式定义菜单'); INSERT INTO sys_menu VALUES ('11802', '流程spel表达式定义查询', '11801', 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'workflow:spel:query', '#', 103, 1, SYSDATE, NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11803', '流程spel表达式定义新增', '11801', 2, '#', '', NULL, 1, 0, 'F', '0', '0', 'workflow:spel:add', '#', 103, 1, SYSDATE, NULL, NULL, ''); diff --git a/script/sql/postgres/postgres_ry_workflow.sql b/script/sql/postgres/postgres_ry_workflow.sql index 83cad84d3..b93705189 100644 --- a/script/sql/postgres/postgres_ry_workflow.sql +++ b/script/sql/postgres/postgres_ry_workflow.sql @@ -451,7 +451,7 @@ INSERT INTO sys_menu VALUES ('11618', '我的任务', '0', '7', 'task', '', '', INSERT INTO sys_menu VALUES ('11619', '我的待办', '11618', '2', 'taskWaiting', 'workflow/task/taskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, now(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11632', '我的已办', '11618', '3', 'taskFinish', 'workflow/task/taskFinish', '', '1', '1', 'C', '0', '0', '', 'finish', 103, 1, now(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11633', '我的抄送', '11618', '4', 'taskCopyList', 'workflow/task/taskCopyList', '', '1', '1', 'C', '0', '0', '', 'my-copy', 103, 1, now(), NULL, NULL, ''); -INSERT INTO sys_menu VALUES ('11620', '流程定义', '11616', '3', 'processDefinition', 'workflow/processDefinition/index', '', '1', '1', 'C', '0', '0', '', 'process-definition', 103, 1, now(), NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11620', '流程定义', '11616', '3', 'processDefinition', 'workflow/processDefinition/index', '', '1', '1', 'C', '0', '0', 'workflow:definition:list', 'process-definition', 103, 1, now(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11621', '流程实例', '11630', '1', 'processInstance', 'workflow/processInstance/index', '', '1', '1', 'C', '0', '0', '', 'tree-table', 103, 1, now(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11622', '流程分类', '11616', '1', 'category', 'workflow/category/index', '', '1', '0', 'C', '0', '0', 'workflow:category:list', 'category', 103, 1, now(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11629', '我发起的', '11618', '1', 'myDocument', 'workflow/task/myDocument', '', '1', '1', 'C', '0', '0', '', 'guide', 103, 1, now(), NULL, NULL, ''); @@ -466,6 +466,17 @@ INSERT INTO sys_menu VALUES ('11625', '流程分类修改', '11622', '3', '#', ' INSERT INTO sys_menu VALUES ('11626', '流程分类删除', '11622', '4', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:remove', '#', 103, 1, now(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11627', '流程分类导出', '11622', '5', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:export', '#', 103, 1, now(), NULL, NULL, ''); +-- 流程定义管理相关按钮 +INSERT INTO sys_menu VALUES ('11644', '流程定义查询', '11620', '1', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:query', '#', 103, 1, now(), NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11645', '流程定义新增', '11620', '2', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:add', '#', 103, 1, now(), NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11646', '流程定义修改', '11620', '3', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:edit', '#', 103, 1, now(), NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11647', '流程定义删除', '11620', '4', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:remove', '#', 103, 1, now(), NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11648', '流程定义导出', '11620', '5', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:export', '#', 103, 1, now(), NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11649', '流程定义导入', '11620', '6', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:import', '#', 103, 1, now(), NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11650', '流程定义发布/取消发布', '11620', '7', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:publish', '#', 103, 1, now(), NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11651', '流程定义复制', '11620', '8', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:copy', '#', 103, 1, now(), NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11652', '流程定义激活/挂起', '11620', '9', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:active', '#', 103, 1, now(), NULL, NULL, ''); + INSERT INTO sys_menu VALUES ('11801', '流程表达式', '11616', 2, 'spel', 'workflow/spel/index', '', 1, 0, 'C', '0', '0', 'workflow:spel:list', 'input', 103, 1, now(), 1, now(), '流程达式定义菜单'); INSERT INTO sys_menu VALUES ('11802', '流程spel表达式定义查询', '11801', 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'workflow:spel:query', '#', 103, 1, now(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11803', '流程spel表达式定义新增', '11801', 2, '#', '', NULL, 1, 0, 'F', '0', '0', 'workflow:spel:add', '#', 103, 1, now(), NULL, NULL, ''); diff --git a/script/sql/ry_workflow.sql b/script/sql/ry_workflow.sql index d90e2d2ee..af00128f1 100644 --- a/script/sql/ry_workflow.sql +++ b/script/sql/ry_workflow.sql @@ -263,7 +263,7 @@ insert into sys_menu values ('11618', '我的任务', '0', '7', 'task', '', '', insert into sys_menu values ('11619', '我的待办', '11618', '2', 'taskWaiting', 'workflow/task/taskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, sysdate(), NULL, NULL, ''); insert into sys_menu values ('11632', '我的已办', '11618', '3', 'taskFinish', 'workflow/task/taskFinish', '', '1', '1', 'C', '0', '0', '', 'finish', 103, 1, sysdate(), NULL, NULL, ''); insert into sys_menu values ('11633', '我的抄送', '11618', '4', 'taskCopyList', 'workflow/task/taskCopyList', '', '1', '1', 'C', '0', '0', '', 'my-copy', 103, 1, sysdate(), NULL, NULL, ''); -insert into sys_menu values ('11620', '流程定义', '11616', '3', 'processDefinition', 'workflow/processDefinition/index', '', '1', '1', 'C', '0', '0', '', 'process-definition', 103, 1, sysdate(), NULL, NULL, ''); +insert into sys_menu values ('11620', '流程定义', '11616', '3', 'processDefinition', 'workflow/processDefinition/index', '', '1', '1', 'C', '0', '0', 'workflow:definition:list', 'process-definition', 103, 1, sysdate(), NULL, NULL, ''); insert into sys_menu values ('11621', '流程实例', '11630', '1', 'processInstance', 'workflow/processInstance/index', '', '1', '1', 'C', '0', '0', '', 'tree-table', 103, 1, sysdate(), NULL, NULL, ''); insert into sys_menu values ('11622', '流程分类', '11616', '1', 'category', 'workflow/category/index', '', '1', '0', 'C', '0', '0', 'workflow:category:list', 'category', 103, 1, sysdate(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11801', '流程表达式', '11616', '2', 'spel', 'workflow/spel/index', '', 1, 0, 'C', '0', '0', 'workflow:spel:list', 'input', 103, 1, sysdate(), 1, sysdate(), '流程达式定义菜单'); @@ -278,6 +278,17 @@ insert into sys_menu values ('11624', '流程分类新增', '11622', '2', '#', ' insert into sys_menu values ('11625', '流程分类修改', '11622', '3', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:edit', '#', 103, 1,sysdate(), null, null, ''); insert into sys_menu values ('11626', '流程分类删除', '11622', '4', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:remove', '#', 103,1, sysdate(), null, null, ''); insert into sys_menu values ('11627', '流程分类导出', '11622', '5', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:export', '#', 103,1, sysdate(), null, null, ''); + +-- 流程定义管理相关按钮 +insert into sys_menu values ('11644', '流程定义查询', '11620', '1', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:definition:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values ('11645', '流程定义新增', '11620', '2', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:definition:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values ('11646', '流程定义修改', '11620', '3', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:definition:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values ('11647', '流程定义删除', '11620', '4', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:definition:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values ('11648', '流程定义导出', '11620', '5', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:definition:export', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values ('11649', '流程定义导入', '11620', '6', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:definition:import', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values ('11650', '流程定义发布/取消发布', '11620', '7', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:definition:publish', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values ('11651', '流程定义复制', '11620', '8', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:definition:copy', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values ('11652', '流程定义激活/挂起', '11620', '9', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:definition:active', '#', 103, 1, sysdate(), null, null, ''); -- 流程表达式管理相关按钮 INSERT INTO sys_menu VALUES ('11802', '流程达式定义查询', '11801', 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'workflow:spel:query', '#', 103, 1, sysdate(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11803', '流程达式定义新增', '11801', 2, '#', '', NULL, 1, 0, 'F', '0', '0', 'workflow:spel:add', '#', 103, 1, sysdate(), NULL, NULL, ''); From d9aa8484ed293228ee4c4c168d47c1a4e67a51cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E8=BE=9E=E6=9C=AA=E5=AF=92?= <545073804@qq.com> Date: Thu, 19 Mar 2026 01:42:26 +0800 Subject: [PATCH 02/13] =?UTF-8?q?feat=20=E6=96=B0=E7=89=B9=E6=80=A7?= =?UTF-8?q?=EF=BC=81=20=E6=94=AF=E6=8C=81=E5=88=97=E8=A1=A8=E7=BF=BB?= =?UTF-8?q?=E8=AF=91~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/PageResult.java | 19 ++- .../core/domain/dto/TaskAssigneeDTO.java | 7 +- .../collection/TranslationCollection.java | 26 ++++ .../TranslationCollectionBinding.java | 20 +++ .../TranslationCollectionProcessor.java | 17 +++ .../TranslationCollectionSerializer.java | 62 +++++++++ .../collection/TranslationCollectionType.java | 22 +++ .../TranslationCollectionWrapper.java | 126 ++++++++++++++++++ .../translation/config/TranslationConfig.java | 23 +++- .../dromara/demo/domain/vo/TestDemoVo.java | 6 +- .../service/impl/TestDemoServiceImpl.java | 3 +- ...ranslationCollectionCollectionHandler.java | 27 ++++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + 13 files changed, 346 insertions(+), 13 deletions(-) create mode 100644 ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollection.java create mode 100644 ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionBinding.java create mode 100644 ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionProcessor.java create mode 100644 ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionSerializer.java create mode 100644 ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionType.java create mode 100644 ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionWrapper.java create mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/translation/TestDemoVoTranslationCollectionCollectionHandler.java create mode 100644 ruoyi-modules/ruoyi-demo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java index 9791425df..a89a755ea 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java @@ -5,7 +5,7 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; -import java.util.List; +import java.util.Collection; /** * 表格分页数据对象 @@ -27,12 +27,23 @@ public class PageResult implements Serializable { /** * 列表数据 */ - private List rows; + private Collection rows; + + /** + * 分页 + * + * @param list 列表数据 + * @param total 总记录数 + */ + public PageResult(Collection list, long total) { + this.rows = list; + this.total = total; + } /** * 根据分页对象构建表格分页数据对象 */ - public static PageResult build(List list, long total) { + public static PageResult build(Collection list, long total) { PageResult rspData = new PageResult<>(); rspData.setRows(list); rspData.setTotal(total); @@ -42,7 +53,7 @@ public class PageResult implements Serializable { /** * 根据数据列表构建表格分页数据对象 */ - public static PageResult build(List list) { + public static PageResult build(Collection list) { PageResult rspData = new PageResult<>(); rspData.setRows(list); rspData.setTotal(list.size()); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java index d3b4dac55..8444a8ef2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java @@ -6,6 +6,7 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; +import java.util.Collection; import java.util.Date; import java.util.List; import java.util.function.Function; @@ -42,7 +43,7 @@ public class TaskAssigneeDTO implements Serializable { * 将源列表转换为 TaskHandler 列表 * * @param 通用类型 - * @param sourceList 待转换的源列表 + * @param sourceCollection 待转换的源列表 * @param storageId 提取 storageId 的函数 * @param handlerCode 提取 handlerCode 的函数 * @param handlerName 提取 handlerName 的函数 @@ -51,13 +52,13 @@ public class TaskAssigneeDTO implements Serializable { * @return 转换后的 TaskHandler 列表 */ public static List convertToHandlerList( - List sourceList, + Collection sourceCollection, Function storageId, Function handlerCode, Function handlerName, Function groupName, Function createTimeMapper) { - return sourceList.stream() + return sourceCollection.stream() .map(item -> new TaskHandler( storageId.apply(item), handlerCode.apply(item), diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollection.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollection.java new file mode 100644 index 000000000..d4bc63d5d --- /dev/null +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollection.java @@ -0,0 +1,26 @@ +package org.dromara.common.translation.collection; + +import java.lang.annotation.*; + +/** + * 集合翻译（声明到需要翻译的实体上） + * + * @author 秋辞未寒 + */ +@Inherited +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +@Documented +public @interface TranslationCollection { + + /** + * 类型 + */ + String type(); + + /** + * 其他条件 例如: 字典type(sys_user_gender) + */ + String other() default ""; + +} diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionBinding.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionBinding.java new file mode 100644 index 000000000..9ba23156c --- /dev/null +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionBinding.java @@ -0,0 +1,20 @@ +package org.dromara.common.translation.collection; + +import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; +import tools.jackson.databind.annotation.JsonSerialize; + +import java.lang.annotation.*; + +/** + * 序列化器绑定注解 + * + * @author 秋辞未寒 + */ +@Inherited +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +@Documented +@JacksonAnnotationsInside +@JsonSerialize(using = TranslationCollectionSerializer.class) +public @interface TranslationCollectionBinding { +} diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionProcessor.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionProcessor.java new file mode 100644 index 000000000..11fc4f8ef --- /dev/null +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionProcessor.java @@ -0,0 +1,17 @@ +package org.dromara.common.translation.collection; + +import java.util.Collection; + +/** + * 翻译集合处理器 + * @param 输入类型 + * @param 目标类型 + * + * @author 秋辞未寒 + */ +public interface TranslationCollectionProcessor { + + + Collection process(Collection value,String other) throws Exception; + +} diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionSerializer.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionSerializer.java new file mode 100644 index 000000000..5b45b0e1e --- /dev/null +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionSerializer.java @@ -0,0 +1,62 @@ +package org.dromara.common.translation.collection; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ClassUtil; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.utils.reflect.AnnotationUtils; +import tools.jackson.core.JacksonException; +import tools.jackson.core.JsonGenerator; +import tools.jackson.databind.SerializationContext; +import tools.jackson.databind.ValueSerializer; + +import java.util.Collection; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * 集合翻译序列化器 + * + * @author 秋辞未寒 + */ +@Slf4j +public class TranslationCollectionSerializer extends ValueSerializer> { + + /** + * 全局翻译实现类映射器 + */ + public static final Map> TRANSLATION_MAPPER = new ConcurrentHashMap<>(); + + @Override + public void serialize(TranslationCollectionWrapper value, JsonGenerator gen, SerializationContext provider) throws JacksonException { + if (CollUtil.isEmpty(value)) { + return; + } + Class elementType = value.getElementType(); + if (elementType == null) { + elementType = ClassUtil.getClass(CollUtil.getFirst(value)); + } + // 获取包装原内容（很重要！！！！！！如果原样使用的话，会无限递归！） + Collection collection = value.getCollection(); + TranslationCollection annotation = AnnotationUtils.getAnnotation(elementType, TranslationCollection.class); + if (annotation != null ) { + String type = annotation.type(); + String other = annotation.other(); + TranslationCollectionProcessor processor = TRANSLATION_MAPPER.get(type); + if (processor != null) { + try { + collection = processor.process(collection,other); + } catch (Exception e) { + log.error("翻译处理异常，type: {}, value: {}", type, value, e); + // 出现异常时输出原始值而不是中断序列化 + collection = value.getCollection(); + } + } + } + gen.writeStartArray(); + for (Object o : collection) { + gen.writePOJO(o); + } + gen.writeEndArray(); + } + +} diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionType.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionType.java new file mode 100644 index 000000000..76ee7a08d --- /dev/null +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionType.java @@ -0,0 +1,22 @@ +package org.dromara.common.translation.collection; + +import java.lang.annotation.*; + + +/** + * 集合翻译类型 + * + * @author 秋辞未寒 + */ +@Inherited +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +@Documented +public @interface TranslationCollectionType { + + /** + * 类型 + */ + String type(); + +} diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionWrapper.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionWrapper.java new file mode 100644 index 000000000..7f17c1707 --- /dev/null +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionWrapper.java @@ -0,0 +1,126 @@ +package org.dromara.common.translation.collection; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ClassUtil; +import lombok.Getter; + +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.Objects; + +/** + * 翻译集合包装器 + * + * @param 元素类型 + * + * @author 秋辞未寒 + */ +@Getter +@TranslationCollectionBinding +public class TranslationCollectionWrapper implements Collection { + + private final Collection collection; + private final Class elementType; + + /** + * 不建议直接使用构造函数去构建包装器 + */ + private TranslationCollectionWrapper(Collection collection, Class elementType) { + this.collection = collection; + this.elementType = elementType; + } + + /** + * 包装集合成翻译集合 + * @param collection 待包装的集合 + * @return 包装后的集合类型 + * @param 元素类型 + */ + public static TranslationCollectionWrapper form(Collection collection) { + return form(collection,null); + } + + /** + * 包装集合成翻译集合 （推荐使用该函数，可以减少不必要的迭代器取值~） + * @param collection 待包装的集合 + * @param elementType 元素Class实例 + * @return 包装后的集合类型 + * @param 元素类型 + */ + public static TranslationCollectionWrapper form(Collection collection, Class elementType) { + if (Objects.isNull(collection)) { + collection = Collections.emptyList(); + } + if (Objects.isNull(elementType)) { + elementType = ClassUtil.getClass(CollUtil.getFirst(collection)); + } + return new TranslationCollectionWrapper<>(collection,elementType); + } + + + @Override + public int size() { + return collection.size(); + } + + @Override + public boolean isEmpty() { + return collection.isEmpty(); + } + + @Override + public boolean contains(Object o) { + return collection.contains(o); + } + + @Override + public Iterator iterator() { + return collection.iterator(); + } + + @Override + public Object[] toArray() { + return collection.toArray(); + } + + @Override + public T[] toArray(T[] a) { + return collection.toArray(a); + } + + @Override + public boolean add(E e) { + return collection.add(e); + } + + @Override + public boolean remove(Object o) { + return collection.remove(o); + } + + @Override + public boolean containsAll(Collection c) { + return collection.containsAll(c); + } + + @Override + public boolean addAll(Collection c) { + return collection.addAll(c); + } + + @Override + public boolean removeAll(Collection c) { + return collection.removeAll(c); + } + + @Override + public boolean retainAll(Collection c) { + return collection.retainAll(c); + } + + @Override + public void clear() { + collection.clear(); + } +} diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java index d1b52fdf6..efad0300b 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java @@ -3,6 +3,9 @@ package org.dromara.common.translation.config; import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; import org.dromara.common.translation.annotation.TranslationType; +import org.dromara.common.translation.collection.TranslationCollectionProcessor; +import org.dromara.common.translation.collection.TranslationCollectionSerializer; +import org.dromara.common.translation.collection.TranslationCollectionType; import org.dromara.common.translation.core.TranslationInterface; import org.dromara.common.translation.core.handler.TranslationBeanSerializerModifier; import org.dromara.common.translation.core.handler.TranslationHandler; @@ -26,12 +29,15 @@ import java.util.Map; public class TranslationConfig { @Autowired - private List> list; + private List> translationInterfaces; + + @Autowired + private List> translationCollectionHandlers; @PostConstruct public void init() { - Map> map = new HashMap<>(list.size()); - for (TranslationInterface trans : list) { + Map> map = new HashMap<>(translationInterfaces.size()); + for (TranslationInterface trans : translationInterfaces) { if (trans.getClass().isAnnotationPresent(TranslationType.class)) { TranslationType annotation = trans.getClass().getAnnotation(TranslationType.class); map.put(annotation.type(), trans); @@ -40,6 +46,17 @@ public class TranslationConfig { } } TranslationHandler.TRANSLATION_MAPPER.putAll(map); + + Map> handlerMaps = new HashMap<>(translationCollectionHandlers.size()); + for (TranslationCollectionProcessor trans : translationCollectionHandlers) { + if (trans.getClass().isAnnotationPresent(TranslationCollectionType.class)) { + TranslationCollectionType annotation = trans.getClass().getAnnotation(TranslationCollectionType.class); + handlerMaps.put(annotation.type(), (TranslationCollectionProcessor) trans); + } else { + log.warn(trans.getClass().getName() + " 翻译实现类未标注 TranslationCollectionType 注解!"); + } + } + TranslationCollectionSerializer.TRANSLATION_MAPPER.putAll(handlerMaps); } @Bean diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java index 0f760c8a3..d76980fec 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java @@ -1,15 +1,16 @@ package org.dromara.demo.domain.vo; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; import org.apache.fesod.sheet.annotation.ExcelProperty; import org.apache.fesod.sheet.annotation.format.DateTimeFormat; import org.dromara.common.excel.annotation.ExcelNotation; import org.dromara.common.excel.annotation.ExcelRequired; import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.collection.TranslationCollection; import org.dromara.common.translation.constant.TransConstant; import org.dromara.demo.domain.TestDemo; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; import java.io.Serial; import java.io.Serializable; @@ -22,6 +23,7 @@ import java.util.Date; * @author Lion Li * @date 2021-07-26 */ +@TranslationCollection(type = "test") @Data @ExcelIgnoreUnannotated @AutoMapper(target = TestDemo.class) diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java index 014b7e81d..1caa39756 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java @@ -9,6 +9,7 @@ import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.translation.collection.TranslationCollectionWrapper; import org.dromara.demo.domain.TestDemo; import org.dromara.demo.domain.bo.TestDemoBo; import org.dromara.demo.domain.vo.TestDemoVo; @@ -53,7 +54,7 @@ public class TestDemoServiceImpl implements ITestDemoService { public PageResult queryPageList(TestDemoBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return PageResult.build(result.getRecords(), result.getTotal()); + return PageResult.build(TranslationCollectionWrapper.form(result.getRecords()), result.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/translation/TestDemoVoTranslationCollectionCollectionHandler.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/translation/TestDemoVoTranslationCollectionCollectionHandler.java new file mode 100644 index 000000000..3e2b7a557 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/translation/TestDemoVoTranslationCollectionCollectionHandler.java @@ -0,0 +1,27 @@ +package org.dromara.demo.translation; + +import cn.hutool.core.util.IdUtil; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.json.utils.JsonUtils; +import org.dromara.common.translation.collection.TranslationCollectionType; +import org.dromara.common.translation.collection.TranslationCollectionProcessor; +import org.dromara.demo.domain.vo.TestDemoVo; + +import java.util.ArrayList; +import java.util.Collection; + +@Slf4j +@TranslationCollectionType(type = "test") +public class TestDemoVoTranslationCollectionCollectionHandler implements TranslationCollectionProcessor { + + @Override + public Collection process(Collection value, String other) throws Exception { + log.info("翻译前的数据：{}", JsonUtils.toJsonString(value)); + ArrayList vos = new ArrayList<>(value); + for (TestDemoVo vo : vos) { + vo.setValue("啊啦啦啦啦啦啦啦啦啦:"+ IdUtil.fastSimpleUUID()); + } + log.info("翻译后的数据：{}", JsonUtils.toJsonString(vos)); + return vos; + } +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-modules/ruoyi-demo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..429c221b1 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.demo.translation.TestDemoVoTranslationCollectionCollectionHandler From 7db9749718b13af49230fce59108b6ba19556047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Thu, 19 Mar 2026 01:23:19 +0000 Subject: [PATCH 03/13] =?UTF-8?q?Revert=20"feat=20=E6=96=B0=E7=89=B9?= =?UTF-8?q?=E6=80=A7=EF=BC=81=20=E6=94=AF=E6=8C=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=BF=BB=E8=AF=91~"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d9aa8484ed293228ee4c4c168d47c1a4e67a51cc. --- .../common/core/domain/PageResult.java | 19 +-- .../core/domain/dto/TaskAssigneeDTO.java | 7 +- .../collection/TranslationCollection.java | 26 ---- .../TranslationCollectionBinding.java | 20 --- .../TranslationCollectionProcessor.java | 17 --- .../TranslationCollectionSerializer.java | 62 --------- .../collection/TranslationCollectionType.java | 22 --- .../TranslationCollectionWrapper.java | 126 ------------------ .../translation/config/TranslationConfig.java | 23 +--- .../dromara/demo/domain/vo/TestDemoVo.java | 6 +- .../service/impl/TestDemoServiceImpl.java | 3 +- ...ranslationCollectionCollectionHandler.java | 27 ---- ...ot.autoconfigure.AutoConfiguration.imports | 1 - 13 files changed, 13 insertions(+), 346 deletions(-) delete mode 100644 ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollection.java delete mode 100644 ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionBinding.java delete mode 100644 ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionProcessor.java delete mode 100644 ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionSerializer.java delete mode 100644 ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionType.java delete mode 100644 ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionWrapper.java delete mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/translation/TestDemoVoTranslationCollectionCollectionHandler.java delete mode 100644 ruoyi-modules/ruoyi-demo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java index a89a755ea..9791425df 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java @@ -5,7 +5,7 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; -import java.util.Collection; +import java.util.List; /** * 表格分页数据对象 @@ -27,23 +27,12 @@ public class PageResult implements Serializable { /** * 列表数据 */ - private Collection rows; - - /** - * 分页 - * - * @param list 列表数据 - * @param total 总记录数 - */ - public PageResult(Collection list, long total) { - this.rows = list; - this.total = total; - } + private List rows; /** * 根据分页对象构建表格分页数据对象 */ - public static PageResult build(Collection list, long total) { + public static PageResult build(List list, long total) { PageResult rspData = new PageResult<>(); rspData.setRows(list); rspData.setTotal(total); @@ -53,7 +42,7 @@ public class PageResult implements Serializable { /** * 根据数据列表构建表格分页数据对象 */ - public static PageResult build(Collection list) { + public static PageResult build(List list) { PageResult rspData = new PageResult<>(); rspData.setRows(list); rspData.setTotal(list.size()); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java index 8444a8ef2..d3b4dac55 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java @@ -6,7 +6,6 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; -import java.util.Collection; import java.util.Date; import java.util.List; import java.util.function.Function; @@ -43,7 +42,7 @@ public class TaskAssigneeDTO implements Serializable { * 将源列表转换为 TaskHandler 列表 * * @param 通用类型 - * @param sourceCollection 待转换的源列表 + * @param sourceList 待转换的源列表 * @param storageId 提取 storageId 的函数 * @param handlerCode 提取 handlerCode 的函数 * @param handlerName 提取 handlerName 的函数 @@ -52,13 +51,13 @@ public class TaskAssigneeDTO implements Serializable { * @return 转换后的 TaskHandler 列表 */ public static List convertToHandlerList( - Collection sourceCollection, + List sourceList, Function storageId, Function handlerCode, Function handlerName, Function groupName, Function createTimeMapper) { - return sourceCollection.stream() + return sourceList.stream() .map(item -> new TaskHandler( storageId.apply(item), handlerCode.apply(item), diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollection.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollection.java deleted file mode 100644 index d4bc63d5d..000000000 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollection.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.dromara.common.translation.collection; - -import java.lang.annotation.*; - -/** - * 集合翻译（声明到需要翻译的实体上） - * - * @author 秋辞未寒 - */ -@Inherited -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE}) -@Documented -public @interface TranslationCollection { - - /** - * 类型 - */ - String type(); - - /** - * 其他条件 例如: 字典type(sys_user_gender) - */ - String other() default ""; - -} diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionBinding.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionBinding.java deleted file mode 100644 index 9ba23156c..000000000 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionBinding.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.dromara.common.translation.collection; - -import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; -import tools.jackson.databind.annotation.JsonSerialize; - -import java.lang.annotation.*; - -/** - * 序列化器绑定注解 - * - * @author 秋辞未寒 - */ -@Inherited -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE}) -@Documented -@JacksonAnnotationsInside -@JsonSerialize(using = TranslationCollectionSerializer.class) -public @interface TranslationCollectionBinding { -} diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionProcessor.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionProcessor.java deleted file mode 100644 index 11fc4f8ef..000000000 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionProcessor.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.dromara.common.translation.collection; - -import java.util.Collection; - -/** - * 翻译集合处理器 - * @param 输入类型 - * @param 目标类型 - * - * @author 秋辞未寒 - */ -public interface TranslationCollectionProcessor { - - - Collection process(Collection value,String other) throws Exception; - -} diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionSerializer.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionSerializer.java deleted file mode 100644 index 5b45b0e1e..000000000 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionSerializer.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.dromara.common.translation.collection; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ClassUtil; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.utils.reflect.AnnotationUtils; -import tools.jackson.core.JacksonException; -import tools.jackson.core.JsonGenerator; -import tools.jackson.databind.SerializationContext; -import tools.jackson.databind.ValueSerializer; - -import java.util.Collection; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * 集合翻译序列化器 - * - * @author 秋辞未寒 - */ -@Slf4j -public class TranslationCollectionSerializer extends ValueSerializer> { - - /** - * 全局翻译实现类映射器 - */ - public static final Map> TRANSLATION_MAPPER = new ConcurrentHashMap<>(); - - @Override - public void serialize(TranslationCollectionWrapper value, JsonGenerator gen, SerializationContext provider) throws JacksonException { - if (CollUtil.isEmpty(value)) { - return; - } - Class elementType = value.getElementType(); - if (elementType == null) { - elementType = ClassUtil.getClass(CollUtil.getFirst(value)); - } - // 获取包装原内容（很重要！！！！！！如果原样使用的话，会无限递归！） - Collection collection = value.getCollection(); - TranslationCollection annotation = AnnotationUtils.getAnnotation(elementType, TranslationCollection.class); - if (annotation != null ) { - String type = annotation.type(); - String other = annotation.other(); - TranslationCollectionProcessor processor = TRANSLATION_MAPPER.get(type); - if (processor != null) { - try { - collection = processor.process(collection,other); - } catch (Exception e) { - log.error("翻译处理异常，type: {}, value: {}", type, value, e); - // 出现异常时输出原始值而不是中断序列化 - collection = value.getCollection(); - } - } - } - gen.writeStartArray(); - for (Object o : collection) { - gen.writePOJO(o); - } - gen.writeEndArray(); - } - -} diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionType.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionType.java deleted file mode 100644 index 76ee7a08d..000000000 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionType.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.dromara.common.translation.collection; - -import java.lang.annotation.*; - - -/** - * 集合翻译类型 - * - * @author 秋辞未寒 - */ -@Inherited -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE}) -@Documented -public @interface TranslationCollectionType { - - /** - * 类型 - */ - String type(); - -} diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionWrapper.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionWrapper.java deleted file mode 100644 index 7f17c1707..000000000 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/collection/TranslationCollectionWrapper.java +++ /dev/null @@ -1,126 +0,0 @@ -package org.dromara.common.translation.collection; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ClassUtil; -import lombok.Getter; - -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.Objects; - -/** - * 翻译集合包装器 - * - * @param 元素类型 - * - * @author 秋辞未寒 - */ -@Getter -@TranslationCollectionBinding -public class TranslationCollectionWrapper implements Collection { - - private final Collection collection; - private final Class elementType; - - /** - * 不建议直接使用构造函数去构建包装器 - */ - private TranslationCollectionWrapper(Collection collection, Class elementType) { - this.collection = collection; - this.elementType = elementType; - } - - /** - * 包装集合成翻译集合 - * @param collection 待包装的集合 - * @return 包装后的集合类型 - * @param 元素类型 - */ - public static TranslationCollectionWrapper form(Collection collection) { - return form(collection,null); - } - - /** - * 包装集合成翻译集合 （推荐使用该函数，可以减少不必要的迭代器取值~） - * @param collection 待包装的集合 - * @param elementType 元素Class实例 - * @return 包装后的集合类型 - * @param 元素类型 - */ - public static TranslationCollectionWrapper form(Collection collection, Class elementType) { - if (Objects.isNull(collection)) { - collection = Collections.emptyList(); - } - if (Objects.isNull(elementType)) { - elementType = ClassUtil.getClass(CollUtil.getFirst(collection)); - } - return new TranslationCollectionWrapper<>(collection,elementType); - } - - - @Override - public int size() { - return collection.size(); - } - - @Override - public boolean isEmpty() { - return collection.isEmpty(); - } - - @Override - public boolean contains(Object o) { - return collection.contains(o); - } - - @Override - public Iterator iterator() { - return collection.iterator(); - } - - @Override - public Object[] toArray() { - return collection.toArray(); - } - - @Override - public T[] toArray(T[] a) { - return collection.toArray(a); - } - - @Override - public boolean add(E e) { - return collection.add(e); - } - - @Override - public boolean remove(Object o) { - return collection.remove(o); - } - - @Override - public boolean containsAll(Collection c) { - return collection.containsAll(c); - } - - @Override - public boolean addAll(Collection c) { - return collection.addAll(c); - } - - @Override - public boolean removeAll(Collection c) { - return collection.removeAll(c); - } - - @Override - public boolean retainAll(Collection c) { - return collection.retainAll(c); - } - - @Override - public void clear() { - collection.clear(); - } -} diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java index efad0300b..d1b52fdf6 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java @@ -3,9 +3,6 @@ package org.dromara.common.translation.config; import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.collection.TranslationCollectionProcessor; -import org.dromara.common.translation.collection.TranslationCollectionSerializer; -import org.dromara.common.translation.collection.TranslationCollectionType; import org.dromara.common.translation.core.TranslationInterface; import org.dromara.common.translation.core.handler.TranslationBeanSerializerModifier; import org.dromara.common.translation.core.handler.TranslationHandler; @@ -29,15 +26,12 @@ import java.util.Map; public class TranslationConfig { @Autowired - private List> translationInterfaces; - - @Autowired - private List> translationCollectionHandlers; + private List> list; @PostConstruct public void init() { - Map> map = new HashMap<>(translationInterfaces.size()); - for (TranslationInterface trans : translationInterfaces) { + Map> map = new HashMap<>(list.size()); + for (TranslationInterface trans : list) { if (trans.getClass().isAnnotationPresent(TranslationType.class)) { TranslationType annotation = trans.getClass().getAnnotation(TranslationType.class); map.put(annotation.type(), trans); @@ -46,17 +40,6 @@ public class TranslationConfig { } } TranslationHandler.TRANSLATION_MAPPER.putAll(map); - - Map> handlerMaps = new HashMap<>(translationCollectionHandlers.size()); - for (TranslationCollectionProcessor trans : translationCollectionHandlers) { - if (trans.getClass().isAnnotationPresent(TranslationCollectionType.class)) { - TranslationCollectionType annotation = trans.getClass().getAnnotation(TranslationCollectionType.class); - handlerMaps.put(annotation.type(), (TranslationCollectionProcessor) trans); - } else { - log.warn(trans.getClass().getName() + " 翻译实现类未标注 TranslationCollectionType 注解!"); - } - } - TranslationCollectionSerializer.TRANSLATION_MAPPER.putAll(handlerMaps); } @Bean diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java index d76980fec..0f760c8a3 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java @@ -1,16 +1,15 @@ package org.dromara.demo.domain.vo; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; import org.apache.fesod.sheet.annotation.ExcelProperty; import org.apache.fesod.sheet.annotation.format.DateTimeFormat; import org.dromara.common.excel.annotation.ExcelNotation; import org.dromara.common.excel.annotation.ExcelRequired; import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.collection.TranslationCollection; import org.dromara.common.translation.constant.TransConstant; import org.dromara.demo.domain.TestDemo; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; import java.io.Serial; import java.io.Serializable; @@ -23,7 +22,6 @@ import java.util.Date; * @author Lion Li * @date 2021-07-26 */ -@TranslationCollection(type = "test") @Data @ExcelIgnoreUnannotated @AutoMapper(target = TestDemo.class) diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java index 1caa39756..014b7e81d 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java @@ -9,7 +9,6 @@ import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.translation.collection.TranslationCollectionWrapper; import org.dromara.demo.domain.TestDemo; import org.dromara.demo.domain.bo.TestDemoBo; import org.dromara.demo.domain.vo.TestDemoVo; @@ -54,7 +53,7 @@ public class TestDemoServiceImpl implements ITestDemoService { public PageResult queryPageList(TestDemoBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return PageResult.build(TranslationCollectionWrapper.form(result.getRecords()), result.getTotal()); + return PageResult.build(result.getRecords(), result.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/translation/TestDemoVoTranslationCollectionCollectionHandler.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/translation/TestDemoVoTranslationCollectionCollectionHandler.java deleted file mode 100644 index 3e2b7a557..000000000 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/translation/TestDemoVoTranslationCollectionCollectionHandler.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.dromara.demo.translation; - -import cn.hutool.core.util.IdUtil; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.translation.collection.TranslationCollectionType; -import org.dromara.common.translation.collection.TranslationCollectionProcessor; -import org.dromara.demo.domain.vo.TestDemoVo; - -import java.util.ArrayList; -import java.util.Collection; - -@Slf4j -@TranslationCollectionType(type = "test") -public class TestDemoVoTranslationCollectionCollectionHandler implements TranslationCollectionProcessor { - - @Override - public Collection process(Collection value, String other) throws Exception { - log.info("翻译前的数据：{}", JsonUtils.toJsonString(value)); - ArrayList vos = new ArrayList<>(value); - for (TestDemoVo vo : vos) { - vo.setValue("啊啦啦啦啦啦啦啦啦啦:"+ IdUtil.fastSimpleUUID()); - } - log.info("翻译后的数据：{}", JsonUtils.toJsonString(vos)); - return vos; - } -} diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-modules/ruoyi-demo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 429c221b1..000000000 --- a/ruoyi-modules/ruoyi-demo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.demo.translation.TestDemoVoTranslationCollectionCollectionHandler From f1c2f0d45802509db7311d31995d3e67b32e8a39 Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Thu, 19 Mar 2026 09:29:19 +0800 Subject: [PATCH 04/13] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=AF=BC=E5=85=A5=E8=AF=AD=E5=8F=A5,=E4=BF=AE?= =?UTF-8?q?=E6=94=B9List=E4=B8=BACollection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/constant/RegexConstants.java | 2 +- .../common/core/service/DeptService.java | 3 +- .../common/core/service/PostService.java | 4 +-- .../common/core/service/RoleService.java | 4 +-- .../common/core/service/UserService.java | 13 ++++---- .../common/core/utils/regex/RegexUtils.java | 2 +- .../core/utils/regex/RegexValidator.java | 2 +- .../handler/PlusDataPermissionHandler.java | 6 ++++ .../sms/config/SmsAutoConfiguration.java | 2 +- .../common/sms/core/dao/PlusSmsDao.java | 2 +- .../monitor/SysOperlogController.java | 2 +- .../system/SysClientController.java | 4 +-- .../system/SysConfigController.java | 4 +-- .../controller/system/SysDeptController.java | 2 +- .../system/SysDictDataController.java | 4 +-- .../system/SysDictTypeController.java | 4 +-- .../controller/system/SysMenuController.java | 2 +- .../system/SysNoticeController.java | 4 +-- .../system/SysOssConfigController.java | 12 ++++---- .../controller/system/SysOssController.java | 2 +- .../controller/system/SysPostController.java | 4 +-- .../controller/system/SysRoleController.java | 20 +++++++------ .../org/dromara/system/domain/SysCache.java | 2 +- .../org/dromara/system/domain/SysClient.java | 6 ++-- .../org/dromara/system/domain/vo/MetaVo.java | 2 +- .../dromara/system/domain/vo/SysClientVo.java | 6 ++-- .../dromara/system/domain/vo/SysConfigVo.java | 4 +-- .../dromara/system/domain/vo/SysDeptVo.java | 4 +-- .../system/domain/vo/SysDictDataVo.java | 4 +-- .../system/domain/vo/SysDictTypeVo.java | 8 ++--- .../system/domain/vo/SysLoginInfoVo.java | 6 ++-- .../dromara/system/domain/vo/SysMenuVo.java | 2 +- .../dromara/system/domain/vo/SysNoticeVo.java | 4 +-- .../system/domain/vo/SysOperLogVo.java | 4 +-- .../system/domain/vo/SysOssConfigVo.java | 4 +-- .../dromara/system/domain/vo/SysOssVo.java | 4 +-- .../dromara/system/domain/vo/SysPostVo.java | 4 +-- .../dromara/system/domain/vo/SysRoleVo.java | 4 +-- .../system/domain/vo/SysUserImportVo.java | 4 +-- .../dromara/system/domain/vo/SysUserVo.java | 4 +-- .../listener/SysUserImportListener.java | 6 ++-- .../system/mapper/SysClientMapper.java | 2 +- .../system/mapper/SysDictTypeMapper.java | 2 +- .../dromara/system/mapper/SysMenuMapper.java | 4 +-- .../dromara/system/mapper/SysPostMapper.java | 3 +- .../dromara/system/mapper/SysRoleMapper.java | 3 +- .../system/mapper/SysRoleMenuMapper.java | 4 +-- .../runner/SystemApplicationRunner.java | 2 +- .../system/service/ISysClientService.java | 2 +- .../system/service/ISysConfigService.java | 5 ++-- .../system/service/ISysDeptService.java | 5 ++-- .../system/service/ISysDictDataService.java | 5 ++-- .../system/service/ISysDictTypeService.java | 5 ++-- .../system/service/ISysLoginInfoService.java | 2 +- .../system/service/ISysMenuService.java | 9 +++--- .../system/service/ISysNoticeService.java | 2 +- .../system/service/ISysOperLogService.java | 2 +- .../system/service/ISysOssConfigService.java | 2 +- .../system/service/ISysOssService.java | 4 +-- .../system/service/ISysPostService.java | 7 +++-- .../system/service/ISysRoleService.java | 15 +++++----- .../system/service/ISysUserService.java | 5 ++-- .../service/impl/SysClientServiceImpl.java | 2 +- .../service/impl/SysConfigServiceImpl.java | 5 ++-- .../service/impl/SysDeptServiceImpl.java | 6 ++-- .../service/impl/SysDictDataServiceImpl.java | 5 ++-- .../service/impl/SysDictTypeServiceImpl.java | 4 +-- .../service/impl/SysLoginInfoServiceImpl.java | 2 +- .../service/impl/SysMenuServiceImpl.java | 6 ++-- .../service/impl/SysNoticeServiceImpl.java | 2 +- .../service/impl/SysOperLogServiceImpl.java | 2 +- .../service/impl/SysOssConfigServiceImpl.java | 2 +- .../service/impl/SysOssServiceImpl.java | 2 +- .../service/impl/SysPostServiceImpl.java | 9 +++--- .../service/impl/SysRoleServiceImpl.java | 30 +++++++++---------- .../impl/SysTaskAssigneeServiceImpl.java | 2 +- .../service/impl/SysUserServiceImpl.java | 16 +++++----- .../controller/FlwCategoryController.java | 2 +- .../controller/FlwDefinitionController.java | 4 +-- .../controller/FlwInstanceController.java | 4 +-- .../controller/FlwSpelController.java | 4 +-- .../controller/FlwTaskController.java | 4 +-- .../controller/TestLeaveController.java | 4 +-- .../workflow/domain/vo/FlowCategoryVo.java | 4 +-- .../workflow/domain/vo/FlowSpelVo.java | 4 +-- .../workflow/domain/vo/TestLeaveVo.java | 5 ++-- .../workflow/mapper/FlwCategoryMapper.java | 2 -- .../mapper/FlwInstanceBizExtMapper.java | 4 +-- .../workflow/mapper/FlwInstanceMapper.java | 1 - .../workflow/mapper/FlwSpelMapper.java | 2 +- .../service/IFlwDefinitionService.java | 6 ++-- .../workflow/service/IFlwInstanceService.java | 9 +++--- .../workflow/service/IFlwSpelService.java | 2 +- .../workflow/service/IFlwTaskService.java | 13 ++++---- .../workflow/service/ITestLeaveService.java | 5 ++-- .../impl/FlwDefinitionServiceImpl.java | 7 +++-- .../service/impl/FlwInstanceServiceImpl.java | 14 ++++----- .../service/impl/FlwSpelServiceImpl.java | 2 +- .../service/impl/FlwTaskServiceImpl.java | 8 ++--- .../service/impl/TestLeaveServiceImpl.java | 5 ++-- 100 files changed, 254 insertions(+), 232 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java index f1e04f760..3e3ba7bb3 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java @@ -7,7 +7,7 @@ import cn.hutool.core.lang.RegexPool; *

* 常用正则表达式集合，更多正则见: https://any86.github.io/any-rule/ * - * @author Feng + * @author AprilWind */ public interface RegexConstants extends RegexPool { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java index 725718ae8..20969afcd 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java @@ -2,6 +2,7 @@ package org.dromara.common.core.service; import org.dromara.common.core.domain.dto.DeptDTO; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -41,6 +42,6 @@ public interface DeptService { * @param deptIds 部门 ID 列表 * @return Map，其中 key 为部门 ID，value 为对应的部门名称 */ - Map selectDeptNamesByIds(List deptIds); + Map selectDeptNamesByIds(Collection deptIds); } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java index 58c68d676..b94a8b5ee 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java @@ -1,6 +1,6 @@ package org.dromara.common.core.service; -import java.util.List; +import java.util.Collection; import java.util.Map; /** @@ -16,6 +16,6 @@ public interface PostService { * @param postIds 岗位 ID 列表 * @return Map，其中 key 为岗位 ID，value 为对应的岗位名称 */ - Map selectPostNamesByIds(List postIds); + Map selectPostNamesByIds(Collection postIds); } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java index d2805b7e0..a81fda7ef 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java @@ -1,6 +1,6 @@ package org.dromara.common.core.service; -import java.util.List; +import java.util.Collection; import java.util.Map; /** @@ -16,6 +16,6 @@ public interface RoleService { * @param roleIds 角色 ID 列表 * @return Map，其中 key 为角色 ID，value 为对应的角色名称 */ - Map selectRoleNamesByIds(List roleIds); + Map selectRoleNamesByIds(Collection roleIds); } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java index c61b1ed90..8b63f6c6a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java @@ -2,6 +2,7 @@ package org.dromara.common.core.service; import org.dromara.common.core.domain.dto.UserDTO; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -58,7 +59,7 @@ public interface UserService { * @param userIds 用户ids * @return 用户列表 */ - List selectListByIds(List userIds); + List selectListByIds(Collection userIds); /** * 通过角色ID查询用户ID @@ -66,7 +67,7 @@ public interface UserService { * @param roleIds 角色ids * @return 用户ids */ - List selectUserIdsByRoleIds(List roleIds); + List selectUserIdsByRoleIds(Collection roleIds); /** * 通过角色ID查询用户 @@ -74,7 +75,7 @@ public interface UserService { * @param roleIds 角色ids * @return 用户 */ - List selectUsersByRoleIds(List roleIds); + List selectUsersByRoleIds(Collection roleIds); /** * 通过部门ID查询用户 @@ -82,7 +83,7 @@ public interface UserService { * @param deptIds 部门ids * @return 用户 */ - List selectUsersByDeptIds(List deptIds); + List selectUsersByDeptIds(Collection deptIds); /** * 通过岗位ID查询用户 @@ -90,7 +91,7 @@ public interface UserService { * @param postIds 岗位ids * @return 用户 */ - List selectUsersByPostIds(List postIds); + List selectUsersByPostIds(Collection postIds); /** * 根据用户 ID 列表查询用户昵称映射关系 @@ -98,6 +99,6 @@ public interface UserService { * @param userIds 用户 ID 列表 * @return Map，其中 key 为用户 ID，value 为对应的用户昵称 */ - Map selectUserNicksByIds(List userIds); + Map selectUserNicksByIds(Collection userIds); } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java index 6dde12998..c417807c1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java @@ -7,7 +7,7 @@ import org.dromara.common.core.constant.RegexConstants; /** * 正则相关工具类 * - * @author Feng + * @author AprilWind */ public final class RegexUtils extends ReUtil { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java index c0dda2020..38dd4cfd0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java @@ -10,7 +10,7 @@ import java.util.regex.Pattern; * 正则字段校验器 * 主要验证字段非空、是否为满足指定格式等 * - * @author Feng + * @author AprilWind */ public class RegexValidator extends Validator { diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java index 1151907f8..58ac364c8 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java @@ -174,7 +174,13 @@ public class PlusDataPermissionHandler { return StringUtils.EMPTY; } + /** + * 获取当前登录用户信息 + * + * @return 当前登录用户的LoginUser对象，可能为null（如未登录场景） + */ private LoginUser currentUser() { + // 从数据权限助手缓存中获取当前登录用户 LoginUser currentUser = DataPermissionHelper.getVariable("user"); if (ObjectUtil.isNull(currentUser)) { currentUser = LoginHelper.getLoginUser(); diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java b/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java index 494ec03b2..d73cca467 100644 --- a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Primary; /** * 短信配置类 * - * @author Feng + * @author AprilWind */ @AutoConfiguration(after = {DataRedisAutoConfiguration.class}) public class SmsAutoConfiguration { diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java b/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java index a757655ce..95709d838 100644 --- a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java +++ b/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java @@ -10,7 +10,7 @@ import java.time.Duration; * SmsDao缓存配置 (使用框架自带RedisUtils实现 协议统一) *

主要用于短信重试和拦截的缓存 * - * @author Feng + * @author AprilWind */ public class PlusSmsDao implements SmsDao { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java index 2654dbf85..dc8fd7fdb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java @@ -4,12 +4,12 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.lock.annotation.Lock4j; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysOperLogBo; import org.dromara.system.domain.vo.SysOperLogVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java index 83806b63a..7bef26648 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java @@ -5,15 +5,15 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysClientBo; import org.dromara.system.domain.vo.SysClientVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java index c424029e7..8c6210fa7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java @@ -3,13 +3,13 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysConfigBo; import org.dromara.system.domain.vo.SysConfigVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java index 5b75482f3..8e014d8e2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java @@ -6,9 +6,9 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysDeptBo; import org.dromara.system.domain.vo.SysDeptVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java index 6de84099f..e316477a3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java @@ -4,13 +4,13 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysDictDataBo; import org.dromara.system.domain.vo.SysDictDataVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java index 4d553cc6f..dea026e9f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java @@ -4,13 +4,13 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.lock.annotation.Lock4j; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysDictTypeBo; import org.dromara.system.domain.vo.SysDictTypeVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java index 281ace793..380d0ee2e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java @@ -8,9 +8,9 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.SysMenu; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java index fcc3f459a..039e5a6cb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java @@ -2,13 +2,13 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.core.service.DictService; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.sse.utils.SseMessageUtils; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysNoticeBo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java index 6664cc610..752155d9f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java @@ -1,22 +1,22 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; +import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysOssConfigBo; import org.dromara.system.domain.vo.SysOssConfigVo; import org.dromara.system.service.ISysOssConfigService; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java index 500fb5519..ea2c28058 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java @@ -5,12 +5,12 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.QueryGroup; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysOssBo; import org.dromara.system.domain.vo.SysOssVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java index 7ac0253ee..6ab322ae6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java @@ -6,13 +6,13 @@ import cn.hutool.core.util.ObjectUtil; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysDeptBo; import org.dromara.system.domain.bo.SysPostBo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java index e247eceb0..19f4ce255 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java @@ -4,13 +4,13 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.lang.tree.Tree; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.SysUserRole; import org.dromara.system.domain.bo.SysDeptBo; @@ -24,6 +24,7 @@ import org.dromara.system.service.ISysUserService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.Collection; import java.util.List; /** @@ -44,7 +45,7 @@ public class SysRoleController extends BaseController { /** * 分页查询角色列表。 * - * @param role 查询条件 + * @param role 查询条件 * @param pageQuery 分页参数 * @return 角色分页结果 */ @@ -57,7 +58,7 @@ public class SysRoleController extends BaseController { /** * 导出角色信息列表。 * - * @param role 查询条件 + * @param role 查询条件 * @param response HTTP 响应 */ @Log(title = "角色管理", businessType = BusinessType.EXPORT) @@ -196,7 +197,7 @@ public class SysRoleController extends BaseController { /** * 查询已分配用户角色列表。 * - * @param user 查询条件 + * @param user 查询条件 * @param pageQuery 分页参数 * @return 用户分页结果 */ @@ -209,7 +210,7 @@ public class SysRoleController extends BaseController { /** * 查询未分配用户角色列表。 * - * @param user 查询条件 + * @param user 查询条件 * @param pageQuery 分页参数 * @return 用户分页结果 */ @@ -245,7 +246,7 @@ public class SysRoleController extends BaseController { @RepeatSubmit() @PutMapping("/authUser/cancelAll") public R cancelAuthUserAll(Long roleId, Long[] userIds) { - return toAjax(roleService.deleteAuthUsers(roleId, userIds)); + return toAjax(roleService.deleteAuthUsers(roleId, List.of(userIds))); } /** @@ -261,7 +262,7 @@ public class SysRoleController extends BaseController { @PutMapping("/authUser/selectAll") public R selectAuthUserAll(Long roleId, Long[] userIds) { roleService.checkRoleDataScope(roleId); - return toAjax(roleService.insertAuthUsers(roleId, userIds)); + return toAjax(roleService.insertAuthUsers(roleId, List.of(userIds))); } /** @@ -285,6 +286,7 @@ public class SysRoleController extends BaseController { * @param checkedKeys 选中部门列表 * @param depts 下拉树结构列表 */ - public record DeptTreeSelectVo(List checkedKeys, List> depts) {} + public record DeptTreeSelectVo(Collection checkedKeys, List> depts) { + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java index e398a206a..6c956d529 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java @@ -1,8 +1,8 @@ package org.dromara.system.domain; -import org.dromara.common.core.utils.StringUtils; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.core.utils.StringUtils; /** * 缓存信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java index ee2475d08..426bc00a9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java @@ -1,9 +1,11 @@ package org.dromara.system.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java index 840ddaf2e..5c5c98c0d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java @@ -1,7 +1,7 @@ package org.dromara.system.domain.vo; -import org.dromara.common.core.utils.StringUtils; import lombok.Data; +import org.dromara.common.core.utils.StringUtils; /** * 路由显示信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java index 100d7f5a9..feb151066 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java @@ -1,12 +1,12 @@ package org.dromara.system.domain.vo; -import org.dromara.system.domain.SysClient; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; import org.apache.fesod.sheet.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; +import org.dromara.system.domain.SysClient; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java index e1cf1f5c5..a9687cb70 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java @@ -1,12 +1,12 @@ package org.dromara.system.domain.vo; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; import org.apache.fesod.sheet.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysConfig; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java index 05c727777..917864e62 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java @@ -1,9 +1,9 @@ package org.dromara.system.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.apache.fesod.sheet.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; +import org.apache.fesod.sheet.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysDept; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java index 4fe3547b5..a6d7aa7d6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java @@ -1,12 +1,12 @@ package org.dromara.system.domain.vo; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; import org.apache.fesod.sheet.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysDictData; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java index 2fda5698f..40f38e287 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java @@ -1,12 +1,10 @@ package org.dromara.system.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.apache.fesod.sheet.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysDictType; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; +import org.apache.fesod.sheet.annotation.ExcelProperty; +import org.dromara.system.domain.SysDictType; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLoginInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLoginInfoVo.java index c238ce774..8333f180d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLoginInfoVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLoginInfoVo.java @@ -1,16 +1,16 @@ package org.dromara.system.domain.vo; -import java.util.Date; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; import org.apache.fesod.sheet.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysLoginInfo; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.util.Date; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java index 9ad7997e4..9db114b67 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java @@ -1,8 +1,8 @@ package org.dromara.system.domain.vo; -import org.dromara.system.domain.SysMenu; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.system.domain.SysMenu; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java index afe73674f..271ae62b4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java @@ -1,10 +1,10 @@ package org.dromara.system.domain.vo; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; import org.dromara.system.domain.SysNotice; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java index 4913d25d4..b71ea2746 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java @@ -1,12 +1,12 @@ package org.dromara.system.domain.vo; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; import org.apache.fesod.sheet.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysOperLog; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java index f6fb5040d..d752282dc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java @@ -1,9 +1,9 @@ package org.dromara.system.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.dromara.system.domain.SysOssConfig; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; +import org.dromara.system.domain.SysOssConfig; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java index fe0565182..cd2771acf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java @@ -1,10 +1,10 @@ package org.dromara.system.domain.vo; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; import org.dromara.system.domain.SysOss; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java index 81bf8d91e..ffe694af3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java @@ -1,9 +1,9 @@ package org.dromara.system.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.apache.fesod.sheet.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; +import org.apache.fesod.sheet.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.common.translation.annotation.Translation; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java index 951a4e637..44b8fb36c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java @@ -1,9 +1,9 @@ package org.dromara.system.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.apache.fesod.sheet.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; +import org.apache.fesod.sheet.annotation.ExcelProperty; import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java index d1880ffe0..7ee0392c0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java @@ -1,10 +1,10 @@ package org.dromara.system.domain.vo; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.fesod.sheet.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; -import lombok.Data; -import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java index 97e2fda03..5e1c9a466 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java @@ -2,13 +2,13 @@ package org.dromara.system.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; import org.dromara.common.sensitive.annotation.Sensitive; import org.dromara.common.sensitive.core.SensitiveStrategy; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; import org.dromara.system.domain.SysUser; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java index 6b3572680..e976c38ac 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java @@ -4,10 +4,11 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.crypto.digest.BCrypt; import cn.hutool.http.HtmlUtil; -import org.apache.fesod.sheet.context.AnalysisContext; -import org.apache.fesod.sheet.event.AnalysisEventListener; import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; +import lombok.extern.slf4j.Slf4j; +import org.apache.fesod.sheet.context.AnalysisContext; +import org.apache.fesod.sheet.event.AnalysisEventListener; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StreamUtils; @@ -20,7 +21,6 @@ import org.dromara.system.domain.vo.SysUserImportVo; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.service.ISysConfigService; import org.dromara.system.service.ISysUserService; -import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java index 15bcfb4d3..6a9719135 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java @@ -1,8 +1,8 @@ package org.dromara.system.mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.system.domain.SysClient; import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** * 授权管理Mapper接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java index 9a9bdd52d..ae1563927 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java @@ -1,7 +1,7 @@ package org.dromara.system.mapper; -import org.dromara.system.domain.SysDictType; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysDictType; import org.dromara.system.domain.vo.SysDictTypeVo; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java index ff7b51b48..50a82218b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java @@ -12,8 +12,8 @@ import org.dromara.system.domain.SysRole; import org.dromara.system.domain.SysRoleMenu; import org.dromara.system.domain.SysUserRole; import org.dromara.system.domain.bo.SysMenuBo; -import org.dromara.system.domain.vo.SysRoleMenuPermVo; import org.dromara.system.domain.vo.SysMenuVo; +import org.dromara.system.domain.vo.SysRoleMenuPermVo; import java.util.*; @@ -67,7 +67,7 @@ public interface SysMenuMapper extends BaseMapperPlus { * @param roleIds 角色ID列表 * @return 角色权限映射 */ - default Map> selectMenuPermsByRoleIds(List roleIds) { + default Map> selectMenuPermsByRoleIds(Collection roleIds) { if (CollUtil.isEmpty(roleIds)) { return Map.of(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java index 165d4d3fb..3b27cd961 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java @@ -11,6 +11,7 @@ import org.dromara.system.domain.SysPost; import org.dromara.system.domain.SysUserPost; import org.dromara.system.domain.vo.SysPostVo; +import java.util.Collection; import java.util.List; /** @@ -59,7 +60,7 @@ public interface SysPostMapper extends BaseMapperPlus { @DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "userName", value = "create_by") }) - default long selectPostCount(List postIds) { + default long selectPostCount(Collection postIds) { return this.selectCount(new LambdaQueryWrapper().in(SysPost::getPostId, postIds)); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java index 43f9cdfb2..a48310441 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java @@ -13,6 +13,7 @@ import org.dromara.system.domain.SysRole; import org.dromara.system.domain.SysUserRole; import org.dromara.system.domain.vo.SysRoleVo; +import java.util.Collection; import java.util.List; /** @@ -61,7 +62,7 @@ public interface SysRoleMapper extends BaseMapperPlus { @DataColumn(key = "deptName", value = "create_dept"), @DataColumn(key = "userName", value = "create_by") }) - default long selectRoleCount(List roleIds) { + default long selectRoleCount(Collection roleIds) { return this.selectCount(new LambdaQueryWrapper().in(SysRole::getRoleId, roleIds)); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java index 8aa9dd3ea..6b552965a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.system.domain.SysRoleMenu; -import java.util.List; +import java.util.Collection; /** * 角色与菜单关联表 数据层 @@ -19,7 +19,7 @@ public interface SysRoleMenuMapper extends BaseMapperPlus menuIds) { + default int deleteByMenuIds(Collection menuIds) { return this.delete(new LambdaUpdateWrapper().in(SysRoleMenu::getMenuId, menuIds)); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java index 27dad7dda..90482ac1b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java @@ -1,8 +1,8 @@ package org.dromara.system.runner; -import org.dromara.system.service.ISysOssConfigService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.system.service.ISysOssConfigService; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java index b865c9c13..b14d4f404 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.system.domain.bo.SysClientBo; import org.dromara.system.domain.vo.SysClientVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java index 1f19d2794..e581407b0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java @@ -1,10 +1,11 @@ package org.dromara.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.system.domain.bo.SysConfigBo; import org.dromara.system.domain.vo.SysConfigVo; +import java.util.Collection; import java.util.List; /** @@ -75,7 +76,7 @@ public interface ISysConfigService { * * @param configIds 需要删除的参数ID */ - void deleteConfigByIds(List configIds); + void deleteConfigByIds(Collection configIds); /** * 重置参数缓存数据 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java index 63c33be1c..515ffa4e2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java @@ -1,11 +1,12 @@ package org.dromara.system.service; import cn.hutool.core.lang.tree.Tree; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.system.domain.bo.SysDeptBo; import org.dromara.system.domain.vo.SysDeptVo; +import java.util.Collection; import java.util.List; /** @@ -70,7 +71,7 @@ public interface ISysDeptService { * @param deptIds 部门id串 * @return 部门列表信息 */ - List selectDeptByIds(List deptIds); + List selectDeptByIds(Collection deptIds); /** * 根据ID查询所有子部门数（正常状态） diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java index f3bd769ac..540453ac4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java @@ -1,10 +1,11 @@ package org.dromara.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.system.domain.bo.SysDictDataBo; import org.dromara.system.domain.vo.SysDictDataVo; +import java.util.Collection; import java.util.List; /** @@ -53,7 +54,7 @@ public interface ISysDictDataService { * * @param dictCodes 需要删除的字典数据ID */ - void deleteDictDataByIds(List dictCodes); + void deleteDictDataByIds(Collection dictCodes); /** * 新增保存字典数据信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java index 1eac2c429..6ad37691d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java @@ -1,11 +1,12 @@ package org.dromara.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.system.domain.bo.SysDictTypeBo; import org.dromara.system.domain.vo.SysDictDataVo; import org.dromara.system.domain.vo.SysDictTypeVo; +import java.util.Collection; import java.util.List; /** @@ -68,7 +69,7 @@ public interface ISysDictTypeService { * * @param dictIds 需要删除的字典ID */ - void deleteDictTypeByIds(List dictIds); + void deleteDictTypeByIds(Collection dictIds); /** * 重置字典缓存数据 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLoginInfoService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLoginInfoService.java index c3f0100b0..532ffc623 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLoginInfoService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLoginInfoService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.system.domain.bo.SysLoginInfoBo; import org.dromara.system.domain.vo.SysLoginInfoVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java index 41d8d771e..355446791 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java @@ -6,8 +6,9 @@ import org.dromara.system.domain.bo.SysMenuBo; import org.dromara.system.domain.vo.RouterVo; import org.dromara.system.domain.vo.SysMenuVo; -import java.util.Map; +import java.util.Collection; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -56,7 +57,7 @@ public interface ISysMenuService { * @param roleIds 角色ID列表 * @return 角色权限映射 */ - Map> selectMenuPermsByRoleIds(List roleIds); + Map> selectMenuPermsByRoleIds(Collection roleIds); /** * 根据用户ID查询菜单树信息 @@ -112,7 +113,7 @@ public interface ISysMenuService { * @param menuIds 菜单ID串 * @return 结果 true 存在 false 不存在 */ - boolean hasChildByMenuId(List menuIds); + boolean hasChildByMenuId(Collection menuIds); /** * 查询菜单是否存在角色 @@ -152,7 +153,7 @@ public interface ISysMenuService { * @param menuIds 菜单ID串 * @return 结果 */ - void deleteMenuById(List menuIds); + void deleteMenuById(Collection menuIds); /** * 校验菜单名称是否唯一 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java index 81ec4c592..78de4bb5c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.system.domain.bo.SysNoticeBo; import org.dromara.system.domain.vo.SysNoticeVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java index 51c7e95f9..7c3bf4dcf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.system.domain.bo.SysOperLogBo; import org.dromara.system.domain.vo.SysOperLogVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java index 844d699a8..d7734e528 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.system.domain.bo.SysOssConfigBo; import org.dromara.system.domain.vo.SysOssConfigVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java index 78eb473df..da8d5fa0b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java @@ -1,10 +1,10 @@ package org.dromara.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; +import jakarta.servlet.http.HttpServletResponse; import org.dromara.common.core.domain.PageResult; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.system.domain.bo.SysOssBo; import org.dromara.system.domain.vo.SysOssVo; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; import java.io.File; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java index 2ada75334..2662175a1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java @@ -1,10 +1,11 @@ package org.dromara.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.system.domain.bo.SysPostBo; import org.dromara.system.domain.vo.SysPostVo; +import java.util.Collection; import java.util.List; /** @@ -68,7 +69,7 @@ public interface ISysPostService { * @param postIds 岗位id串 * @return 岗位列表信息 */ - List selectPostByIds(List postIds); + List selectPostByIds(Collection postIds); /** * 校验岗位名称 @@ -116,7 +117,7 @@ public interface ISysPostService { * @param postIds 需要删除的岗位ID * @return 影响行数 */ - int deletePostByIds(List postIds); + int deletePostByIds(Collection postIds); /** * 新增保存岗位信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java index a34fc1c55..c8304ce44 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java @@ -1,11 +1,12 @@ package org.dromara.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.system.domain.SysUserRole; import org.dromara.system.domain.bo.SysRoleBo; import org.dromara.system.domain.vo.SysRoleVo; +import java.util.Collection; import java.util.List; import java.util.Set; @@ -86,7 +87,7 @@ public interface ISysRoleService { * @param roleIds 角色ID串 * @return 角色列表信息 */ - List selectRoleByIds(List roleIds); + List selectRoleByIds(Collection roleIds); /** * 校验角色名称是否唯一 @@ -123,7 +124,7 @@ public interface ISysRoleService { * * @param roleIds 角色ID列表（支持传单个ID） */ - void checkRoleDataScope(List roleIds); + void checkRoleDataScope(Collection roleIds); /** * 通过角色ID查询角色使用数量 @@ -180,7 +181,7 @@ public interface ISysRoleService { * @param roleIds 需要删除的角色ID * @return 影响行数 */ - int deleteRoleByIds(List roleIds); + int deleteRoleByIds(Collection roleIds); /** * 取消授权用户角色 @@ -197,7 +198,7 @@ public interface ISysRoleService { * @param userIds 需要取消授权的用户数据ID * @return 影响行数 */ - int deleteAuthUsers(Long roleId, Long[] userIds); + int deleteAuthUsers(Long roleId, Collection userIds); /** * 批量选择授权用户角色 @@ -206,7 +207,7 @@ public interface ISysRoleService { * @param userIds 需要删除的用户数据ID * @return 影响行数 */ - int insertAuthUsers(Long roleId, Long[] userIds); + int insertAuthUsers(Long roleId, Collection userIds); /** * 根据角色ID清除该角色关联的所有在线用户的登录状态（踢出在线用户） @@ -231,6 +232,6 @@ public interface ISysRoleService { * * @param userIds 需要清除的用户ID列表 */ - void cleanOnlineUser(List userIds); + void cleanOnlineUser(Collection userIds); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java index a054e4168..ee5a87377 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java @@ -1,11 +1,12 @@ package org.dromara.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.system.domain.bo.SysUserBo; import org.dromara.system.domain.vo.SysUserExportVo; import org.dromara.system.domain.vo.SysUserVo; +import java.util.Collection; import java.util.List; /** @@ -82,7 +83,7 @@ public interface ISysUserService { * @param deptId 部门id * @return 用户列表信息 */ - List selectUserByIds(List userIds, Long deptId); + List selectUserByIds(Collection userIds, Long deptId); /** * 根据用户ID查询用户所属角色组 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java index 1724d7a98..6ffd8da73 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java @@ -10,10 +10,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.SysClient; import org.dromara.system.domain.bo.SysClientBo; import org.dromara.system.domain.vo.SysClientVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java index c0339c2b3..aeb5b9c86 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.service.ConfigService; import org.dromara.common.core.utils.MapstructUtils; @@ -17,7 +18,6 @@ import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.system.domain.SysConfig; import org.dromara.system.domain.bo.SysConfigBo; @@ -28,6 +28,7 @@ import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -172,7 +173,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { * @param configIds 需要删除的参数ID */ @Override - public void deleteConfigByIds(List configIds) { + public void deleteConfigByIds(Collection configIds) { List list = baseMapper.selectByIds(configIds); list.forEach(config -> { if (StringUtils.equals(SystemConstants.YES, config.getConfigType())) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java index 4b826f3c8..af8603f4c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java @@ -12,12 +12,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.dto.DeptDTO; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.service.DeptService; import org.dromara.common.core.utils.*; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.common.satoken.utils.LoginHelper; @@ -182,7 +182,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { * @return 部门基础信息列表 */ @Override - public List selectDeptByIds(List deptIds) { + public List selectDeptByIds(Collection deptIds) { return baseMapper.selectDeptList(new LambdaQueryWrapper() .select(SysDept::getDeptId, SysDept::getDeptName, SysDept::getLeader) .eq(SysDept::getStatus, SystemConstants.NORMAL) @@ -423,7 +423,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { * @return Map，其中 key 为部门 ID，value 为对应的部门名称 */ @Override - public Map selectDeptNamesByIds(List deptIds) { + public Map selectDeptNamesByIds(Collection deptIds) { if (CollUtil.isEmpty(deptIds)) { return Collections.emptyMap(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java index c99badc35..106e2e7e7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java @@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.system.domain.SysDictData; import org.dromara.system.domain.bo.SysDictDataBo; @@ -20,6 +20,7 @@ import org.dromara.system.service.ISysDictDataService; import org.springframework.cache.annotation.CachePut; import org.springframework.stereotype.Service; +import java.util.Collection; import java.util.List; /** @@ -107,7 +108,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { * @param dictCodes 需要删除的字典数据ID */ @Override - public void deleteDictDataByIds(List dictCodes) { + public void deleteDictDataByIds(Collection dictCodes) { List list = baseMapper.selectByIds(dictCodes); baseMapper.deleteByIds(dictCodes); list.forEach(x -> CacheUtils.evict(CacheNames.SYS_DICT, x.getDictType())); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java index 932b51865..278963a68 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.dto.DictDataDTO; import org.dromara.common.core.domain.dto.DictTypeDTO; import org.dromara.common.core.exception.ServiceException; @@ -18,7 +19,6 @@ import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.system.domain.SysDictData; import org.dromara.system.domain.SysDictType; @@ -140,7 +140,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService * @param dictIds 需要删除的字典ID */ @Override - public void deleteDictTypeByIds(List dictIds) { + public void deleteDictTypeByIds(Collection dictIds) { List list = baseMapper.selectByIds(dictIds); list.forEach(x -> { boolean assigned = dictDataMapper.exists(new LambdaQueryWrapper() diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java index ff3d97502..15f91df76 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java @@ -9,13 +9,13 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.constant.Constants; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.ServletUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.ip.AddressUtils; import org.dromara.common.log.event.LoginInfoEvent; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.domain.SysLoginInfo; import org.dromara.system.domain.bo.SysLoginInfoBo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java index f45827a34..f60ea03e9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java @@ -106,7 +106,7 @@ public class SysMenuServiceImpl implements ISysMenuService { * @return 角色权限映射 */ @Override - public Map> selectMenuPermsByRoleIds(List roleIds) { + public Map> selectMenuPermsByRoleIds(Collection roleIds) { return baseMapper.selectMenuPermsByRoleIds(roleIds); } @@ -256,7 +256,7 @@ public class SysMenuServiceImpl implements ISysMenuService { * @return 结果 */ @Override - public boolean hasChildByMenuId(List menuIds) { + public boolean hasChildByMenuId(Collection menuIds) { return baseMapper.exists(new LambdaQueryWrapper().in(SysMenu::getParentId, menuIds).notIn(SysMenu::getMenuId, menuIds)); } @@ -313,7 +313,7 @@ public class SysMenuServiceImpl implements ISysMenuService { */ @Override @Transactional(rollbackFor = Exception.class) - public void deleteMenuById(List menuIds) { + public void deleteMenuById(Collection menuIds) { baseMapper.deleteByIds(menuIds); roleMenuMapper.deleteByMenuIds(menuIds); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java index 36d0a367a..2cdb7ba07 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java @@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.ObjectUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.SysNotice; import org.dromara.system.domain.SysUser; import org.dromara.system.domain.bo.SysNoticeBo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java index 4f9722c01..b3b02f35f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java @@ -4,12 +4,12 @@ import cn.hutool.core.util.ArrayUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.ip.AddressUtils; import org.dromara.common.log.event.OperLogEvent; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.SysOperLog; import org.dromara.system.domain.bo.SysOperLogBo; import org.dromara.system.domain.vo.SysOperLogVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java index d68fb0552..02b46fdce 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java @@ -10,13 +10,13 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.ObjectUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.oss.constant.OssConstant; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.common.redis.utils.RedisUtils; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java index a9775d0c2..3a02b3c41 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.dto.OssDTO; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.service.OssService; @@ -19,7 +20,6 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.file.FileUtils; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.oss.core.OssClient; import org.dromara.common.oss.entity.UploadResult; import org.dromara.common.oss.enums.AccessPolicyType; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java index 1e1256281..28d8b7516 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java @@ -7,13 +7,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.service.PostService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.SysPost; import org.dromara.system.domain.SysUserPost; import org.dromara.system.domain.bo.SysPostBo; @@ -24,6 +24,7 @@ import org.dromara.system.mapper.SysUserPostMapper; import org.dromara.system.service.ISysPostService; import org.springframework.stereotype.Service; +import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; @@ -145,7 +146,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService { * @return 岗位列表信息 */ @Override - public List selectPostByIds(List postIds) { + public List selectPostByIds(Collection postIds) { return baseMapper.selectVoList(new LambdaQueryWrapper() .select(SysPost::getPostId, SysPost::getPostName, SysPost::getPostCode) .eq(SysPost::getStatus, SystemConstants.NORMAL) @@ -221,7 +222,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService { * @return 结果 */ @Override - public int deletePostByIds(List postIds) { + public int deletePostByIds(Collection postIds) { List list = baseMapper.selectByIds(postIds); for (SysPost post : list) { if (this.countUserPostById(post.getPostId()) > 0) { @@ -262,7 +263,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService { * @return Map，其中 key 为岗位 ID，value 为对应的岗位名称 */ @Override - public Map selectPostNamesByIds(List postIds) { + public Map selectPostNamesByIds(Collection postIds) { if (CollUtil.isEmpty(postIds)) { return Collections.emptyMap(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java index c9668e30b..49e4936fd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.service.RoleService; @@ -20,7 +21,6 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.domain.SysRole; import org.dromara.system.domain.SysRoleDept; @@ -185,7 +185,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService { * @return 角色列表信息 */ @Override - public List selectRoleByIds(List roleIds) { + public List selectRoleByIds(Collection roleIds) { return baseMapper.selectRoleList(new LambdaQueryWrapper() .eq(SysRole::getStatus, SystemConstants.NORMAL) .in(CollUtil.isNotEmpty(roleIds), SysRole::getRoleId, roleIds)); @@ -268,7 +268,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService { * @param roleIds 角色ID列表（支持传单个ID） */ @Override - public void checkRoleDataScope(List roleIds) { + public void checkRoleDataScope(Collection roleIds) { if (CollUtil.isEmpty(roleIds) || LoginHelper.isSuperAdmin()) { return; } @@ -431,7 +431,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService { @CacheEvict(cacheNames = CacheNames.SYS_ROLE_CUSTOM, allEntries = true) @Override @Transactional(rollbackFor = Exception.class) - public int deleteRoleByIds(List roleIds) { + public int deleteRoleByIds(Collection roleIds) { this.checkRoleDataScope(roleIds); List roles = baseMapper.selectByIds(roleIds); for (SysRole role : roles) { @@ -475,16 +475,15 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService { * @return 结果 */ @Override - public int deleteAuthUsers(Long roleId, Long[] userIds) { - List ids = List.of(userIds); - if (ids.contains(LoginHelper.getUserId())) { + public int deleteAuthUsers(Long roleId, Collection userIds) { + if (userIds.contains(LoginHelper.getUserId())) { throw new ServiceException("不允许修改当前用户角色!"); } int rows = userRoleMapper.delete(new LambdaQueryWrapper() .eq(SysUserRole::getRoleId, roleId) - .in(SysUserRole::getUserId, ids)); + .in(SysUserRole::getUserId, userIds)); if (rows > 0) { - cleanOnlineUser(ids); + cleanOnlineUser(userIds); } return rows; } @@ -497,14 +496,13 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService { * @return 结果 */ @Override - public int insertAuthUsers(Long roleId, Long[] userIds) { + public int insertAuthUsers(Long roleId, Collection userIds) { // 新增用户与角色管理 int rows = 1; - List ids = List.of(userIds); - if (ids.contains(LoginHelper.getUserId())) { + if (userIds.contains(LoginHelper.getUserId())) { throw new ServiceException("不允许修改当前用户角色!"); } - List list = StreamUtils.toList(ids, userId -> { + List list = StreamUtils.toList(userIds, userId -> { SysUserRole ur = new SysUserRole(); ur.setUserId(userId); ur.setRoleId(roleId); @@ -514,7 +512,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService { rows = userRoleMapper.insertBatch(list) ? list.size() : 0; } if (rows > 0) { - cleanOnlineUser(ids); + cleanOnlineUser(userIds); } return rows; } @@ -572,7 +570,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService { * @param userIds 需要清除的用户ID列表 */ @Override - public void cleanOnlineUser(List userIds) { + public void cleanOnlineUser(Collection userIds) { List keys = StpUtil.searchTokenValue("", 0, -1, false); if (CollUtil.isEmpty(keys)) { return; @@ -604,7 +602,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService { * @return Map，其中 key 为角色 ID，value 为对应的角色名称 */ @Override - public Map selectRoleNamesByIds(List roleIds) { + public Map selectRoleNamesByIds(Collection roleIds) { if (CollUtil.isEmpty(roleIds)) { return Collections.emptyMap(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java index dbd743c86..b81395678 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java @@ -3,11 +3,11 @@ package org.dromara.system.service.impl; import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.dto.TaskAssigneeDTO; import org.dromara.common.core.domain.model.TaskAssigneeBody; import org.dromara.common.core.service.TaskAssigneeService; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysDeptBo; import org.dromara.system.domain.bo.SysPostBo; import org.dromara.system.domain.bo.SysRoleBo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index db401a5a6..23f02ffd6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -14,12 +14,12 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.dto.UserDTO; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.service.UserService; import org.dromara.common.core.utils.*; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.domain.SysUser; import org.dromara.system.domain.SysUserPost; @@ -179,7 +179,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户列表信息 */ @Override - public List selectUserByIds(List userIds, Long deptId) { + public List selectUserByIds(Collection userIds, Long deptId) { return baseMapper.selectUserList(new LambdaQueryWrapper() .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName) .eq(SysUser::getStatus, SystemConstants.NORMAL) @@ -648,7 +648,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户列表 */ @Override - public List selectListByIds(List userIds) { + public List selectListByIds(Collection userIds) { if (CollUtil.isEmpty(userIds)) { return List.of(); } @@ -669,7 +669,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户ids */ @Override - public List selectUserIdsByRoleIds(List roleIds) { + public List selectUserIdsByRoleIds(Collection roleIds) { if (CollUtil.isEmpty(roleIds)) { return List.of(); } @@ -685,7 +685,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户 */ @Override - public List selectUsersByRoleIds(List roleIds) { + public List selectUsersByRoleIds(Collection roleIds) { if (CollUtil.isEmpty(roleIds)) { return List.of(); } @@ -707,7 +707,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户 */ @Override - public List selectUsersByDeptIds(List deptIds) { + public List selectUsersByDeptIds(Collection deptIds) { if (CollUtil.isEmpty(deptIds)) { return List.of(); } @@ -725,7 +725,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户 */ @Override - public List selectUsersByPostIds(List postIds) { + public List selectUsersByPostIds(Collection postIds) { if (CollUtil.isEmpty(postIds)) { return List.of(); } @@ -747,7 +747,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return Map，其中 key 为用户 ID，value 为对应的用户昵称 */ @Override - public Map selectUserNicksByIds(List userIds) { + public Map selectUserNicksByIds(Collection userIds) { if (CollUtil.isEmpty(userIds)) { return Collections.emptyMap(); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java index 73cf20f85..ad1387a32 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java @@ -9,9 +9,9 @@ import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.common.constant.FlowConstant; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java index 02bd05305..634fbfd10 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java @@ -2,12 +2,12 @@ package org.dromara.workflow.controller; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.warm.flow.core.entity.Definition; import org.dromara.warm.flow.core.service.DefService; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java index 36369296b..cb865c30a 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java @@ -2,13 +2,13 @@ package org.dromara.workflow.controller; import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.warm.flow.core.service.InsService; import org.dromara.workflow.common.ConditionalOnEnable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java index 3c1aaeb5c..67c573068 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java @@ -4,14 +4,14 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.domain.bo.FlowSpelBo; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java index aed9fb985..73236ba65 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java @@ -1,15 +1,15 @@ package org.dromara.workflow.controller; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.dto.StartProcessReturnDTO; import org.dromara.common.core.domain.dto.UserDTO; import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.warm.flow.core.entity.Node; import org.dromara.warm.flow.orm.entity.FlowNode; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java index ce46e9272..d285d232c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java @@ -5,15 +5,15 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.domain.bo.TestLeaveBo; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java index fb30d4f67..33d85f38b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java @@ -1,9 +1,9 @@ package org.dromara.workflow.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.apache.fesod.sheet.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; +import org.apache.fesod.sheet.annotation.ExcelProperty; import org.dromara.common.translation.annotation.Translation; import org.dromara.workflow.common.constant.FlowConstant; import org.dromara.workflow.domain.FlowCategory; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowSpelVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowSpelVo.java index aff61e3cf..35fd1c6d7 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowSpelVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowSpelVo.java @@ -1,11 +1,11 @@ package org.dromara.workflow.domain.vo; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; import org.apache.fesod.sheet.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; import org.dromara.workflow.domain.FlowSpel; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java index cf271de29..010793c3e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java @@ -1,10 +1,9 @@ package org.dromara.workflow.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.apache.fesod.sheet.annotation.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; +import org.apache.fesod.sheet.annotation.ExcelProperty; import org.dromara.workflow.domain.TestLeave; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java index 7199d5ceb..c7a3d2642 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java @@ -1,8 +1,6 @@ package org.dromara.workflow.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.workflow.domain.FlowCategory; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceBizExtMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceBizExtMapper.java index e11613cf4..4b9a9785e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceBizExtMapper.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceBizExtMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.workflow.domain.FlowInstanceBizExt; -import java.util.List; +import java.util.Collection; /** * 流程实例业务扩展Mapper接口 @@ -53,7 +53,7 @@ public interface FlwInstanceBizExtMapper extends BaseMapperPlus instanceIds) { + default int deleteByInstIds(Collection instanceIds) { return this.delete(new LambdaQueryWrapper() .in(FlowInstanceBizExt::getInstanceId, instanceIds)); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java index 4a5e39dec..d87a18767 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.dromara.warm.flow.orm.entity.FlowInstance; -import org.dromara.workflow.domain.bo.FlowInstanceBo; import org.dromara.workflow.domain.vo.FlowInstanceVo; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwSpelMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwSpelMapper.java index 12dff9f77..24dd70a4a 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwSpelMapper.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwSpelMapper.java @@ -1,8 +1,8 @@ package org.dromara.workflow.mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.workflow.domain.FlowSpel; import org.dromara.workflow.domain.vo.FlowSpelVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** * 流程spel表达式定义Mapper接口 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java index 695228136..e86c99cac 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java @@ -1,14 +1,14 @@ package org.dromara.workflow.service; import jakarta.servlet.http.HttpServletResponse; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.warm.flow.orm.entity.FlowDefinition; import org.dromara.workflow.domain.vo.FlowDefinitionVo; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; -import java.util.List; +import java.util.Collection; /** * 流程定义 服务层 @@ -67,6 +67,6 @@ public interface IFlwDefinitionService { * @param ids 流程定义id * @return 是否删除成功 */ - boolean removeDef(List ids); + boolean removeDef(Collection ids); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java index 6e20abe3d..38b50e08e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java @@ -1,7 +1,7 @@ package org.dromara.workflow.service; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.warm.flow.orm.entity.FlowInstance; import org.dromara.workflow.domain.bo.FlowCancelBo; import org.dromara.workflow.domain.bo.FlowInstanceBo; @@ -9,6 +9,7 @@ import org.dromara.workflow.domain.bo.FlowInvalidBo; import org.dromara.workflow.domain.bo.FlowVariableBo; import org.dromara.workflow.domain.vo.FlowInstanceVo; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -67,7 +68,7 @@ public interface IFlwInstanceService { * @param instanceIds 实例id * @return 结果 */ - List selectInstListByIdList(List instanceIds); + List selectInstListByIdList(Collection instanceIds); /** * 按照业务id删除流程实例 @@ -83,7 +84,7 @@ public interface IFlwInstanceService { * @param instanceIds 实例id * @return 结果 */ - boolean deleteByInstanceIds(List instanceIds); + boolean deleteByInstanceIds(Collection instanceIds); /** * 按照实例id删除已完成得流程实例 @@ -91,7 +92,7 @@ public interface IFlwInstanceService { * @param instanceIds 删除的实例id * @return 删除结果 */ - boolean deleteHisByInstanceIds(List instanceIds); + boolean deleteHisByInstanceIds(Collection instanceIds); /** * 撤销流程 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java index 53bfec40e..3945ad9f4 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java @@ -1,9 +1,9 @@ package org.dromara.workflow.service; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.dto.TaskAssigneeDTO; import org.dromara.common.core.domain.model.TaskAssigneeBody; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.workflow.domain.bo.FlowSpelBo; import org.dromara.workflow.domain.vo.FlowSpelVo; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java index 55758874d..b5b1c4015 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java @@ -1,9 +1,9 @@ package org.dromara.workflow.service; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.dto.StartProcessReturnDTO; import org.dromara.common.core.domain.dto.UserDTO; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.warm.flow.core.entity.Node; import org.dromara.warm.flow.core.entity.Task; import org.dromara.warm.flow.orm.entity.FlowHisTask; @@ -13,6 +13,7 @@ import org.dromara.workflow.domain.bo.*; import org.dromara.workflow.domain.vo.FlowHisTaskVo; import org.dromara.workflow.domain.vo.FlowTaskVo; +import java.util.Collection; import java.util.List; /** @@ -98,7 +99,7 @@ public interface IFlwTaskService { * @param userId 用户id * @return 结果 */ - boolean updateAssignee(List taskIdList, String userId); + boolean updateAssignee(Collection taskIdList, String userId); /** * 驳回审批 @@ -111,8 +112,8 @@ public interface IFlwTaskService { /** * 获取可驳回的前置节点 * - * @param taskId 任务id - * @param nowNodeCode 当前节点 + * @param taskId 任务id + * @param nowNodeCode 当前节点 * @return 结果 */ List getBackTaskNode(Long taskId, String nowNodeCode); @@ -131,7 +132,7 @@ public interface IFlwTaskService { * @param taskIdList 任务id * @return 任务列表 */ - List selectByIdList(List taskIdList); + List selectByIdList(Collection taskIdList); /** * 按照任务id查询任务 @@ -171,7 +172,7 @@ public interface IFlwTaskService { * @param instanceIds 列表 * @return 任务列表 */ - List selectByInstIds(List instanceIds); + List selectByInstIds(Collection instanceIds); /** * 判断流程是否已结束（即该流程实例下是否还有未完成的任务） diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java index 7ed779a6b..a14634440 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java @@ -1,10 +1,11 @@ package org.dromara.workflow.service; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.workflow.domain.bo.TestLeaveBo; import org.dromara.workflow.domain.vo.TestLeaveVo; +import java.util.Collection; import java.util.List; /** @@ -70,5 +71,5 @@ public interface ITestLeaveService { * @param ids 主键集合 * @return 删除结果 */ - Boolean deleteWithValidByIds(List ids); + Boolean deleteWithValidByIds(Collection ids); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java index 47c4a1059..69ff0de74 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java @@ -10,12 +10,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.warm.flow.core.dto.DefJson; import org.dromara.warm.flow.core.enums.NodeType; import org.dromara.warm.flow.core.enums.PublishStatus; @@ -40,6 +40,7 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.List; /** @@ -184,7 +185,7 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { */ @Override @Transactional(rollbackFor = Exception.class) - public boolean removeDef(List ids) { + public boolean removeDef(Collection ids) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.in(FlowHisTask::getDefinitionId, ids); List flowHisTasks = flowHisTaskMapper.selectList(wrapper); @@ -197,7 +198,7 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { } } try { - defService.removeDef(ids); + defService.removeDef((List) ids); } catch (Exception e) { log.error("Error removing flow definitions: {}", e.getMessage(), e); throw new RuntimeException("Failed to remove flow definitions", e); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java index 1d5bf84e9..3a828fd69 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java @@ -11,12 +11,12 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.warm.flow.core.FlowEngine; import org.dromara.warm.flow.core.constant.ExceptionCons; @@ -206,7 +206,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { * @return 实例列表 */ @Override - public List selectInstListByIdList(List instanceIds) { + public List selectInstListByIdList(Collection instanceIds) { return flowInstanceMapper.selectByIds(instanceIds); } @@ -237,7 +237,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { */ @Override @Transactional(rollbackFor = Exception.class) - public boolean deleteByInstanceIds(List instanceIds) { + public boolean deleteByInstanceIds(Collection instanceIds) { // 获取实例信息 List flowInstances = flowInstanceMapper.selectByIds(instanceIds); if (CollUtil.isEmpty(flowInstances)) { @@ -247,7 +247,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { // 发送事件 processDeleteHandler(flowInstances); // 删除实例 - return insService.remove(instanceIds); + return insService.remove((List) instanceIds); } /** @@ -258,7 +258,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { */ @Override @Transactional(rollbackFor = Exception.class) - public boolean deleteHisByInstanceIds(List instanceIds) { + public boolean deleteHisByInstanceIds(Collection instanceIds) { // 获取实例信息 List flowInstances = flowInstanceMapper.selectByIds(instanceIds); if (CollUtil.isEmpty(flowInstances)) { @@ -271,8 +271,8 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { if (CollUtil.isNotEmpty(flowTaskList)) { FlowEngine.userService().deleteByTaskIds(StreamUtils.toList(flowTaskList, FlowTask::getId)); } - FlowEngine.taskService().deleteByInsIds(instanceIds); - FlowEngine.hisTaskService().deleteByInsIds(instanceIds); + FlowEngine.taskService().deleteByInsIds((List) instanceIds); + FlowEngine.hisTaskService().deleteByInsIds((List) instanceIds); FlowEngine.insService().removeByIds(instanceIds); return true; } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java index 99af8701c..dc6a14d78 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.dto.TaskAssigneeDTO; import org.dromara.common.core.domain.model.TaskAssigneeBody; import org.dromara.common.core.exception.ServiceException; @@ -15,7 +16,6 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.domain.FlowSpel; import org.dromara.workflow.domain.bo.FlowSpelBo; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index e6b6818a4..eb1e3db82 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.dto.StartProcessReturnDTO; import org.dromara.common.core.domain.dto.UserDTO; import org.dromara.common.core.enums.BusinessStatusEnum; @@ -23,7 +24,6 @@ import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.utils.IdGeneratorUtil; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.warm.flow.core.FlowEngine; @@ -589,7 +589,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { * @return 任务列表 */ @Override - public List selectByIdList(List taskIdList) { + public List selectByIdList(Collection taskIdList) { return flowTaskMapper.selectList(new LambdaQueryWrapper<>(FlowTask.class).in(FlowTask::getId, taskIdList)); } @@ -725,7 +725,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { * @return 运行中的任务列表 */ @Override - public List selectByInstIds(List instanceIds) { + public List selectByInstIds(Collection instanceIds) { return flowTaskMapper.selectList(new LambdaQueryWrapper<>(FlowTask.class).in(FlowTask::getInstanceId, instanceIds)); } @@ -843,7 +843,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { */ @Override @Transactional(rollbackFor = Exception.class) - public boolean updateAssignee(List taskIdList, String userId) { + public boolean updateAssignee(Collection taskIdList, String userId) { if (CollUtil.isEmpty(taskIdList)) { return false; } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java index ddb69007b..b52af410d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.dto.StartProcessDTO; import org.dromara.common.core.domain.event.ProcessDeleteEvent; import org.dromara.common.core.domain.event.ProcessEvent; @@ -22,7 +23,6 @@ import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.common.constant.FlowConstant; import org.dromara.workflow.domain.TestLeave; @@ -34,6 +34,7 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -198,7 +199,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService { */ @Override @Transactional(rollbackFor = Exception.class) - public Boolean deleteWithValidByIds(List ids) { + public Boolean deleteWithValidByIds(Collection ids) { workflowService.deleteInstance(StreamUtils.toList(ids, Convert::toStr)); return baseMapper.deleteByIds(ids) > 0; } From 96f2e8ac411487a7e4845e990cbe2bafbcb788f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Thu, 19 Mar 2026 09:40:38 +0800 Subject: [PATCH 05/13] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20sql=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/sql/oracle/oracle_ry_vue_5.X.sql | 4 ++-- script/sql/postgres/postgres_ry_vue_5.X.sql | 4 ++-- script/sql/sqlserver/sqlserver_ry_vue_5.X.sql | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/script/sql/oracle/oracle_ry_vue_5.X.sql b/script/sql/oracle/oracle_ry_vue_5.X.sql index 3ccd1273a..fcfa9c90d 100644 --- a/script/sql/oracle/oracle_ry_vue_5.X.sql +++ b/script/sql/oracle/oracle_ry_vue_5.X.sql @@ -1082,7 +1082,7 @@ create table sys_oss_config ( bucket_name varchar2(255) default '', prefix varchar2(255) default '', endpoint varchar2(255) default '', - domainUrl varchar2(255) default '', + domain_url varchar2(255) default '', is_https char(1) default 'N', region varchar2(255) default '', access_policy char(1) default '1' not null, @@ -1106,7 +1106,7 @@ comment on column sys_oss_config.secret_key is '秘钥'; comment on column sys_oss_config.bucket_name is '桶名称'; comment on column sys_oss_config.prefix is '前缀'; comment on column sys_oss_config.endpoint is '访问站点'; -comment on column sys_oss_config.domain is '自定义域名'; +comment on column sys_oss_config.domain_url is '自定义域名'; comment on column sys_oss_config.is_https is '是否https（Y=是,N=否）'; comment on column sys_oss_config.region is '域'; comment on column sys_oss_config.access_policy is '桶权限类型(0=private 1=public 2=custom)'; diff --git a/script/sql/postgres/postgres_ry_vue_5.X.sql b/script/sql/postgres/postgres_ry_vue_5.X.sql index 20b77db5a..e40fa17a5 100644 --- a/script/sql/postgres/postgres_ry_vue_5.X.sql +++ b/script/sql/postgres/postgres_ry_vue_5.X.sql @@ -1078,7 +1078,7 @@ create table if not exists sys_oss_config bucket_name varchar(255) default ''::varchar, prefix varchar(255) default ''::varchar, endpoint varchar(255) default ''::varchar, - domainUrl varchar(255) default ''::varchar, + domain_url varchar(255) default ''::varchar, is_https char default 'N'::bpchar, region varchar(255) default ''::varchar, access_policy char(1) default '1'::bpchar not null, @@ -1101,7 +1101,7 @@ comment on column sys_oss_config.secret_key is '秘钥'; comment on column sys_oss_config.bucket_name is '桶名称'; comment on column sys_oss_config.prefix is '前缀'; comment on column sys_oss_config.endpoint is '访问站点'; -comment on column sys_oss_config.domain is '自定义域名'; +comment on column sys_oss_config.domain_url is '自定义域名'; comment on column sys_oss_config.is_https is '是否https（Y=是,N=否）'; comment on column sys_oss_config.region is '域'; comment on column sys_oss_config.access_policy is '桶权限类型(0=private 1=public 2=custom)'; diff --git a/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql b/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql index 755404e4e..080451221 100644 --- a/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql +++ b/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql @@ -2424,7 +2424,7 @@ EXEC sys.sp_addextendedproperty 'MS_Description', N'手机号码' , 'SCHEMA', N'dbo', 'TABLE', N'sys_user', - 'COLUMN', N'phoneNumber' + 'COLUMN', N'phone_number' GO EXEC sys.sp_addextendedproperty 'MS_Description', N'用户性别（0男 1女 2未知）' , @@ -2693,7 +2693,7 @@ CREATE TABLE sys_oss_config bucket_name nvarchar(255) DEFAULT '' NULL, prefix nvarchar(255) DEFAULT '' NULL, endpoint nvarchar(255) DEFAULT '' NULL, - domainUrl nvarchar(255) DEFAULT '' NULL, + domain_url nvarchar(255) DEFAULT '' NULL, is_https nchar(1) DEFAULT ('N') NULL, region nvarchar(255) DEFAULT '' NULL, access_policy nchar(1) DEFAULT ('1') NOT NULL, @@ -2758,7 +2758,7 @@ EXEC sp_addextendedproperty 'MS_Description', N'自定义域名', 'SCHEMA', N'dbo', 'TABLE', N'sys_oss_config', - 'COLUMN', N'domain' + 'COLUMN', N'domain_url' GO EXEC sp_addextendedproperty 'MS_Description', N'是否https（Y=是,N=否）', From de5aa32e1dd1a23b6674679d472adc9fbc018172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Thu, 19 Mar 2026 09:42:36 +0800 Subject: [PATCH 06/13] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/PageResult.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java index 9791425df..a89a755ea 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java @@ -5,7 +5,7 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; -import java.util.List; +import java.util.Collection; /** * 表格分页数据对象 @@ -27,12 +27,23 @@ public class PageResult implements Serializable { /** * 列表数据 */ - private List rows; + private Collection rows; + + /** + * 分页 + * + * @param list 列表数据 + * @param total 总记录数 + */ + public PageResult(Collection list, long total) { + this.rows = list; + this.total = total; + } /** * 根据分页对象构建表格分页数据对象 */ - public static PageResult build(List list, long total) { + public static PageResult build(Collection list, long total) { PageResult rspData = new PageResult<>(); rspData.setRows(list); rspData.setTotal(total); @@ -42,7 +53,7 @@ public class PageResult implements Serializable { /** * 根据数据列表构建表格分页数据对象 */ - public static PageResult build(List list) { + public static PageResult build(Collection list) { PageResult rspData = new PageResult<>(); rspData.setRows(list); rspData.setTotal(list.size()); From b8b75e087e5010a23f553ba59bdb1ad407a78e0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Thu, 19 Mar 2026 09:44:57 +0800 Subject: [PATCH 07/13] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/common/core/domain/dto/TaskAssigneeDTO.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java index d3b4dac55..05d15c9df 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java @@ -6,6 +6,7 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; +import java.util.Collection; import java.util.Date; import java.util.List; import java.util.function.Function; @@ -42,7 +43,7 @@ public class TaskAssigneeDTO implements Serializable { * 将源列表转换为 TaskHandler 列表 * * @param 通用类型 - * @param sourceList 待转换的源列表 + * @param sourceCollection 待转换的源列表 * @param storageId 提取 storageId 的函数 * @param handlerCode 提取 handlerCode 的函数 * @param handlerName 提取 handlerName 的函数 @@ -51,13 +52,13 @@ public class TaskAssigneeDTO implements Serializable { * @return 转换后的 TaskHandler 列表 */ public static List convertToHandlerList( - List sourceList, + Collection sourceCollection, Function storageId, Function handlerCode, Function handlerName, Function groupName, Function createTimeMapper) { - return sourceList.stream() + return sourceCollection.stream() .map(item -> new TaskHandler( storageId.apply(item), handlerCode.apply(item), From 269de03d0b497c4b4d8a34f3952d014b6b54fe35 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Thu, 19 Mar 2026 10:26:28 +0800 Subject: [PATCH 08/13] =?UTF-8?q?add=20=E5=A2=9E=E5=8A=A0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=AE=9E=E4=BE=8B=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlwInstanceController.java | 16 +++++++++++++++- script/sql/oracle/oracle_ry_workflow.sql | 11 +++++++++-- script/sql/postgres/postgres_ry_workflow.sql | 11 +++++++++-- script/sql/ry_workflow.sql | 11 +++++++++-- script/sql/sqlserver/sqlserver_ry_workflow.sql | 16 ++++++++++++++-- 5 files changed, 56 insertions(+), 9 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java index a8a5fc604..c1833e0b2 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java @@ -1,5 +1,6 @@ package org.dromara.workflow.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; @@ -46,6 +47,7 @@ public class FlwInstanceController extends BaseController { * @param pageQuery 分页 */ @GetMapping("/pageByRunning") + @SaCheckPermission("workflow:instance:list") public TableDataInfo selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { return flwInstanceService.selectRunningInstanceList(flowInstanceBo, pageQuery); } @@ -57,6 +59,7 @@ public class FlwInstanceController extends BaseController { * @param pageQuery 分页 */ @GetMapping("/pageByFinish") + @SaCheckPermission("workflow:instance:list") public TableDataInfo selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { return flwInstanceService.selectFinishInstanceList(flowInstanceBo, pageQuery); } @@ -67,6 +70,7 @@ public class FlwInstanceController extends BaseController { * @param businessId 业务id */ @GetMapping("/getInfo/{businessId}") + @SaCheckPermission("workflow:instance:query") public R getInfo(@PathVariable Long businessId) { return R.ok(flwInstanceService.queryByBusinessId(businessId)); } @@ -78,6 +82,7 @@ public class FlwInstanceController extends BaseController { */ @DeleteMapping("/deleteByBusinessIds/{businessIds}") @Log(title = "流程实例管理", businessType = BusinessType.DELETE) + @SaCheckPermission("workflow:instance:remove") public R deleteByBusinessIds(@PathVariable List businessIds) { return toAjax(flwInstanceService.deleteByBusinessIds(StreamUtils.toList(businessIds, Convert::toStr))); } @@ -89,6 +94,7 @@ public class FlwInstanceController extends BaseController { */ @DeleteMapping("/deleteByInstanceIds/{instanceIds}") @Log(title = "流程实例管理", businessType = BusinessType.DELETE) + @SaCheckPermission("workflow:instance:remove") public R deleteByInstanceIds(@PathVariable List instanceIds) { return toAjax(flwInstanceService.deleteByInstanceIds(instanceIds)); } @@ -100,6 +106,7 @@ public class FlwInstanceController extends BaseController { */ @DeleteMapping("/deleteHisByInstanceIds/{instanceIds}") @Log(title = "流程实例管理", businessType = BusinessType.DELETE) + @SaCheckPermission("workflow:instance:remove") public R deleteHisByInstanceIds(@PathVariable List instanceIds) { return toAjax(flwInstanceService.deleteHisByInstanceIds(instanceIds)); } @@ -112,6 +119,7 @@ public class FlwInstanceController extends BaseController { @RepeatSubmit() @PutMapping("/cancelProcessApply") @Log(title = "流程实例管理", businessType = BusinessType.UPDATE) + @SaCheckPermission("workflow:instance:cancel") public R cancelProcessApply(@RequestBody FlowCancelBo bo) { return toAjax(flwInstanceService.cancelProcessApply(bo)); } @@ -125,6 +133,7 @@ public class FlwInstanceController extends BaseController { @RepeatSubmit() @PutMapping("/active/{id}") @Log(title = "流程实例管理", businessType = BusinessType.UPDATE) + @SaCheckPermission("workflow:instance:active") public R active(@PathVariable Long id, @RequestParam boolean active) { return R.ok(active ? insService.active(id) : insService.unActive(id)); } @@ -136,6 +145,7 @@ public class FlwInstanceController extends BaseController { * @param pageQuery 分页 */ @GetMapping("/pageByCurrent") + @SaCheckPermission("workflow:instance:currentList") public TableDataInfo selectCurrentInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { return flwInstanceService.selectCurrentInstanceList(flowInstanceBo, pageQuery); } @@ -146,7 +156,8 @@ public class FlwInstanceController extends BaseController { * @param businessId 业务id */ @GetMapping("/flowHisTaskList/{businessId}") - public R> flowHisTaskList(@PathVariable String businessId) { + @SaCheckPermission("workflow:instance:query") + public R> flowHisTaskList(@PathVariable String businessId) { return R.ok(flwInstanceService.flowHisTaskList(businessId)); } @@ -156,6 +167,7 @@ public class FlwInstanceController extends BaseController { * @param instanceId 流程实例id */ @GetMapping("/instanceVariable/{instanceId}") + @SaCheckPermission("workflow:instance:variableQuery") public R> instanceVariable(@PathVariable Long instanceId) { return R.ok(flwInstanceService.instanceVariable(instanceId)); } @@ -168,6 +180,7 @@ public class FlwInstanceController extends BaseController { @RepeatSubmit() @PutMapping("/updateVariable") @Log(title = "流程实例管理", businessType = BusinessType.UPDATE) + @SaCheckPermission("workflow:instance:variable") public R updateVariable(@Validated @RequestBody FlowVariableBo bo) { return toAjax(flwInstanceService.updateVariable(bo)); } @@ -180,6 +193,7 @@ public class FlwInstanceController extends BaseController { @Log(title = "流程实例管理", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/invalid") + @SaCheckPermission("workflow:instance:invalid") public R invalid(@Validated @RequestBody FlowInvalidBo bo) { return R.ok(flwInstanceService.processInvalid(bo)); } diff --git a/script/sql/oracle/oracle_ry_workflow.sql b/script/sql/oracle/oracle_ry_workflow.sql index df1d03dc1..93f838e9f 100644 --- a/script/sql/oracle/oracle_ry_workflow.sql +++ b/script/sql/oracle/oracle_ry_workflow.sql @@ -474,9 +474,9 @@ INSERT INTO sys_menu VALUES ('11619', '我的待办', '11618', '2', 'taskWaiting INSERT INTO sys_menu VALUES ('11632', '我的已办', '11618', '3', 'taskFinish', 'workflow/task/taskFinish', '', '1', '1', 'C', '0', '0', '', 'finish', 103, 1, SYSDATE, NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11633', '我的抄送', '11618', '4', 'taskCopyList', 'workflow/task/taskCopyList', '', '1', '1', 'C', '0', '0', '', 'my-copy', 103, 1, SYSDATE, NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11620', '流程定义', '11616', '3', 'processDefinition', 'workflow/processDefinition/index', '', '1', '1', 'C', '0', '0', 'workflow:definition:list', 'process-definition', 103, 1, SYSDATE, NULL, NULL, ''); -INSERT INTO sys_menu VALUES ('11621', '流程实例', '11630', '1', 'processInstance', 'workflow/processInstance/index', '', '1', '1', 'C', '0', '0', '', 'tree-table', 103, 1, SYSDATE, NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11621', '流程实例', '11630', '1', 'processInstance', 'workflow/processInstance/index', '', '1', '1', 'C', '0', '0', 'workflow:instance:list', 'tree-table', 103, 1, SYSDATE, NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11622', '流程分类', '11616', '1', 'category', 'workflow/category/index', '', '1', '0', 'C', '0', '0', 'workflow:category:list', 'category', 103, 1, SYSDATE, NULL, NULL, ''); -INSERT INTO sys_menu VALUES ('11629', '我发起的', '11618', '1', 'myDocument', 'workflow/task/myDocument', '', '1', '1', 'C', '0', '0', '', 'guide', 103, 1, SYSDATE, NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11629', '我发起的', '11618', '1', 'myDocument', 'workflow/task/myDocument', '', '1', '1', 'C', '0', '0', 'workflow:instance:currentList', 'guide', 103, 1, SYSDATE, NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11630', '流程监控', '11616', '4', 'processMonitor', '', '', '1', '0', 'M', '0', '0', '', 'monitor', 103, 1, SYSDATE, NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11631', '待办任务', '11630', '2', 'allTaskWaiting', 'workflow/task/allTaskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, SYSDATE, NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11700', '流程设计', '11616', '5', 'design/index', 'workflow/processDefinition/design', '', '1', '1', 'C', '1', '0', 'workflow:leave:edit', '#', 103, 1, SYSDATE, NULL, NULL, '/workflow/processDefinition'); @@ -488,6 +488,13 @@ INSERT INTO sys_menu VALUES ('11625', '流程分类修改', '11622', '3', '#', ' INSERT INTO sys_menu VALUES ('11626', '流程分类删除', '11622', '4', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:remove', '#', 103, 1, SYSDATE, NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11627', '流程分类导出', '11622', '5', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:export', '#', 103, 1, SYSDATE, NULL, NULL, ''); +-- 流程实例管理相关按钮 +INSERT INTO sys_menu VALUES ('11653', '流程实例查询', '11621', '1', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:query', '#', 103, 1, SYSDATE, NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11654', '流程变量查询', '11621', '2', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:variable', '#', 103, 1, SYSDATE, NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11655', '流程变量修改', '11621', '3', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:variable', '#', 103, 1, SYSDATE, NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11656', '流程实例激活/挂起', '11621', '4', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:active', '#', 103, 1, SYSDATE, NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11657', '流程实例删除', '11621', '5', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:remove', '#', 103, 1, SYSDATE, NULL, NULL, ''); + -- 流程定义管理相关按钮 INSERT INTO sys_menu VALUES ('11644', '流程定义查询', '11620', '1', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:query', '#', 103, 1, SYSDATE, NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11645', '流程定义新增', '11620', '2', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:add', '#', 103, 1, SYSDATE, NULL, NULL, ''); diff --git a/script/sql/postgres/postgres_ry_workflow.sql b/script/sql/postgres/postgres_ry_workflow.sql index b93705189..e2848ff46 100644 --- a/script/sql/postgres/postgres_ry_workflow.sql +++ b/script/sql/postgres/postgres_ry_workflow.sql @@ -452,9 +452,9 @@ INSERT INTO sys_menu VALUES ('11619', '我的待办', '11618', '2', 'taskWaiting INSERT INTO sys_menu VALUES ('11632', '我的已办', '11618', '3', 'taskFinish', 'workflow/task/taskFinish', '', '1', '1', 'C', '0', '0', '', 'finish', 103, 1, now(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11633', '我的抄送', '11618', '4', 'taskCopyList', 'workflow/task/taskCopyList', '', '1', '1', 'C', '0', '0', '', 'my-copy', 103, 1, now(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11620', '流程定义', '11616', '3', 'processDefinition', 'workflow/processDefinition/index', '', '1', '1', 'C', '0', '0', 'workflow:definition:list', 'process-definition', 103, 1, now(), NULL, NULL, ''); -INSERT INTO sys_menu VALUES ('11621', '流程实例', '11630', '1', 'processInstance', 'workflow/processInstance/index', '', '1', '1', 'C', '0', '0', '', 'tree-table', 103, 1, now(), NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11621', '流程实例', '11630', '1', 'processInstance', 'workflow/processInstance/index', '', '1', '1', 'C', '0', '0', 'workflow:instance:list', 'tree-table', 103, 1, now(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11622', '流程分类', '11616', '1', 'category', 'workflow/category/index', '', '1', '0', 'C', '0', '0', 'workflow:category:list', 'category', 103, 1, now(), NULL, NULL, ''); -INSERT INTO sys_menu VALUES ('11629', '我发起的', '11618', '1', 'myDocument', 'workflow/task/myDocument', '', '1', '1', 'C', '0', '0', '', 'guide', 103, 1, now(), NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11629', '我发起的', '11618', '1', 'myDocument', 'workflow/task/myDocument', '', '1', '1', 'C', '0', '0', 'workflow:instance:currentList', 'guide', 103, 1, now(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11630', '流程监控', '11616', '4', 'processMonitor', '', '', '1', '0', 'M', '0', '0', '', 'monitor', 103, 1, now(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11631', '待办任务', '11630', '2', 'allTaskWaiting', 'workflow/task/allTaskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, now(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11700', '流程设计', '11616', '5', 'design/index', 'workflow/processDefinition/design', '', '1', '1', 'C', '1', '0', 'workflow:leave:edit', '#', 103, 1, now(), NULL, NULL, '/workflow/processDefinition'); @@ -466,6 +466,13 @@ INSERT INTO sys_menu VALUES ('11625', '流程分类修改', '11622', '3', '#', ' INSERT INTO sys_menu VALUES ('11626', '流程分类删除', '11622', '4', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:remove', '#', 103, 1, now(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11627', '流程分类导出', '11622', '5', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:export', '#', 103, 1, now(), NULL, NULL, ''); +-- 流程实例管理相关按钮 +INSERT INTO sys_menu VALUES ('11653', '流程实例查询', '11621', '1', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:query', '#', 103, 1, now(), NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11654', '流程变量查询', '11621', '2', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:variable', '#', 103, 1, now(), NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11655', '流程变量修改', '11621', '3', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:variable', '#', 103, 1, now(), NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11656', '流程实例激活/挂起', '11621', '4', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:active', '#', 103, 1, now(), NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11657', '流程实例删除', '11621', '5', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:remove', '#', 103, 1, now(), NULL, NULL, ''); + -- 流程定义管理相关按钮 INSERT INTO sys_menu VALUES ('11644', '流程定义查询', '11620', '1', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:query', '#', 103, 1, now(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11645', '流程定义新增', '11620', '2', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:add', '#', 103, 1, now(), NULL, NULL, ''); diff --git a/script/sql/ry_workflow.sql b/script/sql/ry_workflow.sql index af00128f1..d03626c28 100644 --- a/script/sql/ry_workflow.sql +++ b/script/sql/ry_workflow.sql @@ -264,10 +264,10 @@ insert into sys_menu values ('11619', '我的待办', '11618', '2', 'taskWaiting insert into sys_menu values ('11632', '我的已办', '11618', '3', 'taskFinish', 'workflow/task/taskFinish', '', '1', '1', 'C', '0', '0', '', 'finish', 103, 1, sysdate(), NULL, NULL, ''); insert into sys_menu values ('11633', '我的抄送', '11618', '4', 'taskCopyList', 'workflow/task/taskCopyList', '', '1', '1', 'C', '0', '0', '', 'my-copy', 103, 1, sysdate(), NULL, NULL, ''); insert into sys_menu values ('11620', '流程定义', '11616', '3', 'processDefinition', 'workflow/processDefinition/index', '', '1', '1', 'C', '0', '0', 'workflow:definition:list', 'process-definition', 103, 1, sysdate(), NULL, NULL, ''); -insert into sys_menu values ('11621', '流程实例', '11630', '1', 'processInstance', 'workflow/processInstance/index', '', '1', '1', 'C', '0', '0', '', 'tree-table', 103, 1, sysdate(), NULL, NULL, ''); +insert into sys_menu values ('11621', '流程实例', '11630', '1', 'processInstance', 'workflow/processInstance/index', '', '1', '1', 'C', '0', '0', 'workflow:instance:list', 'tree-table', 103, 1, sysdate(), NULL, NULL, ''); insert into sys_menu values ('11622', '流程分类', '11616', '1', 'category', 'workflow/category/index', '', '1', '0', 'C', '0', '0', 'workflow:category:list', 'category', 103, 1, sysdate(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11801', '流程表达式', '11616', '2', 'spel', 'workflow/spel/index', '', 1, 0, 'C', '0', '0', 'workflow:spel:list', 'input', 103, 1, sysdate(), 1, sysdate(), '流程达式定义菜单'); -insert into sys_menu values ('11629', '我发起的', '11618', '1', 'myDocument', 'workflow/task/myDocument', '', '1', '1', 'C', '0', '0', '', 'guide', 103, 1, sysdate(), NULL, NULL, ''); +insert into sys_menu values ('11629', '我发起的', '11618', '1', 'myDocument', 'workflow/task/myDocument', '', '1', '1', 'C', '0', '0', 'workflow:instance:currentList', 'guide', 103, 1, sysdate(), NULL, NULL, ''); insert into sys_menu values ('11630', '流程监控', '11616', '4', 'processMonitor', '', '', '1', '0', 'M', '0', '0', '', 'monitor', 103, 1, sysdate(), NULL, NULL, ''); insert into sys_menu values ('11631', '待办任务', '11630', '2', 'allTaskWaiting', 'workflow/task/allTaskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, sysdate(), NULL, NULL, ''); insert into sys_menu values ('11700', '流程设计', '11616', '5', 'design/index', 'workflow/processDefinition/design', '', 1, 1, 'C', '1', '0', 'workflow:leave:edit', '#', 103, 1, sysdate(), null, null, '/workflow/processDefinition'); @@ -279,6 +279,13 @@ insert into sys_menu values ('11625', '流程分类修改', '11622', '3', '#', ' insert into sys_menu values ('11626', '流程分类删除', '11622', '4', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:remove', '#', 103,1, sysdate(), null, null, ''); insert into sys_menu values ('11627', '流程分类导出', '11622', '5', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:export', '#', 103,1, sysdate(), null, null, ''); +-- 流程实例管理相关按钮 +insert into sys_menu values ('11653', '流程实例查询', '11621', '1', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:instance:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values ('11654', '流程变量查询', '11621', '2', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:instance:variableQuery', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values ('11655', '流程变量修改', '11621', '3', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:instance:variable', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values ('11656', '流程实例激活/挂起', '11621', '4', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:instance:active', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values ('11657', '流程实例删除', '11621', '5', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:instance:remove', '#', 103, 1, sysdate(), null, null, ''); + -- 流程定义管理相关按钮 insert into sys_menu values ('11644', '流程定义查询', '11620', '1', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:definition:query', '#', 103, 1, sysdate(), null, null, ''); insert into sys_menu values ('11645', '流程定义新增', '11620', '2', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:definition:add', '#', 103, 1, sysdate(), null, null, ''); diff --git a/script/sql/sqlserver/sqlserver_ry_workflow.sql b/script/sql/sqlserver/sqlserver_ry_workflow.sql index 7a9e42bed..19081b40f 100644 --- a/script/sql/sqlserver/sqlserver_ry_workflow.sql +++ b/script/sql/sqlserver/sqlserver_ry_workflow.sql @@ -1573,11 +1573,11 @@ INSERT sys_menu VALUES (11633, N'我的抄送', 11618, 4, N'taskCopyList', N'wor GO INSERT sys_menu VALUES (11620, N'流程定义', 11616, 3, N'processDefinition', N'workflow/processDefinition/index', N'', 1, 1, N'C', N'0', N'0', N'', N'process-definition', 103, 1, GETDATE(), NULL, NULL, N''); GO -INSERT sys_menu VALUES (11621, N'流程实例', 11630, 1, N'processInstance', N'workflow/processInstance/index', N'', 1, 1, N'C', N'0', N'0', N'', N'tree-table', 103, 1, GETDATE(), NULL, NULL, N''); +INSERT sys_menu VALUES (11621, N'流程实例', 11630, 1, N'processInstance', N'workflow/processInstance/index', N'', 1, 1, N'C', N'0', N'0', N'workflow:instance:list', N'tree-table', 103, 1, GETDATE(), NULL, NULL, N''); GO INSERT sys_menu VALUES (11622, N'流程分类', 11616, 1, N'category', N'workflow/category/index', N'', 1, 0, N'C', N'0', N'0', N'workflow:category:list', N'category', 103, 1, GETDATE(), NULL, NULL, N''); GO -INSERT sys_menu VALUES (11629, N'我发起的', 11618, 1, N'myDocument', N'workflow/task/myDocument', N'', 1, 1, N'C', N'0', N'0', N'', N'guide', 103, 1, GETDATE(), NULL, NULL, N''); +INSERT sys_menu VALUES (11629, N'我发起的', 11618, 1, N'myDocument', N'workflow/task/myDocument', N'', 1, 1, N'C', N'0', N'0', N'workflow:instance:currentList', N'guide', 103, 1, GETDATE(), NULL, NULL, N''); GO INSERT sys_menu VALUES (11630, N'流程监控', 11616, 4, N'processMonitor', NULL, N'', 1, 0, N'M', N'0', N'0', N'', N'monitor', 103, 1, GETDATE(), NULL, NULL, N''); GO @@ -1600,6 +1600,18 @@ GO INSERT sys_menu VALUES (11627, N'流程分类导出', 11622, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:category:export', N'#', 103, 1, GETDATE(), NULL, NULL, N''); GO +-- 流程实例管理相关按钮 +INSERT sys_menu VALUES (11653, N'流程实例查询', 11621, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:instance:query', N'#', 103, 1, GETDATE(), NULL, NULL, N''); +GO +INSERT sys_menu VALUES (11654, N'流程变量查询', 11621, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:instance:variable', N'#', 103, 1, GETDATE(), NULL, NULL, N''); +GO +INSERT sys_menu VALUES (11655, N'流程变量修改', 11621, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:instance:variable', N'#', 103, 1, GETDATE(), NULL, NULL, N''); +GO +INSERT sys_menu VALUES (11656, N'流程实例激活/挂起', 11621, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:instance:active', N'#', 103, 1, GETDATE(), NULL, NULL, N''); +GO +INSERT sys_menu VALUES (11657, N'流程实例删除', 11621, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:instance:remove', N'#', 103, 1, GETDATE(), NULL, NULL, N''); +GO + INSERT sys_menu VALUES (11801, N'流程表达式', N'11616', 2, N'spel', N'workflow/spel/index', N'', 1, 0, N'C', N'0', N'0', N'workflow:spel:list', N'input', 103, 1, GETDATE(), 1, GETDATE(), N'流程达式定义菜单'); GO INSERT sys_menu VALUES (11802, N'流程spel表达式定义查询', N'11801', 1, N'#', N'', NULL, 1, 0, N'F', N'0', N'0', N'workflow:spel:query', N'#', 103, 1, GETDATE(), NULL, NULL, N''); From e1a8eea3a11fa567ce4c0a610fe62bf4a6ebf07f Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Thu, 19 Mar 2026 10:28:43 +0800 Subject: [PATCH 09/13] =?UTF-8?q?add=20=E5=A2=9E=E5=8A=A0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=AE=9E=E4=BE=8B=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/workflow/controller/FlwInstanceController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java index c1833e0b2..c93a40c37 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java @@ -157,7 +157,7 @@ public class FlwInstanceController extends BaseController { */ @GetMapping("/flowHisTaskList/{businessId}") @SaCheckPermission("workflow:instance:query") - public R> flowHisTaskList(@PathVariable String businessId) { + public R> flowHisTaskList(@PathVariable String businessId) { return R.ok(flwInstanceService.flowHisTaskList(businessId)); } From f551cd938c20fe435683a7492e73557872306f38 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Thu, 19 Mar 2026 10:34:26 +0800 Subject: [PATCH 10/13] =?UTF-8?q?add=20=E5=A2=9E=E5=8A=A0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=AE=9E=E4=BE=8B=E6=9D=83=E9=99=90=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/sql/oracle/oracle_ry_workflow.sql | 4 +++- script/sql/postgres/postgres_ry_workflow.sql | 4 +++- script/sql/ry_workflow.sql | 2 ++ script/sql/sqlserver/sqlserver_ry_workflow.sql | 6 +++++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/script/sql/oracle/oracle_ry_workflow.sql b/script/sql/oracle/oracle_ry_workflow.sql index 93f838e9f..3e994f3e6 100644 --- a/script/sql/oracle/oracle_ry_workflow.sql +++ b/script/sql/oracle/oracle_ry_workflow.sql @@ -490,10 +490,12 @@ INSERT INTO sys_menu VALUES ('11627', '流程分类导出', '11622', '5', '#', ' -- 流程实例管理相关按钮 INSERT INTO sys_menu VALUES ('11653', '流程实例查询', '11621', '1', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:query', '#', 103, 1, SYSDATE, NULL, NULL, ''); -INSERT INTO sys_menu VALUES ('11654', '流程变量查询', '11621', '2', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:variable', '#', 103, 1, SYSDATE, NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11654', '流程变量查询', '11621', '2', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:variableQuery', '#', 103, 1, SYSDATE, NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11655', '流程变量修改', '11621', '3', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:variable', '#', 103, 1, SYSDATE, NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11656', '流程实例激活/挂起', '11621', '4', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:active', '#', 103, 1, SYSDATE, NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11657', '流程实例删除', '11621', '5', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:remove', '#', 103, 1, SYSDATE, NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11658', '流程实例作废', '11621', '6', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:invalid', '#', 103, 1, SYSDATE, NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11659', '流程实例撤销', '11621', '7', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:cancel', '#', 103, 1, SYSDATE, NULL, NULL, ''); -- 流程定义管理相关按钮 INSERT INTO sys_menu VALUES ('11644', '流程定义查询', '11620', '1', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:query', '#', 103, 1, SYSDATE, NULL, NULL, ''); diff --git a/script/sql/postgres/postgres_ry_workflow.sql b/script/sql/postgres/postgres_ry_workflow.sql index e2848ff46..380569dd7 100644 --- a/script/sql/postgres/postgres_ry_workflow.sql +++ b/script/sql/postgres/postgres_ry_workflow.sql @@ -468,10 +468,12 @@ INSERT INTO sys_menu VALUES ('11627', '流程分类导出', '11622', '5', '#', ' -- 流程实例管理相关按钮 INSERT INTO sys_menu VALUES ('11653', '流程实例查询', '11621', '1', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:query', '#', 103, 1, now(), NULL, NULL, ''); -INSERT INTO sys_menu VALUES ('11654', '流程变量查询', '11621', '2', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:variable', '#', 103, 1, now(), NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11654', '流程变量查询', '11621', '2', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:variableQuery', '#', 103, 1, now(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11655', '流程变量修改', '11621', '3', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:variable', '#', 103, 1, now(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11656', '流程实例激活/挂起', '11621', '4', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:active', '#', 103, 1, now(), NULL, NULL, ''); INSERT INTO sys_menu VALUES ('11657', '流程实例删除', '11621', '5', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:remove', '#', 103, 1, now(), NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11658', '流程实例作废', '11621', '6', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:invalid', '#', 103, 1, now(), NULL, NULL, ''); +INSERT INTO sys_menu VALUES ('11659', '流程实例撤销', '11621', '7', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:instance:cancel', '#', 103, 1, now(), NULL, NULL, ''); -- 流程定义管理相关按钮 INSERT INTO sys_menu VALUES ('11644', '流程定义查询', '11620', '1', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:definition:query', '#', 103, 1, now(), NULL, NULL, ''); diff --git a/script/sql/ry_workflow.sql b/script/sql/ry_workflow.sql index d03626c28..f8b37ecc5 100644 --- a/script/sql/ry_workflow.sql +++ b/script/sql/ry_workflow.sql @@ -285,6 +285,8 @@ insert into sys_menu values ('11654', '流程变量查询', '11621', '2', '#', ' insert into sys_menu values ('11655', '流程变量修改', '11621', '3', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:instance:variable', '#', 103, 1, sysdate(), null, null, ''); insert into sys_menu values ('11656', '流程实例激活/挂起', '11621', '4', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:instance:active', '#', 103, 1, sysdate(), null, null, ''); insert into sys_menu values ('11657', '流程实例删除', '11621', '5', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:instance:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values ('11658', '流程实例作废', '11621', '6', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:instance:invalid', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values ('11659', '流程实例撤销', '11621', '7', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:instance:cancel', '#', 103, 1, sysdate(), null, null, ''); -- 流程定义管理相关按钮 insert into sys_menu values ('11644', '流程定义查询', '11620', '1', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:definition:query', '#', 103, 1, sysdate(), null, null, ''); diff --git a/script/sql/sqlserver/sqlserver_ry_workflow.sql b/script/sql/sqlserver/sqlserver_ry_workflow.sql index 19081b40f..ddbf32144 100644 --- a/script/sql/sqlserver/sqlserver_ry_workflow.sql +++ b/script/sql/sqlserver/sqlserver_ry_workflow.sql @@ -1603,7 +1603,7 @@ GO -- 流程实例管理相关按钮 INSERT sys_menu VALUES (11653, N'流程实例查询', 11621, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:instance:query', N'#', 103, 1, GETDATE(), NULL, NULL, N''); GO -INSERT sys_menu VALUES (11654, N'流程变量查询', 11621, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:instance:variable', N'#', 103, 1, GETDATE(), NULL, NULL, N''); +INSERT sys_menu VALUES (11654, N'流程变量查询', 11621, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:instance:variableQuery', N'#', 103, 1, GETDATE(), NULL, NULL, N''); GO INSERT sys_menu VALUES (11655, N'流程变量修改', 11621, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:instance:variable', N'#', 103, 1, GETDATE(), NULL, NULL, N''); GO @@ -1611,6 +1611,10 @@ INSERT sys_menu VALUES (11656, N'流程实例激活/挂起', 11621, 4, N'#', N'' GO INSERT sys_menu VALUES (11657, N'流程实例删除', 11621, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:instance:remove', N'#', 103, 1, GETDATE(), NULL, NULL, N''); GO +INSERT sys_menu VALUES (11658, N'流程实例作废', 11621, 6, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:instance:invalid', N'#', 103, 1, GETDATE(), NULL, NULL, N''); +GO +INSERT sys_menu VALUES (11659, N'流程实例撤销', 11621, 7, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:instance:cancel', N'#', 103, 1, GETDATE(), NULL, NULL, N''); +GO INSERT sys_menu VALUES (11801, N'流程表达式', N'11616', 2, N'spel', N'workflow/spel/index', N'', 1, 0, N'C', N'0', N'0', N'workflow:spel:list', N'input', 103, 1, GETDATE(), 1, GETDATE(), N'流程达式定义菜单'); GO From 12bcc68b45b15e7301d8fdf5fb9308919b9cfb64 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Thu, 19 Mar 2026 10:51:05 +0800 Subject: [PATCH 11/13] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=92=A4=E9=94=80=E5=A6=82=E6=9E=9C=E9=9D=9E=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E4=BA=BA=E6=88=96=E7=AE=A1=E7=90=86=E5=91=98=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=92=A4=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/service/impl/FlwInstanceServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java index b64f6ab92..48147364a 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java @@ -289,8 +289,11 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { if (definition == null) { throw new ServiceException(ExceptionCons.NOT_FOUNT_DEF); } - String message = bo.getMessage(); String userIdStr = LoginHelper.getUserIdStr(); + if (!LoginHelper.isSuperAdmin() && !instance.getCreateBy().equals(userIdStr)) { + throw new ServiceException("权限不足，无法撤销流程!"); + } + String message = bo.getMessage(); BusinessStatusEnum.checkCancelStatus(instance.getFlowStatus()); FlowParams flowParams = FlowParams.build() .message(message) From a9f25e713960b7ae39a0489dd8a319cf6ae1a16c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Thu, 19 Mar 2026 13:38:25 +0800 Subject: [PATCH 12/13] =?UTF-8?q?update=20=E8=A1=A5=E5=85=A8=E7=BC=BA?= =?UTF-8?q?=E5=A4=B1sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sql/sqlserver/sqlserver_ry_workflow.sql | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/script/sql/sqlserver/sqlserver_ry_workflow.sql b/script/sql/sqlserver/sqlserver_ry_workflow.sql index 6a46276df..2ffe64958 100644 --- a/script/sql/sqlserver/sqlserver_ry_workflow.sql +++ b/script/sql/sqlserver/sqlserver_ry_workflow.sql @@ -1616,6 +1616,26 @@ GO INSERT sys_menu VALUES (11659, N'流程实例撤销', 11621, 7, N'#', N'', N'', N'N', N'Y', N'F', N'0', N'0', N'workflow:instance:cancel', N'#', 103, 1, GETDATE(), NULL, NULL, N''); GO +-- 流程定义管理相关按钮 +INSERT sys_menu VALUES (11644, N'流程定义查询', 11620, 1, N'#', N'', N'', N'N', N'Y', N'F', N'0', N'0', N'workflow:definition:query', N'#', 103, 1, GETDATE(), NULL, NULL, N''); +GO +INSERT sys_menu VALUES (11645, N'流程定义新增', 11620, 2, N'#', N'', N'', N'N', N'Y', N'F', N'0', N'0', N'workflow:definition:add', N'#', 103, 1, GETDATE(), NULL, NULL, N''); +GO +INSERT sys_menu VALUES (11646, N'流程定义修改', 11620, 3, N'#', N'', N'', N'N', N'Y', N'F', N'0', N'0', N'workflow:definition:edit', N'#', 103, 1, GETDATE(), NULL, NULL, N''); +GO +INSERT sys_menu VALUES (11647, N'流程定义删除', 11620, 4, N'#', N'', N'', N'N', N'Y', N'F', N'0', N'0', N'workflow:definition:remove', N'#', 103, 1, GETDATE(), NULL, NULL, N''); +GO +INSERT sys_menu VALUES (11648, N'流程定义导出', 11620, 5, N'#', N'', N'', N'N', N'Y', N'F', N'0', N'0', N'workflow:definition:export', N'#', 103, 1, GETDATE(), NULL, NULL, N''); +GO +INSERT sys_menu VALUES (11649, N'流程定义导入', 11620, 6, N'#', N'', N'', N'N', N'Y', N'F', N'0', N'0', N'workflow:definition:import', N'#', 103, 1, GETDATE(), NULL, NULL, N''); +GO +INSERT sys_menu VALUES (11650, N'流程定义发布/取消发布', 11620, 7, N'#', N'', N'', N'N', N'Y', N'F', N'0', N'0', N'workflow:definition:publish', N'#', 103, 1, GETDATE(), NULL, NULL, N''); +GO +INSERT sys_menu VALUES (11651, N'流程定义复制', 11620, 8, N'#', N'', N'', N'N', N'Y', N'F', N'0', N'0', N'workflow:definition:copy', N'#', 103, 1, GETDATE(), NULL, NULL, N''); +GO +INSERT sys_menu VALUES (11652, N'流程定义激活/挂起', 11620, 9, N'#', N'', N'', N'N', N'Y', N'F', N'0', N'0', N'workflow:definition:active', N'#', 103, 1, GETDATE(), NULL, NULL, N''); +GO + INSERT sys_menu VALUES (11801, N'流程表达式', N'11616', 2, N'spel', N'workflow/spel/index', N'', N'N', N'Y', N'C', N'0', N'0', N'workflow:spel:list', N'input', 103, 1, GETDATE(), 1, GETDATE(), N'流程达式定义菜单'); GO INSERT sys_menu VALUES (11802, N'流程spel表达式定义查询', N'11801', 1, N'#', N'', NULL, N'N', N'Y', N'F', N'0', N'0', N'workflow:spel:query', N'#', 103, 1, GETDATE(), NULL, NULL, N''); From 62bb368ca7ca0217d6169e048f1140d4223be1ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Thu, 19 Mar 2026 15:14:57 +0800 Subject: [PATCH 13/13] =?UTF-8?q?update=20=E8=A1=A5=E5=85=A8=E7=BC=BA?= =?UTF-8?q?=E5=A4=B1sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/sql/sqlserver/sqlserver_ry_workflow.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/sql/sqlserver/sqlserver_ry_workflow.sql b/script/sql/sqlserver/sqlserver_ry_workflow.sql index 2ffe64958..f58a70d85 100644 --- a/script/sql/sqlserver/sqlserver_ry_workflow.sql +++ b/script/sql/sqlserver/sqlserver_ry_workflow.sql @@ -1571,7 +1571,7 @@ INSERT sys_menu VALUES (11632, N'我的已办', 11618, 3, N'taskFinish', N'workf GO INSERT sys_menu VALUES (11633, N'我的抄送', 11618, 4, N'taskCopyList', N'workflow/task/taskCopyList', N'', N'N', N'N', N'C', N'0', N'0', N'', N'my-copy', 103, 1, GETDATE(), NULL, NULL, N''); GO -INSERT sys_menu VALUES (11620, N'流程定义', 11616, 3, N'processDefinition', N'workflow/processDefinition/index', N'', N'N', N'N', N'C', N'0', N'0', N'', N'process-definition', 103, 1, GETDATE(), NULL, NULL, N''); +INSERT sys_menu VALUES (11620, N'流程定义', 11616, 3, N'processDefinition', N'workflow/processDefinition/index', N'', N'N', N'N', N'C', N'0', N'0', N'workflow:definition:list', N'process-definition', 103, 1, GETDATE(), NULL, NULL, N''); GO INSERT sys_menu VALUES (11621, N'流程实例', 11630, 1, N'processInstance', N'workflow/processInstance/index', N'', N'N', N'N', N'C', N'0', N'0', N'workflow:instance:list', N'tree-table', 103, 1, GETDATE(), NULL, NULL, N''); GO