From 5242760d08e3e308f6ab905ab3c4ced51d3f3dce Mon Sep 17 00:00:00 2001 From: vben Date: Mon, 17 Nov 2025 19:10:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- pom.xml | 2 +- vben-apps/vben-admin/pom.xml | 2 +- .../src/main/resources/application.yml | 4 +- vben-apps/vben-jpa/pom.xml | 2 +- .../src/main/resources/application.yml | 4 +- vben-apps/vben-mybatis/pom.xml | 2 +- .../src/main/resources/application.yml | 4 +- .../bus/BpmBusCateEntity.java} | 6 +- .../vben/setup/bpm/bus/BpmBusCateRepo.java | 8 + .../bus/BpmBusInitService.java} | 28 +-- .../bus/BpmBusLeaveEntity.java} | 6 +- .../bus/BpmBusMainEntity.java} | 6 +- .../bus/BpmBusTmplEntity.java} | 8 +- .../vben/setup/bpm/bus/BpmBusTmplRepo.java | 8 + .../vben/setup/bpm/org/BpmOrgInitService.java | 4 + .../org/BpmOrgNodeEntity.java} | 6 +- .../org/BpmOrgRoleEntity.java} | 14 +- .../org/BpmOrgTreeCateEntity.java} | 6 +- .../org/BpmOrgTreeEntity.java} | 6 +- .../proc/BpmProcAuditEntity.java} | 6 +- .../proc/BpmProcCondEntity.java} | 6 +- .../proc/BpmProcDefEntity.java} | 6 +- .../vben/setup/bpm/proc/BpmProcDefRepo.java | 8 + .../setup/bpm/proc/BpmProcInitService.java | 4 + .../proc/BpmProcInstEntity.java} | 8 +- .../proc/BpmProcNodeEntity.java} | 6 +- .../proc/BpmProcNodeHiEntity.java} | 6 +- .../proc/BpmProcParamEntity.java} | 6 +- .../proc/BpmProcTaskEntity.java} | 6 +- .../proc/BpmProcTaskHiEntity.java} | 6 +- .../todo/BpmTodoDoneEntity.java} | 6 +- .../todo/BpmTodoHistEntity.java} | 8 +- .../todo/BpmTodoMainEntity.java} | 8 +- .../todo/BpmTodoUserEntity.java} | 6 +- .../java/vben/setup/root/DataInitService.java | 10 +- .../sys/perm/api/SysPermApiInitService.java | 8 +- .../sys/perm/menu/SysPermMenuInitService.java | 22 +-- .../sys/perm/role/SysPermRoleInitService.java | 8 +- .../java/vben/setup/wf/bus/WfBusCateRepo.java | 8 - .../java/vben/setup/wf/bus/WfBusTmplRepo.java | 8 - .../vben/setup/wf/org/WfOrgInitService.java | 4 - .../vben/setup/wf/proc/WfProcDefRepo.java | 8 - .../vben/setup/wf/proc/WfProcInitService.java | 4 - .../src/main/resources/application.yml | 2 +- vben-modules/pom.xml | 2 +- .../auth/{home => root}/IndexController.java | 2 +- vben-modules/{vben-wf => vben-bpm}/pom.xml | 2 +- .../java/vben/bpm/bus/cate/BpmBusCate.java} | 6 +- .../vben/bpm/bus/cate/BpmBusCateApi.java} | 20 +-- .../vben/bpm/bus/cate/BpmBusCateDao.java} | 26 +-- .../vben/bpm/bus/cate/BpmBusCateService.java} | 14 +- .../java/vben/bpm/bus/leave/BpmBusLeave.java} | 8 +- .../vben/bpm/bus/leave/BpmBusLeaveApi.java} | 18 +- .../vben/bpm/bus/leave/BpmBusLeaveDao.java} | 14 +- .../bpm/bus/leave/BpmBusLeaveService.java} | 26 +-- .../java/vben/bpm/bus/main/BpmBusMain.java} | 10 +- .../vben/bpm/bus/main/BpmBusMainApi.java} | 28 +-- .../vben/bpm/bus/main/BpmBusMainDao.java} | 24 +-- .../vben/bpm/bus/main/BpmBusMainService.java} | 28 +-- .../java/vben/bpm/bus/tmpl/BpmBusTmpl.java} | 6 +- .../vben/bpm/bus/tmpl/BpmBusTmplApi.java} | 20 +-- .../vben/bpm/bus/tmpl/BpmBusTmplDao.java} | 20 +-- .../vben/bpm/bus/tmpl/BpmBusTmplService.java} | 36 ++-- .../java/vben/bpm/form/def/BpmFormDef.java} | 4 +- .../vben/bpm/form/def/BpmFormDefDao.java} | 20 +-- .../java/vben/bpm/form/inst/BpmFormInst.java} | 4 +- .../java/vben/bpm/org/node/BpmOrgNode.java} | 10 +- .../vben/bpm/org/node/BpmOrgNodeApi.java} | 26 +-- .../vben/bpm/org/node/BpmOrgNodeDao.java} | 20 +-- .../vben/bpm/org/node/BpmOrgNodeService.java} | 52 +++--- .../java/vben/bpm/org/role/BpmOrgRole.java} | 12 +- .../vben/bpm/org/role/BpmOrgRoleDao.java} | 22 +-- .../java/vben/bpm/org/tree/BpmOrgTree.java} | 8 +- .../vben/bpm/org/tree/BpmOrgTreeApi.java} | 18 +- .../vben/bpm/org/tree/BpmOrgTreeDao.java} | 26 +-- .../vben/bpm/org/tree/BpmOrgTreeService.java} | 36 ++-- .../vben/bpm/org/tree/BpmUserService.java} | 12 +- .../vben/bpm/org/treec/BpmOrgTreeCate.java} | 4 +- .../bpm/org/treec/BpmOrgTreeCateApi.java} | 16 +- .../bpm/org/treec/BpmOrgTreeCateDao.java} | 26 +-- .../bpm/org/treec/BpmOrgTreeCateService.java} | 34 ++-- .../vben/bpm/proc/audit/BpmProcAudit.java} | 4 +- .../vben/bpm/proc/audit/BpmProcAuditDao.java} | 36 ++-- .../bpm/proc/audit/BpmProcAuditService.java} | 30 ++-- .../java/vben/bpm/proc/cond/BpmProcCond.java} | 4 +- .../vben/bpm/proc/cond/BpmProcCondDao.java} | 20 +-- .../java/vben/bpm/proc/def/BpmProcDef.java} | 6 +- .../vben/bpm/proc/def/BpmProcDefDao.java} | 36 ++-- .../vben/bpm/proc/def/BpmProcDefService.java} | 12 +- .../java/vben/bpm/proc/inst/BpmProcInst.java} | 10 +- .../vben/bpm/proc/inst/BpmProcInstDao.java} | 18 +- .../bpm/proc/inst/BpmProcInstService.java} | 10 +- .../java/vben/bpm/proc/node/BpmProcNode.java} | 4 +- .../vben/bpm/proc/node/BpmProcNodeDao.java} | 20 +-- .../vben/bpm/proc/node/BpmProcNodeHi.java} | 4 +- .../vben/bpm/proc/node/BpmProcNodeHiDao.java} | 18 +- .../bpm/proc/node/BpmProcNodeHiService.java} | 26 +-- .../bpm/proc/node/BpmProcNodeService.java} | 16 +- .../vben/bpm/proc/param/BpmProcParam.java} | 4 +- .../vben/bpm/proc/param/BpmProcParamDao.java} | 26 +-- .../bpm/proc/param/BpmProcParamService.java} | 12 +- .../java/vben/bpm/proc/task/BpmProcTask.java} | 4 +- .../vben/bpm/proc/task/BpmProcTaskDao.java} | 46 ++--- .../vben/bpm/proc/task/BpmProcTaskHi.java} | 4 +- .../vben/bpm/proc/task/BpmProcTaskHiDao.java} | 16 +- .../bpm/proc/task/BpmProcTaskHiService.java} | 22 +-- .../bpm/proc/task/BpmProcTaskService.java} | 48 ++--- .../src/main/java/vben/bpm/root/BpmApi.java} | 146 +++++++-------- .../main/java/vben/bpm/root/BpmHandler.java} | 68 +++---- .../main/java/vben/bpm/root/BpmService.java} | 166 +++++++++--------- .../java/vben/bpm}/root/domain/Zcond.java | 2 +- .../java/vben/bpm}/root/domain/Znode.java | 2 +- .../java/vben/bpm}/root/domain/Zproc.java | 4 +- .../vben/bpm/root/domain/bo/BpmStartBo.java} | 4 +- .../bpm/root/domain/dto/BpmParamDto.java} | 4 +- .../vben/bpm/root/domain/dto/BpmProcDto.java} | 8 +- .../vben/bpm/root/domain/dto/BpmTaskDto.java} | 4 +- .../vben/bpm/root/domain/vo/BpmAuditVo.java} | 4 +- .../vben/bpm/root/domain/vo/BpmCcInfoVo.java} | 4 +- .../vben/bpm/root/domain/vo/BpmGoalVo.java} | 4 +- .../vben/bpm/root/domain/vo/BpmInitVo.java} | 6 +- .../bpm/root/domain/vo/BpmProcDefVo.java} | 8 +- .../bpm/root/domain/vo/BpmRefuseInfoVo.java} | 4 +- .../vben/bpm/root/domain/vo/BpmTaskVo.java} | 4 +- .../java/vben/bpm/todo/done/BpmTodoDone.java} | 4 +- .../vben/bpm/todo/done/BpmTodoDoneDao.java} | 20 +-- .../java/vben/bpm/todo/hist/BpmTodoHi.java} | 4 +- .../vben/bpm/todo/hist/BpmTodoHiDao.java} | 20 +-- .../java/vben/bpm/todo/main/BpmTodoMain.java} | 4 +- .../vben/bpm/todo/main/BpmTodoMainApi.java} | 20 +-- .../vben/bpm/todo/main/BpmTodoMainDao.java} | 20 +-- .../bpm/todo/main/BpmTodoMainService.java} | 86 ++++----- .../java/vben/bpm/todo/user/BpmTodoUser.java} | 4 +- .../vben/bpm/todo/user/BpmTodoUserDao.java} | 20 +-- 135 files changed, 1033 insertions(+), 1033 deletions(-) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/bus/WfBusCateEntity.java => bpm/bus/BpmBusCateEntity.java} (90%) create mode 100644 vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusCateRepo.java rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/bus/WfBusInitService.java => bpm/bus/BpmBusInitService.java} (96%) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/bus/WfBusLeaveEntity.java => bpm/bus/BpmBusLeaveEntity.java} (95%) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/bus/WfBusMainEntity.java => bpm/bus/BpmBusMainEntity.java} (91%) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/bus/WfBusTmplEntity.java => bpm/bus/BpmBusTmplEntity.java} (91%) create mode 100644 vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusTmplRepo.java create mode 100644 vben-apps/vben-setup/src/main/java/vben/setup/bpm/org/BpmOrgInitService.java rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/org/WfOrgNodeEntity.java => bpm/org/BpmOrgNodeEntity.java} (90%) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/org/WfOrgRoleEntity.java => bpm/org/BpmOrgRoleEntity.java} (63%) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/org/WfOrgTreeCateEntity.java => bpm/org/BpmOrgTreeCateEntity.java} (83%) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/org/WfOrgTreeEntity.java => bpm/org/BpmOrgTreeEntity.java} (91%) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/proc/WfProcAuditEntity.java => bpm/proc/BpmProcAuditEntity.java} (95%) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/proc/WfProcCondEntity.java => bpm/proc/BpmProcCondEntity.java} (83%) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/proc/WfProcDefEntity.java => bpm/proc/BpmProcDefEntity.java} (93%) create mode 100644 vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcDefRepo.java create mode 100644 vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcInitService.java rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/proc/WfProcInstEntity.java => bpm/proc/BpmProcInstEntity.java} (92%) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/proc/WfProcNodeEntity.java => bpm/proc/BpmProcNodeEntity.java} (93%) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/proc/WfProcNodeHiEntity.java => bpm/proc/BpmProcNodeHiEntity.java} (94%) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/proc/WfProcParamEntity.java => bpm/proc/BpmProcParamEntity.java} (90%) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/proc/WfProcTaskEntity.java => bpm/proc/BpmProcTaskEntity.java} (94%) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/proc/WfProcTaskHiEntity.java => bpm/proc/BpmProcTaskHiEntity.java} (94%) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/todo/WfTodoDoneEntity.java => bpm/todo/BpmTodoDoneEntity.java} (87%) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/todo/WfTodoHistEntity.java => bpm/todo/BpmTodoHistEntity.java} (87%) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/todo/WfTodoMainEntity.java => bpm/todo/BpmTodoMainEntity.java} (88%) rename vben-apps/vben-setup/src/main/java/vben/setup/{wf/todo/WfTodoUserEntity.java => bpm/todo/BpmTodoUserEntity.java} (85%) delete mode 100644 vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusCateRepo.java delete mode 100644 vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusTmplRepo.java delete mode 100644 vben-apps/vben-setup/src/main/java/vben/setup/wf/org/WfOrgInitService.java delete mode 100644 vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcDefRepo.java delete mode 100644 vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcInitService.java rename vben-modules/vben-base/src/main/java/vben/base/auth/{home => root}/IndexController.java (95%) rename vben-modules/{vben-wf => vben-bpm}/pom.xml (97%) rename vben-modules/{vben-wf/src/main/java/vben/wf/bus/cate/WfBusCate.java => vben-bpm/src/main/java/vben/bpm/bus/cate/BpmBusCate.java} (87%) rename vben-modules/{vben-wf/src/main/java/vben/wf/bus/cate/WfBusCateApi.java => vben-bpm/src/main/java/vben/bpm/bus/cate/BpmBusCateApi.java} (80%) rename vben-modules/{vben-wf/src/main/java/vben/wf/bus/cate/WfBusCateDao.java => vben-bpm/src/main/java/vben/bpm/bus/cate/BpmBusCateDao.java} (77%) rename vben-modules/{vben-wf/src/main/java/vben/wf/bus/cate/WfBusCateService.java => vben-bpm/src/main/java/vben/bpm/bus/cate/BpmBusCateService.java} (78%) rename vben-modules/{vben-wf/src/main/java/vben/wf/bus/leave/WfBusLeave.java => vben-bpm/src/main/java/vben/bpm/bus/leave/BpmBusLeave.java} (90%) rename vben-modules/{vben-wf/src/main/java/vben/wf/bus/leave/WfBusLeaveApi.java => vben-bpm/src/main/java/vben/bpm/bus/leave/BpmBusLeaveApi.java} (75%) rename vben-modules/{vben-wf/src/main/java/vben/wf/bus/leave/WfBusLeaveDao.java => vben-bpm/src/main/java/vben/bpm/bus/leave/BpmBusLeaveDao.java} (86%) rename vben-modules/{vben-wf/src/main/java/vben/wf/bus/leave/WfBusLeaveService.java => vben-bpm/src/main/java/vben/bpm/bus/leave/BpmBusLeaveService.java} (71%) rename vben-modules/{vben-wf/src/main/java/vben/wf/bus/main/WfBusMain.java => vben-bpm/src/main/java/vben/bpm/bus/main/BpmBusMain.java} (85%) rename vben-modules/{vben-wf/src/main/java/vben/wf/bus/main/WfBusMainApi.java => vben-bpm/src/main/java/vben/bpm/bus/main/BpmBusMainApi.java} (69%) rename vben-modules/{vben-wf/src/main/java/vben/wf/bus/main/WfBusMainDao.java => vben-bpm/src/main/java/vben/bpm/bus/main/BpmBusMainDao.java} (79%) rename vben-modules/{vben-wf/src/main/java/vben/wf/bus/main/WfBusMainService.java => vben-bpm/src/main/java/vben/bpm/bus/main/BpmBusMainService.java} (77%) rename vben-modules/{vben-wf/src/main/java/vben/wf/bus/tmpl/WfBusTmpl.java => vben-bpm/src/main/java/vben/bpm/bus/tmpl/BpmBusTmpl.java} (92%) rename vben-modules/{vben-wf/src/main/java/vben/wf/bus/tmpl/WfBusTmplApi.java => vben-bpm/src/main/java/vben/bpm/bus/tmpl/BpmBusTmplApi.java} (81%) rename vben-modules/{vben-wf/src/main/java/vben/wf/bus/tmpl/WfBusTmplDao.java => vben-bpm/src/main/java/vben/bpm/bus/tmpl/BpmBusTmplDao.java} (80%) rename vben-modules/{vben-wf/src/main/java/vben/wf/bus/tmpl/WfBusTmplService.java => vben-bpm/src/main/java/vben/bpm/bus/tmpl/BpmBusTmplService.java} (73%) rename vben-modules/{vben-wf/src/main/java/vben/wf/form/def/WfFormDef.java => vben-bpm/src/main/java/vben/bpm/form/def/BpmFormDef.java} (89%) rename vben-modules/{vben-wf/src/main/java/vben/wf/form/def/WfFormDefDao.java => vben-bpm/src/main/java/vben/bpm/form/def/BpmFormDefDao.java} (66%) rename vben-modules/{vben-wf/src/main/java/vben/wf/form/inst/WfFormInst.java => vben-bpm/src/main/java/vben/bpm/form/inst/BpmFormInst.java} (80%) rename vben-modules/{vben-wf/src/main/java/vben/wf/org/node/WfOrgNode.java => vben-bpm/src/main/java/vben/bpm/org/node/BpmOrgNode.java} (82%) rename vben-modules/{vben-wf/src/main/java/vben/wf/org/node/WfOrgNodeApi.java => vben-bpm/src/main/java/vben/bpm/org/node/BpmOrgNodeApi.java} (86%) rename vben-modules/{vben-wf/src/main/java/vben/wf/org/node/WfOrgNodeDao.java => vben-bpm/src/main/java/vben/bpm/org/node/BpmOrgNodeDao.java} (71%) rename vben-modules/{vben-wf/src/main/java/vben/wf/org/node/WfOrgNodeService.java => vben-bpm/src/main/java/vben/bpm/org/node/BpmOrgNodeService.java} (85%) rename vben-modules/{vben-wf/src/main/java/vben/wf/org/role/WfOrgRole.java => vben-bpm/src/main/java/vben/bpm/org/role/BpmOrgRole.java} (64%) rename vben-modules/{vben-wf/src/main/java/vben/wf/org/role/WfOrgRoleDao.java => vben-bpm/src/main/java/vben/bpm/org/role/BpmOrgRoleDao.java} (66%) rename vben-modules/{vben-wf/src/main/java/vben/wf/org/tree/WfOrgTree.java => vben-bpm/src/main/java/vben/bpm/org/tree/BpmOrgTree.java} (84%) rename vben-modules/{vben-wf/src/main/java/vben/wf/org/tree/WfOrgTreeApi.java => vben-bpm/src/main/java/vben/bpm/org/tree/BpmOrgTreeApi.java} (75%) rename vben-modules/{vben-wf/src/main/java/vben/wf/org/tree/WfOrgTreeDao.java => vben-bpm/src/main/java/vben/bpm/org/tree/BpmOrgTreeDao.java} (66%) rename vben-modules/{vben-wf/src/main/java/vben/wf/org/tree/WfOrgTreeService.java => vben-bpm/src/main/java/vben/bpm/org/tree/BpmOrgTreeService.java} (72%) rename vben-modules/{vben-wf/src/main/java/vben/wf/org/tree/WfUserService.java => vben-bpm/src/main/java/vben/bpm/org/tree/BpmUserService.java} (90%) rename vben-modules/{vben-wf/src/main/java/vben/wf/org/treec/WfOrgTreeCate.java => vben-bpm/src/main/java/vben/bpm/org/treec/BpmOrgTreeCate.java} (82%) rename vben-modules/{vben-wf/src/main/java/vben/wf/org/treec/WfOrgTreeCateApi.java => vben-bpm/src/main/java/vben/bpm/org/treec/BpmOrgTreeCateApi.java} (72%) rename vben-modules/{vben-wf/src/main/java/vben/wf/org/treec/WfOrgTreeCateDao.java => vben-bpm/src/main/java/vben/bpm/org/treec/BpmOrgTreeCateDao.java} (70%) rename vben-modules/{vben-wf/src/main/java/vben/wf/org/treec/WfOrgTreeCateService.java => vben-bpm/src/main/java/vben/bpm/org/treec/BpmOrgTreeCateService.java} (75%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/audit/WfProcAudit.java => vben-bpm/src/main/java/vben/bpm/proc/audit/BpmProcAudit.java} (93%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/audit/WfProcAuditDao.java => vben-bpm/src/main/java/vben/bpm/proc/audit/BpmProcAuditDao.java} (72%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/audit/WfProcAuditService.java => vben-bpm/src/main/java/vben/bpm/proc/audit/BpmProcAuditService.java} (68%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/cond/WfProcCond.java => vben-bpm/src/main/java/vben/bpm/proc/cond/BpmProcCond.java} (76%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/cond/WfProcCondDao.java => vben-bpm/src/main/java/vben/bpm/proc/cond/BpmProcCondDao.java} (66%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/def/WfProcDef.java => vben-bpm/src/main/java/vben/bpm/proc/def/BpmProcDef.java} (89%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/def/WfProcDefDao.java => vben-bpm/src/main/java/vben/bpm/proc/def/BpmProcDefDao.java} (67%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/def/WfProcDefService.java => vben-bpm/src/main/java/vben/bpm/proc/def/BpmProcDefService.java} (86%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/inst/WfProcInst.java => vben-bpm/src/main/java/vben/bpm/proc/inst/BpmProcInst.java} (85%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/inst/WfProcInstDao.java => vben-bpm/src/main/java/vben/bpm/proc/inst/BpmProcInstDao.java} (81%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/inst/WfProcInstService.java => vben-bpm/src/main/java/vben/bpm/proc/inst/BpmProcInstService.java} (67%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/node/WfProcNode.java => vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNode.java} (90%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeDao.java => vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeDao.java} (75%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeHi.java => vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeHi.java} (91%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeHiDao.java => vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeHiDao.java} (79%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeHiService.java => vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeHiService.java} (81%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeService.java => vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeService.java} (67%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/param/WfProcParam.java => vben-bpm/src/main/java/vben/bpm/proc/param/BpmProcParam.java} (85%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/param/WfProcParamDao.java => vben-bpm/src/main/java/vben/bpm/proc/param/BpmProcParamDao.java} (70%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/param/WfProcParamService.java => vben-bpm/src/main/java/vben/bpm/proc/param/BpmProcParamService.java} (60%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/task/WfProcTask.java => vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTask.java} (92%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskDao.java => vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskDao.java} (67%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskHi.java => vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskHi.java} (91%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskHiDao.java => vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskHiDao.java} (81%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskHiService.java => vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskHiService.java} (71%) rename vben-modules/{vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskService.java => vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskService.java} (78%) rename vben-modules/{vben-wf/src/main/java/vben/wf/root/WfApi.java => vben-bpm/src/main/java/vben/bpm/root/BpmApi.java} (64%) rename vben-modules/{vben-wf/src/main/java/vben/wf/root/WfHandler.java => vben-bpm/src/main/java/vben/bpm/root/BpmHandler.java} (88%) rename vben-modules/{vben-wf/src/main/java/vben/wf/root/WfService.java => vben-bpm/src/main/java/vben/bpm/root/BpmService.java} (81%) rename vben-modules/{vben-wf/src/main/java/vben/wf => vben-bpm/src/main/java/vben/bpm}/root/domain/Zcond.java (87%) rename vben-modules/{vben-wf/src/main/java/vben/wf => vben-bpm/src/main/java/vben/bpm}/root/domain/Znode.java (94%) rename vben-modules/{vben-wf/src/main/java/vben/wf => vben-bpm/src/main/java/vben/bpm}/root/domain/Zproc.java (96%) rename vben-modules/{vben-wf/src/main/java/vben/wf/root/domain/bo/WfStartBo.java => vben-bpm/src/main/java/vben/bpm/root/domain/bo/BpmStartBo.java} (85%) rename vben-modules/{vben-wf/src/main/java/vben/wf/root/domain/dto/WfParamDto.java => vben-bpm/src/main/java/vben/bpm/root/domain/dto/BpmParamDto.java} (66%) rename vben-modules/{vben-wf/src/main/java/vben/wf/root/domain/dto/WfProcDto.java => vben-bpm/src/main/java/vben/bpm/root/domain/dto/BpmProcDto.java} (84%) rename vben-modules/{vben-wf/src/main/java/vben/wf/root/domain/dto/WfTaskDto.java => vben-bpm/src/main/java/vben/bpm/root/domain/dto/BpmTaskDto.java} (87%) rename vben-modules/{vben-wf/src/main/java/vben/wf/root/domain/vo/WfAuditVo.java => vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmAuditVo.java} (90%) rename vben-modules/{vben-wf/src/main/java/vben/wf/root/domain/vo/WfCcInfoVo.java => vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmCcInfoVo.java} (61%) rename vben-modules/{vben-wf/src/main/java/vben/wf/root/domain/vo/WfGoalVo.java => vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmGoalVo.java} (79%) rename vben-modules/{vben-wf/src/main/java/vben/wf/root/domain/vo/WfInitVo.java => vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmInitVo.java} (76%) rename vben-modules/{vben-wf/src/main/java/vben/wf/root/domain/vo/WfProcDefVo.java => vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmProcDefVo.java} (54%) rename vben-modules/{vben-wf/src/main/java/vben/wf/root/domain/vo/WfRefuseInfoVo.java => vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmRefuseInfoVo.java} (68%) rename vben-modules/{vben-wf/src/main/java/vben/wf/root/domain/vo/WfTaskVo.java => vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmTaskVo.java} (87%) rename vben-modules/{vben-wf/src/main/java/vben/wf/todo/done/WfTodoDone.java => vben-bpm/src/main/java/vben/bpm/todo/done/BpmTodoDone.java} (85%) rename vben-modules/{vben-wf/src/main/java/vben/wf/todo/done/WfTodoDoneDao.java => vben-bpm/src/main/java/vben/bpm/todo/done/BpmTodoDoneDao.java} (70%) rename vben-modules/{vben-wf/src/main/java/vben/wf/todo/hist/WfTodoHist.java => vben-bpm/src/main/java/vben/bpm/todo/hist/BpmTodoHi.java} (93%) rename vben-modules/{vben-wf/src/main/java/vben/wf/todo/hist/WfTodoHistDao.java => vben-bpm/src/main/java/vben/bpm/todo/hist/BpmTodoHiDao.java} (77%) rename vben-modules/{vben-wf/src/main/java/vben/wf/todo/main/WfTodoMain.java => vben-bpm/src/main/java/vben/bpm/todo/main/BpmTodoMain.java} (92%) rename vben-modules/{vben-wf/src/main/java/vben/wf/todo/main/WfTodoMainApi.java => vben-bpm/src/main/java/vben/bpm/todo/main/BpmTodoMainApi.java} (76%) rename vben-modules/{vben-wf/src/main/java/vben/wf/todo/main/WfTodoMainDao.java => vben-bpm/src/main/java/vben/bpm/todo/main/BpmTodoMainDao.java} (76%) rename vben-modules/{vben-wf/src/main/java/vben/wf/todo/main/WfTodoMainService.java => vben-bpm/src/main/java/vben/bpm/todo/main/BpmTodoMainService.java} (70%) rename vben-modules/{vben-wf/src/main/java/vben/wf/todo/user/WfTodoUser.java => vben-bpm/src/main/java/vben/bpm/todo/user/BpmTodoUser.java} (80%) rename vben-modules/{vben-wf/src/main/java/vben/wf/todo/user/WfTodoUserDao.java => vben-bpm/src/main/java/vben/bpm/todo/user/BpmTodoUserDao.java} (68%) diff --git a/README.md b/README.md index a172630..562df61 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -### 🍿 项目简介 +### 🍿 项目简介 [![码云Gitee](https://gitee.com/vben/vben-java/badge/star.svg?theme=blue)](https://gitee.com/vben/vben-java) [![License](https://img.shields.io/badge/License-MIT-blue.svg)]() diff --git a/pom.xml b/pom.xml index cb558c1..fd494ea 100644 --- a/pom.xml +++ b/pom.xml @@ -322,7 +322,7 @@ com.zsvg - vben-wf + vben-bpm ${revision} diff --git a/vben-apps/vben-admin/pom.xml b/vben-apps/vben-admin/pom.xml index b4e3b9d..78940e0 100644 --- a/vben-apps/vben-admin/pom.xml +++ b/vben-apps/vben-admin/pom.xml @@ -48,7 +48,7 @@ com.zsvg - vben-wf + vben-bpm diff --git a/vben-apps/vben-admin/src/main/resources/application.yml b/vben-apps/vben-admin/src/main/resources/application.yml index d5406e5..31e80ab 100644 --- a/vben-apps/vben-admin/src/main/resources/application.yml +++ b/vben-apps/vben-admin/src/main/resources/application.yml @@ -208,7 +208,7 @@ springdoc: - group: 4.辅助工具 packages-to-scan: vben.base.tool - group: 5.工作流 - packages-to-scan: vben.wf + packages-to-scan: vben.bpm # 防止XSS攻击 xss: @@ -218,7 +218,7 @@ xss: excludeUrls: - /system/notice - /oa/flow/tmpl - - /wf/bus/tmpl + - /bpm/bus/tmpl --- # 分布式锁 lock4j 全局配置 lock4j: diff --git a/vben-apps/vben-jpa/pom.xml b/vben-apps/vben-jpa/pom.xml index 55d1b58..056536a 100644 --- a/vben-apps/vben-jpa/pom.xml +++ b/vben-apps/vben-jpa/pom.xml @@ -48,7 +48,7 @@ com.zsvg - vben-wf + vben-bpm diff --git a/vben-apps/vben-jpa/src/main/resources/application.yml b/vben-apps/vben-jpa/src/main/resources/application.yml index d5406e5..31e80ab 100644 --- a/vben-apps/vben-jpa/src/main/resources/application.yml +++ b/vben-apps/vben-jpa/src/main/resources/application.yml @@ -208,7 +208,7 @@ springdoc: - group: 4.辅助工具 packages-to-scan: vben.base.tool - group: 5.工作流 - packages-to-scan: vben.wf + packages-to-scan: vben.bpm # 防止XSS攻击 xss: @@ -218,7 +218,7 @@ xss: excludeUrls: - /system/notice - /oa/flow/tmpl - - /wf/bus/tmpl + - /bpm/bus/tmpl --- # 分布式锁 lock4j 全局配置 lock4j: diff --git a/vben-apps/vben-mybatis/pom.xml b/vben-apps/vben-mybatis/pom.xml index 4c68833..f398144 100644 --- a/vben-apps/vben-mybatis/pom.xml +++ b/vben-apps/vben-mybatis/pom.xml @@ -48,7 +48,7 @@ com.zsvg - vben-wf + vben-bpm diff --git a/vben-apps/vben-mybatis/src/main/resources/application.yml b/vben-apps/vben-mybatis/src/main/resources/application.yml index d5406e5..31e80ab 100644 --- a/vben-apps/vben-mybatis/src/main/resources/application.yml +++ b/vben-apps/vben-mybatis/src/main/resources/application.yml @@ -208,7 +208,7 @@ springdoc: - group: 4.辅助工具 packages-to-scan: vben.base.tool - group: 5.工作流 - packages-to-scan: vben.wf + packages-to-scan: vben.bpm # 防止XSS攻击 xss: @@ -218,7 +218,7 @@ xss: excludeUrls: - /system/notice - /oa/flow/tmpl - - /wf/bus/tmpl + - /bpm/bus/tmpl --- # 分布式锁 lock4j 全局配置 lock4j: diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusCateEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusCateEntity.java similarity index 90% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusCateEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusCateEntity.java index c02533b..5b3b833 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusCateEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusCateEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.bus; +package vben.setup.bpm.bus; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -10,8 +10,8 @@ import java.util.Date; @Data @Entity -@Table(name = "wf_bus_cate") -public class WfBusCateEntity { +@Table(name = "bpm_bus_cate") +public class BpmBusCateEntity { /** * 主键ID diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusCateRepo.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusCateRepo.java new file mode 100644 index 0000000..3b8c4c3 --- /dev/null +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusCateRepo.java @@ -0,0 +1,8 @@ +package vben.setup.bpm.bus; + + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface BpmBusCateRepo extends JpaRepository { + +} diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusInitService.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusInitService.java similarity index 96% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusInitService.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusInitService.java index 46929e4..805fd2c 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusInitService.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusInitService.java @@ -1,18 +1,18 @@ -package vben.setup.wf.bus; +package vben.setup.bpm.bus; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import vben.setup.wf.proc.WfProcDefEntity; -import vben.setup.wf.proc.WfProcDefRepo; +import vben.setup.bpm.proc.BpmProcDefEntity; +import vben.setup.bpm.proc.BpmProcDefRepo; @Service @RequiredArgsConstructor @Transactional -public class WfBusInitService { +public class BpmBusInitService { public void init() { - WfBusCateEntity cate = new WfBusCateEntity(); + BpmBusCateEntity cate = new BpmBusCateEntity(); cate.setId(1L); cate.setName("人事管理"); cate.setAvtag(true); @@ -20,7 +20,7 @@ public class WfBusInitService { cate.setUptim(cate.getCrtim()); cateRepo.save(cate); - WfBusCateEntity cate2 = new WfBusCateEntity(); + BpmBusCateEntity cate2 = new BpmBusCateEntity(); cate2.setId(2L); cate2.setName("财务管理"); cate2.setAvtag(true); @@ -28,19 +28,19 @@ public class WfBusInitService { cate2.setUptim(cate.getCrtim()); cateRepo.save(cate2); - WfBusTmplEntity tmpl = new WfBusTmplEntity(); + BpmBusTmplEntity tmpl = new BpmBusTmplEntity(); tmpl.setId(101L); tmpl.setName("请假申请"); tmpl.setAvtag(true); tmpl.setUptim(tmpl.getCrtim()); tmpl.setCatid(1L); - tmpl.setFpath("wf/bus/leave/edit.vue"); + tmpl.setFpath("bpm/bus/leave/edit.vue"); tmpl.setFtype(1); tmpl.setPrdid(101L); tmpl.setCruid("1"); tmplRepo.save(tmpl); - WfProcDefEntity def=new WfProcDefEntity(); + BpmProcDefEntity def=new BpmProcDefEntity(); def.setId(101L); def.setName("请假申请"); def.setUptim(def.getCrtim()); @@ -181,7 +181,7 @@ public class WfBusInitService { """); defRepo.save(def); - WfBusTmplEntity tmpl2 = new WfBusTmplEntity(); + BpmBusTmplEntity tmpl2 = new BpmBusTmplEntity(); tmpl2.setId(102L); tmpl2.setName("费用报销"); tmpl2.setAvtag(true); @@ -195,7 +195,7 @@ public class WfBusInitService { """); tmplRepo.save(tmpl2); - WfProcDefEntity def2=new WfProcDefEntity(); + BpmProcDefEntity def2=new BpmProcDefEntity(); def2.setId(102L); def2.setName("费用报销"); def2.setUptim(def.getCrtim()); @@ -338,10 +338,10 @@ public class WfBusInitService { } - private final WfBusCateRepo cateRepo; + private final BpmBusCateRepo cateRepo; - private final WfBusTmplRepo tmplRepo; + private final BpmBusTmplRepo tmplRepo; - private final WfProcDefRepo defRepo; + private final BpmProcDefRepo defRepo; } diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusLeaveEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusLeaveEntity.java similarity index 95% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusLeaveEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusLeaveEntity.java index a03584b..aea5f23 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusLeaveEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusLeaveEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.bus; +package vben.setup.bpm.bus; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; @@ -8,8 +8,8 @@ import java.util.Date; @Entity @Data -@Table(name = "wf_bus_leave") -public class WfBusLeaveEntity { +@Table(name = "bpm_bus_leave") +public class BpmBusLeaveEntity { //<<<----------------------BaseMainEntity字段开始----------------------- /** diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusMainEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusMainEntity.java similarity index 91% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusMainEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusMainEntity.java index 1d18e92..69dc5da 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusMainEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusMainEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.bus; +package vben.setup.bpm.bus; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; @@ -12,8 +12,8 @@ import java.util.Date; @Data @Entity -@Table(name = "wf_bus_main") -public class WfBusMainEntity { +@Table(name = "bpm_bus_main") +public class BpmBusMainEntity { @Id @Column(length = 32) diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusTmplEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusTmplEntity.java similarity index 91% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusTmplEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusTmplEntity.java index 3a078f3..b12d803 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusTmplEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusTmplEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.bus; +package vben.setup.bpm.bus; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; @@ -9,8 +9,8 @@ import java.util.Date; @Data @Entity -@Table(name = "wf_bus_tmpl") -public class WfBusTmplEntity { +@Table(name = "bpm_bus_tmpl") +public class BpmBusTmplEntity { @Id @Schema(description = "主键ID") @@ -47,7 +47,7 @@ public class WfBusTmplEntity { private Long catid; @Transient - private String wfXml; + private String bpmXml; @Schema(description = "流程定义ID") private Long prdid; diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusTmplRepo.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusTmplRepo.java new file mode 100644 index 0000000..0e777e6 --- /dev/null +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/bus/BpmBusTmplRepo.java @@ -0,0 +1,8 @@ +package vben.setup.bpm.bus; + + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface BpmBusTmplRepo extends JpaRepository { + +} diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/bpm/org/BpmOrgInitService.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/org/BpmOrgInitService.java new file mode 100644 index 0000000..cfd87c8 --- /dev/null +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/org/BpmOrgInitService.java @@ -0,0 +1,4 @@ +package vben.setup.bpm.org; + +public class BpmOrgInitService { +} diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/org/WfOrgNodeEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/org/BpmOrgNodeEntity.java similarity index 90% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/org/WfOrgNodeEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/org/BpmOrgNodeEntity.java index 953c0e6..987a47a 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/org/WfOrgNodeEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/org/BpmOrgNodeEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.org; +package vben.setup.bpm.org; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; @@ -11,8 +11,8 @@ import java.util.Date; @Entity @Data -@Table(name = "wf_org_node") -public class WfOrgNodeEntity { +@Table(name = "bpm_org_node") +public class BpmOrgNodeEntity { @Id @Column(length = 32) diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/org/WfOrgRoleEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/org/BpmOrgRoleEntity.java similarity index 63% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/org/WfOrgRoleEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/org/BpmOrgRoleEntity.java index 8069e7d..66f2045 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/org/WfOrgRoleEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/org/BpmOrgRoleEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.org; +package vben.setup.bpm.org; import jakarta.persistence.*; import lombok.Data; @@ -7,8 +7,8 @@ import lombok.Data; //层级角色 @Data @Entity -@Table(name = "wf_org_role") -public class WfOrgRoleEntity { +@Table(name = "bpm_org_role") +public class BpmOrgRoleEntity { @Id @Column(length = 36) private String id;//主键 @@ -22,19 +22,19 @@ public class WfOrgRoleEntity { private String treid;//角色树ID - public WfOrgRoleEntity() { + public BpmOrgRoleEntity() { } - public WfOrgRoleEntity(String id) { + public BpmOrgRoleEntity(String id) { this.id = id; } - public WfOrgRoleEntity(String id, String name) { + public BpmOrgRoleEntity(String id, String name) { this.id = id; this.name = name; } - public WfOrgRoleEntity(String id, String name, Integer ornum) { + public BpmOrgRoleEntity(String id, String name, Integer ornum) { this.id = id; this.name = name; this.ornum = ornum; diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/org/WfOrgTreeCateEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/org/BpmOrgTreeCateEntity.java similarity index 83% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/org/WfOrgTreeCateEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/org/BpmOrgTreeCateEntity.java index d84f602..2b3bbc9 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/org/WfOrgTreeCateEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/org/BpmOrgTreeCateEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.org; +package vben.setup.bpm.org; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -12,8 +12,8 @@ import lombok.Data; */ @Data @Entity -@Table(name = "wf_org_tree_cate") -public class WfOrgTreeCateEntity { +@Table(name = "bpm_org_tree_cate") +public class BpmOrgTreeCateEntity { /** * 主键ID */ diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/org/WfOrgTreeEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/org/BpmOrgTreeEntity.java similarity index 91% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/org/WfOrgTreeEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/org/BpmOrgTreeEntity.java index 7585e6f..dfa5ee2 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/org/WfOrgTreeEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/org/BpmOrgTreeEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.org; +package vben.setup.bpm.org; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -10,8 +10,8 @@ import java.util.Date; @Data @Entity -@Table(name = "wf_org_tree") -public class WfOrgTreeEntity { +@Table(name = "bpm_org_tree") +public class BpmOrgTreeEntity { /** * 主键 diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcAuditEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcAuditEntity.java similarity index 95% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcAuditEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcAuditEntity.java index 0a11e4e..0ac438a 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcAuditEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcAuditEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.proc; +package vben.setup.bpm.proc; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; @@ -12,9 +12,9 @@ import java.util.Date; @Data @Entity -@Table(name = "wf_proc_audit") +@Table(name = "bpm_proc_audit") @Schema(description = "流程审批") -public class WfProcAuditEntity { +public class BpmProcAuditEntity { /** * 主键 diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcCondEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcCondEntity.java similarity index 83% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcCondEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcCondEntity.java index d8f9cbb..50f216f 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcCondEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcCondEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.proc; +package vben.setup.bpm.proc; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; @@ -9,9 +9,9 @@ import lombok.Data; @Data @Entity -@Table(name = "wf_proc_cond") +@Table(name = "bpm_proc_cond") @Schema(description = "流程条件") -public class WfProcCondEntity { +public class BpmProcCondEntity { /** * 主键 diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcDefEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcDefEntity.java similarity index 93% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcDefEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcDefEntity.java index 3b3e20b..86f0b0f 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcDefEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcDefEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.proc; +package vben.setup.bpm.proc; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; @@ -9,9 +9,9 @@ import java.util.Date; @Data @Entity -@Table(name = "wf_proc_def") +@Table(name = "bpm_proc_def") @Schema(description = "流程定义") -public class WfProcDefEntity { +public class BpmProcDefEntity { /** diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcDefRepo.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcDefRepo.java new file mode 100644 index 0000000..e0a3239 --- /dev/null +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcDefRepo.java @@ -0,0 +1,8 @@ +package vben.setup.bpm.proc; + + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface BpmProcDefRepo extends JpaRepository { + +} diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcInitService.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcInitService.java new file mode 100644 index 0000000..0f4de4a --- /dev/null +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcInitService.java @@ -0,0 +1,4 @@ +package vben.setup.bpm.proc; + +public class BpmProcInitService { +} diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcInstEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcInstEntity.java similarity index 92% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcInstEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcInstEntity.java index 88c83d6..644c70a 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcInstEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcInstEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.proc; +package vben.setup.bpm.proc; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; @@ -12,9 +12,9 @@ import java.util.Date; @Data @Entity -@Table(name = "wf_proc_inst") +@Table(name = "bpm_proc_inst") @Schema(description = "流程实例") -public class WfProcInstEntity { +public class BpmProcInstEntity { /** @@ -95,7 +95,7 @@ public class WfProcInstEntity { @Schema(description = "状态") private String state; - public WfProcInstEntity() { + public BpmProcInstEntity() { } diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcNodeEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcNodeEntity.java similarity index 93% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcNodeEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcNodeEntity.java index bb5cecf..c9e7694 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcNodeEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcNodeEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.proc; +package vben.setup.bpm.proc; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; @@ -12,9 +12,9 @@ import java.util.Date; @Data @Entity -@Table(name = "wf_proc_node") +@Table(name = "bpm_proc_node") @Schema(description = "流程节点") -public class WfProcNodeEntity { +public class BpmProcNodeEntity { /** * 主键 diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcNodeHiEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcNodeHiEntity.java similarity index 94% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcNodeHiEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcNodeHiEntity.java index 9840e51..c48dbeb 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcNodeHiEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcNodeHiEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.proc; +package vben.setup.bpm.proc; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; @@ -12,9 +12,9 @@ import java.util.Date; @Data @Entity -@Table(name = "wf_proc_node_hi") +@Table(name = "bpm_proc_node_hi") @Schema(description = "流程节点历史") -public class WfProcNodeHiEntity { +public class BpmProcNodeHiEntity { /** * 主键 diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcParamEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcParamEntity.java similarity index 90% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcParamEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcParamEntity.java index 492b980..d5b312b 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcParamEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcParamEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.proc; +package vben.setup.bpm.proc; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; @@ -9,9 +9,9 @@ import lombok.Data; @Data @Entity -@Table(name = "wf_proc_param") +@Table(name = "bpm_proc_param") @Schema(description = "流程参数") -public class WfProcParamEntity { +public class BpmProcParamEntity { /** * 主键 diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcTaskEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcTaskEntity.java similarity index 94% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcTaskEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcTaskEntity.java index 22cce6b..5462ad4 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcTaskEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcTaskEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.proc; +package vben.setup.bpm.proc; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; @@ -12,9 +12,9 @@ import java.util.Date; @Data @Entity -@Table(name = "wf_proc_task") +@Table(name = "bpm_proc_task") @Schema(description = "流程任务") -public class WfProcTaskEntity { +public class BpmProcTaskEntity { /** * 主键 diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcTaskHiEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcTaskHiEntity.java similarity index 94% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcTaskHiEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcTaskHiEntity.java index 2a11cc1..07f371d 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcTaskHiEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/proc/BpmProcTaskHiEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.proc; +package vben.setup.bpm.proc; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; @@ -12,9 +12,9 @@ import java.util.Date; @Data @Entity -@Table(name = "wf_proc_task_hi") +@Table(name = "bpm_proc_task_hi") @Schema(description = "流程任务历史") -public class WfProcTaskHiEntity { +public class BpmProcTaskHiEntity { /** * 主键 diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/todo/WfTodoDoneEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/todo/BpmTodoDoneEntity.java similarity index 87% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/todo/WfTodoDoneEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/todo/BpmTodoDoneEntity.java index 62731b7..f7d579d 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/todo/WfTodoDoneEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/todo/BpmTodoDoneEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.todo; +package vben.setup.bpm.todo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; @@ -11,9 +11,9 @@ import java.util.Date; @Entity @Data -@Table(name = "wf_todo_done") +@Table(name = "bpm_todo_done") @Schema(description = "流程待办完结") -public class WfTodoDoneEntity { +public class BpmTodoDoneEntity { @Id @Column(length = 32) diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/todo/WfTodoHistEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/todo/BpmTodoHistEntity.java similarity index 87% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/todo/WfTodoHistEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/todo/BpmTodoHistEntity.java index 211b88e..f11e837 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/todo/WfTodoHistEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/todo/BpmTodoHistEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.todo; +package vben.setup.bpm.todo; import io.swagger.v3.oas.annotations.media.Schema; @@ -9,9 +9,9 @@ import java.util.Date; @Entity @Data -@Table(name = "wf_todo_hist") +@Table(name = "bpm_todo_hist") @Schema(description = "待办历史记录") -public class WfTodoHistEntity { +public class BpmTodoHistEntity { @Id @Column(length = 32) @@ -54,7 +54,7 @@ public class WfTodoHistEntity { private String cruid; // @ManyToMany -// @JoinTable(name = "wf_todo_user", joinColumns = {@JoinColumn(name = "tid")}, +// @JoinTable(name = "bpm_todo_user", joinColumns = {@JoinColumn(name = "tid")}, // inverseJoinColumns = {@JoinColumn(name = "uid")}) // private List tamen; diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/todo/WfTodoMainEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/todo/BpmTodoMainEntity.java similarity index 88% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/todo/WfTodoMainEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/todo/BpmTodoMainEntity.java index 606e7cf..c7163c4 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/todo/WfTodoMainEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/todo/BpmTodoMainEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.todo; +package vben.setup.bpm.todo; import io.swagger.v3.oas.annotations.media.Schema; @@ -12,9 +12,9 @@ import java.util.Date; @Entity @Data -@Table(name = "wf_todo_main") +@Table(name = "bpm_todo_main") @Schema(description = "流程待办") -public class WfTodoMainEntity { +public class BpmTodoMainEntity { @Id @Column(length = 32) @@ -57,7 +57,7 @@ public class WfTodoMainEntity { private String cruid; // @ManyToMany -// @JoinTable(name = "wf_todo_user", joinColumns = {@JoinColumn(name = "tid")}, +// @JoinTable(name = "bpm_todo_user", joinColumns = {@JoinColumn(name = "tid")}, // inverseJoinColumns = {@JoinColumn(name = "uid")}) // private List tamen; diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/todo/WfTodoUserEntity.java b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/todo/BpmTodoUserEntity.java similarity index 85% rename from vben-apps/vben-setup/src/main/java/vben/setup/wf/todo/WfTodoUserEntity.java rename to vben-apps/vben-setup/src/main/java/vben/setup/bpm/todo/BpmTodoUserEntity.java index af6b879..e33a476 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/todo/WfTodoUserEntity.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/bpm/todo/BpmTodoUserEntity.java @@ -1,4 +1,4 @@ -package vben.setup.wf.todo; +package vben.setup.bpm.todo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; @@ -10,9 +10,9 @@ import lombok.Data; @Entity @Data -@Table(name = "wf_todo_user") +@Table(name = "bpm_todo_user") @Schema(description = "用户待办记录") -public class WfTodoUserEntity { +public class BpmTodoUserEntity { @Id @Column(length = 32) diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/root/DataInitService.java b/vben-apps/vben-setup/src/main/java/vben/setup/root/DataInitService.java index 5dfac69..0f4f3f8 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/root/DataInitService.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/root/DataInitService.java @@ -14,7 +14,7 @@ import vben.setup.sys.perm.menu.SysPermMenuInitService; import vben.setup.sys.perm.role.SysPermRoleInitService; import vben.setup.tool.dict.ToolDictInitService; import vben.setup.tool.num.ToolNumInitService; -import vben.setup.wf.bus.WfBusInitService; +import vben.setup.bpm.bus.BpmBusInitService; /** * 数据初始化 @@ -36,9 +36,9 @@ public class DataInitService { groupInitService.init(); menuInitService.initBase(); - menuInitService.initWf(); + menuInitService.initBpm(); apiInitService.initBase(); - apiInitService.initWf(); + apiInitService.initBpm(); roleInitService.init(); configInitService.init(); @@ -48,7 +48,7 @@ public class DataInitService { numInitService.init(); //流程相关数据 - wfBusInitService.init(); + bpmBusInitService.init(); } private final JdbcHelper jdbcHelper; @@ -75,7 +75,7 @@ public class DataInitService { private final ToolNumInitService numInitService; - private final WfBusInitService wfBusInitService; + private final BpmBusInitService bpmBusInitService; } diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/api/SysPermApiInitService.java b/vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/api/SysPermApiInitService.java index 4b54a37..8f49d3c 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/api/SysPermApiInitService.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/api/SysPermApiInitService.java @@ -453,7 +453,7 @@ public class SysPermApiInitService { insert(list); } - public void initWf() { + public void initBpm() { List list = new ArrayList<>(); SysPermApiEntity a603001 = new SysPermApiEntity(); @@ -461,7 +461,7 @@ public class SysPermApiInitService { a603001.setOrnum(603001); a603001.setName("流程查询"); a603001.setMenid(6030L); - a603001.setPerm("wfbus:main:query"); + a603001.setPerm("bpmbus:main:query"); list.add(a603001); SysPermApiEntity a603002 = new SysPermApiEntity(); @@ -469,7 +469,7 @@ public class SysPermApiInitService { a603002.setOrnum(603002); a603002.setName("流程新增"); a603002.setMenid(6030L); - a603002.setPerm("wfbus:main:add"); + a603002.setPerm("bpmbus:main:add"); list.add(a603002); SysPermApiEntity a603003 = new SysPermApiEntity(); @@ -477,7 +477,7 @@ public class SysPermApiInitService { a603003.setOrnum(603003); a603003.setName("流程编辑"); a603003.setMenid(6030L); - a603003.setPerm("wfbus:main:edit"); + a603003.setPerm("bpmbus:main:edit"); list.add(a603003); insert(list); diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/menu/SysPermMenuInitService.java b/vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/menu/SysPermMenuInitService.java index de6ec0d..801f942 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/menu/SysPermMenuInitService.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/menu/SysPermMenuInitService.java @@ -288,14 +288,14 @@ public class SysPermMenuInitService { insert(list); } - public void initWf() { + public void initBpm() { List list=new ArrayList<>(); SysPermMenuEntity m6000 = new SysPermMenuEntity(); m6000.setId(6000L); m6000.setIcon("streamline-sharp:text-flow-rows"); m6000.setName("流程管理"); m6000.setOrnum(6000); - m6000.setPath("wf"); + m6000.setPath("bpm"); m6000.setPid(0L); m6000.setType("1"); m6000.setComp("Layout"); @@ -303,7 +303,7 @@ public class SysPermMenuInitService { SysPermMenuEntity m6010 = new SysPermMenuEntity(); m6010.setId(6010L); - m6010.setComp("wf/bus/cate/index"); + m6010.setComp("bpm/bus/cate/index"); m6010.setIcon("tabler:category-plus"); m6010.setName("流程分类"); m6010.setOrnum(6010); @@ -313,7 +313,7 @@ public class SysPermMenuInitService { SysPermMenuEntity m6020 = new SysPermMenuEntity(); m6020.setId(6020L); - m6020.setComp("wf/bus/tmpl/index"); + m6020.setComp("bpm/bus/tmpl/index"); m6020.setIcon("carbon:prompt-template"); m6020.setName("流程模板"); m6020.setOrnum(6020); @@ -323,7 +323,7 @@ public class SysPermMenuInitService { SysPermMenuEntity m6021 = new SysPermMenuEntity(); m6021.setId(6021L); - m6021.setComp("wf/bus/tmpl/edit"); + m6021.setComp("bpm/bus/tmpl/edit"); m6021.setIcon("carbon:prompt-template"); m6021.setName("流程模板编辑"); m6021.setOrnum(6021); @@ -335,7 +335,7 @@ public class SysPermMenuInitService { SysPermMenuEntity m6030 = new SysPermMenuEntity(); m6030.setId(6030L); - m6030.setComp("wf/bus/main/index"); + m6030.setComp("bpm/bus/main/index"); m6030.setIcon("ri:instance-line"); m6030.setName("流程清单"); m6030.setOrnum(6030); @@ -345,7 +345,7 @@ public class SysPermMenuInitService { SysPermMenuEntity m6031 = new SysPermMenuEntity(); m6031.setId(6031L); - m6031.setComp("wf/bus/main/edit"); + m6031.setComp("bpm/bus/main/edit"); m6031.setIcon("ri:instance-line"); m6031.setName("流程编辑"); m6031.setOrnum(6031); @@ -357,7 +357,7 @@ public class SysPermMenuInitService { SysPermMenuEntity m6032 = new SysPermMenuEntity(); m6032.setId(6032L); - m6032.setComp("wf/bus/main/view"); + m6032.setComp("bpm/bus/main/view"); m6032.setIcon("ri:instance-line"); m6032.setName("流程查看"); m6032.setOrnum(6032); @@ -369,7 +369,7 @@ public class SysPermMenuInitService { SysPermMenuEntity m6040 = new SysPermMenuEntity(); m6040.setId(6040L); - m6040.setComp("wf/todo/index"); + m6040.setComp("bpm/todo/index"); m6040.setIcon("ri:todo-line"); m6040.setName("流程待办"); m6040.setOrnum(6040); @@ -379,7 +379,7 @@ public class SysPermMenuInitService { SysPermMenuEntity m6050 = new SysPermMenuEntity(); m6050.setId(6050L); - m6050.setComp("wf/org/tree/index"); + m6050.setComp("bpm/org/tree/index"); m6050.setIcon("mdi:workflow-outline"); m6050.setName("流程组织"); m6050.setOrnum(6050); @@ -389,7 +389,7 @@ public class SysPermMenuInitService { SysPermMenuEntity m6051 = new SysPermMenuEntity(); m6051.setId(6051L); - m6051.setComp("wf/org/node/index"); + m6051.setComp("bpm/org/node/index"); m6051.setIcon("mdi:workflow-outline"); m6051.setName("流程组织节点"); m6051.setOrnum(6051); diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/role/SysPermRoleInitService.java b/vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/role/SysPermRoleInitService.java index 0aae3f8..286ceb6 100644 --- a/vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/role/SysPermRoleInitService.java +++ b/vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/role/SysPermRoleInitService.java @@ -39,10 +39,10 @@ public class SysPermRoleInitService { role2.setOrgs(List.of(new SysOrg("u6"),new SysOrg("u7"),new SysOrg("u8"),new SysOrg("u9"))); role2.setMenus(menuRepo.findByNameContaining("流程")); List apiList = new ArrayList<>(); - apiList.add(apiRepo.findByPerm("wfbus:main:query")); - apiList.add(apiRepo.findByPerm("wfbus:main:add")); - apiList.add(apiRepo.findByPerm("wfbus:main:edit")); -// apiList.add(apiRepo.findByPerm("wfbus:main:appv")); + apiList.add(apiRepo.findByPerm("bpmbus:main:query")); + apiList.add(apiRepo.findByPerm("bpmbus:main:add")); + apiList.add(apiRepo.findByPerm("bpmbus:main:edit")); +// apiList.add(apiRepo.findByPerm("bpmbus:main:appv")); role2.setApis(apiList); list.add(role2); insert(list); diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusCateRepo.java b/vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusCateRepo.java deleted file mode 100644 index fa0c927..0000000 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusCateRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vben.setup.wf.bus; - - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface WfBusCateRepo extends JpaRepository { - -} diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusTmplRepo.java b/vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusTmplRepo.java deleted file mode 100644 index a457d59..0000000 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/bus/WfBusTmplRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vben.setup.wf.bus; - - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface WfBusTmplRepo extends JpaRepository { - -} diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/org/WfOrgInitService.java b/vben-apps/vben-setup/src/main/java/vben/setup/wf/org/WfOrgInitService.java deleted file mode 100644 index 368a561..0000000 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/org/WfOrgInitService.java +++ /dev/null @@ -1,4 +0,0 @@ -package vben.setup.wf.org; - -public class WfOrgInitService { -} diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcDefRepo.java b/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcDefRepo.java deleted file mode 100644 index 2048bab..0000000 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcDefRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vben.setup.wf.proc; - - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface WfProcDefRepo extends JpaRepository { - -} diff --git a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcInitService.java b/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcInitService.java deleted file mode 100644 index efcc880..0000000 --- a/vben-apps/vben-setup/src/main/java/vben/setup/wf/proc/WfProcInitService.java +++ /dev/null @@ -1,4 +0,0 @@ -package vben.setup.wf.proc; - -public class WfProcInitService { -} diff --git a/vben-apps/vben-setup/src/main/resources/application.yml b/vben-apps/vben-setup/src/main/resources/application.yml index 011aab7..124d99f 100644 --- a/vben-apps/vben-setup/src/main/resources/application.yml +++ b/vben-apps/vben-setup/src/main/resources/application.yml @@ -210,7 +210,7 @@ xss: excludeUrls: - /system/notice - /oa/flow/tmpl - - /wf/bus/tmpl + - /bpm/bus/tmpl --- # 分布式锁 lock4j 全局配置 lock4j: diff --git a/vben-modules/pom.xml b/vben-modules/pom.xml index daacfd8..77a698f 100644 --- a/vben-modules/pom.xml +++ b/vben-modules/pom.xml @@ -11,7 +11,7 @@ vben-base - vben-wf + vben-bpm vben-modules diff --git a/vben-modules/vben-base/src/main/java/vben/base/auth/home/IndexController.java b/vben-modules/vben-base/src/main/java/vben/base/auth/root/IndexController.java similarity index 95% rename from vben-modules/vben-base/src/main/java/vben/base/auth/home/IndexController.java rename to vben-modules/vben-base/src/main/java/vben/base/auth/root/IndexController.java index cd83b47..84eb125 100644 --- a/vben-modules/vben-base/src/main/java/vben/base/auth/home/IndexController.java +++ b/vben-modules/vben-base/src/main/java/vben/base/auth/root/IndexController.java @@ -1,4 +1,4 @@ -package vben.base.auth.home; +package vben.base.auth.root; import cn.dev33.satoken.annotation.SaIgnore; import lombok.RequiredArgsConstructor; diff --git a/vben-modules/vben-wf/pom.xml b/vben-modules/vben-bpm/pom.xml similarity index 97% rename from vben-modules/vben-wf/pom.xml rename to vben-modules/vben-bpm/pom.xml index 35fdb13..7c37e82 100644 --- a/vben-modules/vben-wf/pom.xml +++ b/vben-modules/vben-bpm/pom.xml @@ -9,7 +9,7 @@ ${revision} - vben-wf + vben-bpm 工作流模块 diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/bus/cate/WfBusCate.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/cate/BpmBusCate.java similarity index 87% rename from vben-modules/vben-wf/src/main/java/vben/wf/bus/cate/WfBusCate.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/bus/cate/BpmBusCate.java index 1928f57..24a958d 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/bus/cate/WfBusCate.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/cate/BpmBusCate.java @@ -1,4 +1,4 @@ -package vben.wf.bus.cate; +package vben.bpm.bus.cate; import lombok.Data; @@ -10,7 +10,7 @@ import java.util.List; * 流程分类 */ @Data -public class WfBusCate { +public class BpmBusCate { /** * 主键ID @@ -30,7 +30,7 @@ public class WfBusCate { /** * 子菜单 */ - private List children = new ArrayList<>(); + private List children = new ArrayList<>(); /** * 是否可用 diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/bus/cate/WfBusCateApi.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/cate/BpmBusCateApi.java similarity index 80% rename from vben-modules/vben-wf/src/main/java/vben/wf/bus/cate/WfBusCateApi.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/bus/cate/BpmBusCateApi.java index aa249c9..3155c93 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/bus/cate/WfBusCateApi.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/cate/BpmBusCateApi.java @@ -1,4 +1,4 @@ -package vben.wf.bus.cate; +package vben.bpm.bus.cate; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -12,11 +12,11 @@ import java.util.List; * 流程分类管理 */ @RestController -@RequestMapping("wf/bus/cate") +@RequestMapping("bpm/bus/cate") @RequiredArgsConstructor -public class WfBusCateApi { +public class BpmBusCateApi { - private final WfBusCateService service; + private final BpmBusCateService service; /** * 流程分类列表查询 @@ -24,8 +24,8 @@ public class WfBusCateApi { * @return 分类列表集合 */ @GetMapping("list") - public R> list(String name) { - Sqler sqler = new Sqler("t.*","wf_bus_cate"); + public R> list(String name) { + Sqler sqler = new Sqler("t.*","bpm_bus_cate"); //sqler.addSelect("t.pid,t.notes,t.crtim,t.uptim,t.ornum"); sqler.addLike("t.name", name); sqler.addOrder("t.ornum"); @@ -49,8 +49,8 @@ public class WfBusCateApi { * @return 流程分类对象 */ @GetMapping("info/{id}") - public R info(@PathVariable Long id) { - WfBusCate main = service.findById(id); + public R info(@PathVariable Long id) { + BpmBusCate main = service.findById(id); return R.ok(main); } @@ -60,7 +60,7 @@ public class WfBusCateApi { * @return 流程分类ID */ @PostMapping - public R post(@RequestBody WfBusCate main) { + public R post(@RequestBody BpmBusCate main) { if(main.getPid()==null){ main.setPid(0L); } @@ -74,7 +74,7 @@ public class WfBusCateApi { * @return 流程分类ID */ @PutMapping - public R put(@RequestBody WfBusCate main) { + public R put(@RequestBody BpmBusCate main) { if(main.getPid()==null){ main.setPid(0L); } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/bus/cate/WfBusCateDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/cate/BpmBusCateDao.java similarity index 77% rename from vben-modules/vben-wf/src/main/java/vben/wf/bus/cate/WfBusCateDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/bus/cate/BpmBusCateDao.java index 9bedf20..aa6bdec 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/bus/cate/WfBusCateDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/cate/BpmBusCateDao.java @@ -1,4 +1,4 @@ -package vben.wf.bus.cate; +package vben.bpm.bus.cate; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -14,16 +14,16 @@ import java.util.List; @Component @RequiredArgsConstructor -public class WfBusCateDao { +public class BpmBusCateDao { - public WfBusCate findById(Long id) { - String sql = "select * from wf_bus_cate where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfBusCate.class), id); + public BpmBusCate findById(Long id) { + String sql = "select * from bpm_bus_cate where id = ?"; + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmBusCate.class), id); } - public void insert(WfBusCate cate) { + public void insert(BpmBusCate cate) { cate.setId(IdUtils.getSnowflakeNextId()); - Isqler isqler = new Isqler("wf_bus_cate"); + Isqler isqler = new Isqler("bpm_bus_cate"); isqler.add("id", cate.getId()); isqler.add("name", cate.getName()); isqler.add("pid", cate.getPid()); @@ -37,8 +37,8 @@ public class WfBusCateDao { jdbcHelper.getTp().update(isqler.getSql(), isqler.getParams()); } - public void update(WfBusCate cate) { - Usqler usqler = new Usqler("wf_bus_cate"); + public void update(BpmBusCate cate) { + Usqler usqler = new Usqler("bpm_bus_cate"); usqler.addWhere("id=?", cate.getId()); usqler.add("name", cate.getName()); usqler.add("pid", cate.getPid()); @@ -51,12 +51,12 @@ public class WfBusCateDao { } public void deleteById(Long id) { - String sql = "delete from wf_bus_cate where id=?"; + String sql = "delete from bpm_bus_cate where id=?"; jdbcHelper.getTp().update(sql, id); } public List findTree(Long id){ - Sqler sqler = new Sqler("wf_bus_cate"); + Sqler sqler = new Sqler("bpm_bus_cate"); sqler.addSelect("pid"); sqler.addWhere("t.avtag = 1"); if (id!=null) { @@ -67,9 +67,9 @@ public class WfBusCateDao { return jdbcHelper.findStreeList(sqler); } - public List findList(Sqler sqler) { + public List findList(Sqler sqler) { return jdbcHelper.getTp().query(sqler.getSql(), sqler.getParams(), - new BeanPropertyRowMapper<>(WfBusCate.class)); + new BeanPropertyRowMapper<>(BpmBusCate.class)); } private final JdbcHelper jdbcHelper; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/bus/cate/WfBusCateService.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/cate/BpmBusCateService.java similarity index 78% rename from vben-modules/vben-wf/src/main/java/vben/wf/bus/cate/WfBusCateService.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/bus/cate/BpmBusCateService.java index 591e527..a74bfa5 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/bus/cate/WfBusCateService.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/cate/BpmBusCateService.java @@ -1,4 +1,4 @@ -package vben.wf.bus.cate; +package vben.bpm.bus.cate; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -13,15 +13,15 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) @RequiredArgsConstructor -public class WfBusCateService { +public class BpmBusCateService { @Transactional(readOnly = true) - public List findList(Sqler sqler) { + public List findList(Sqler sqler) { return dao.findList(sqler); } @Transactional(readOnly = true) - public WfBusCate findById(Long id) { + public BpmBusCate findById(Long id) { return dao.findById(id); } @@ -30,12 +30,12 @@ public class WfBusCateService { return dao.findTree(id); } - public void insert(WfBusCate main) { + public void insert(BpmBusCate main) { main.setCruid(LoginHelper.getUserId()); dao.insert(main); } - public void update(WfBusCate main) { + public void update(BpmBusCate main) { main.setUpuid(LoginHelper.getUserId()); main.setUptim(new Date()); dao.update(main); @@ -48,6 +48,6 @@ public class WfBusCateService { return ids.length; } - private final WfBusCateDao dao; + private final BpmBusCateDao dao; } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/bus/leave/WfBusLeave.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/leave/BpmBusLeave.java similarity index 90% rename from vben-modules/vben-wf/src/main/java/vben/wf/bus/leave/WfBusLeave.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/bus/leave/BpmBusLeave.java index b5f65a7..af9ece7 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/bus/leave/WfBusLeave.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/leave/BpmBusLeave.java @@ -1,7 +1,7 @@ -package vben.wf.bus.leave; +package vben.bpm.bus.leave; import lombok.Data; -import vben.wf.bus.main.WfBusMain; +import vben.bpm.bus.main.BpmBusMain; import java.util.Date; @@ -9,7 +9,7 @@ import java.util.Date; * 请假申请 */ @Data -public class WfBusLeave { +public class BpmBusLeave { //<<<----------------------BaseMainEntity字段开始----------------------- /** @@ -86,6 +86,6 @@ public class WfBusLeave { /** * 流程对象 */ - private WfBusMain flowBo; + private BpmBusMain flowBo; } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/bus/leave/WfBusLeaveApi.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/leave/BpmBusLeaveApi.java similarity index 75% rename from vben-modules/vben-wf/src/main/java/vben/wf/bus/leave/WfBusLeaveApi.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/bus/leave/BpmBusLeaveApi.java index 446d3a4..c646f07 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/bus/leave/WfBusLeaveApi.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/leave/BpmBusLeaveApi.java @@ -1,4 +1,4 @@ -package vben.wf.bus.leave; +package vben.bpm.bus.leave; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -10,11 +10,11 @@ import vben.common.jdbc.sqler.Sqler; * 请假申请 */ @RestController -@RequestMapping("wf/bus/leave") +@RequestMapping("bpm/bus/leave") @RequiredArgsConstructor -public class WfBusLeaveApi { +public class BpmBusLeaveApi { - private final WfBusLeaveService service; + private final BpmBusLeaveService service; /** * 请假分页查询 @@ -23,7 +23,7 @@ public class WfBusLeaveApi { */ @GetMapping public R get(String name) { - Sqler sqler = new Sqler("wf_bus_leave"); + Sqler sqler = new Sqler("bpm_bus_leave"); sqler.addLike("t.name", name); sqler.addSelect("t.notes"); return R.ok(service.findPageData(sqler)); @@ -35,8 +35,8 @@ public class WfBusLeaveApi { * @return 请假对象 */ @GetMapping("info/{id}") - public R info(@PathVariable Long id) { - WfBusLeave main = service.findById(id); + public R info(@PathVariable Long id) { + BpmBusLeave main = service.findById(id); return R.ok(main); } @@ -46,7 +46,7 @@ public class WfBusLeaveApi { * @return 请假ID */ @PostMapping - public R post(@RequestBody WfBusLeave main) { + public R post(@RequestBody BpmBusLeave main) { return R.ok(null,service.insert(main)); } @@ -56,7 +56,7 @@ public class WfBusLeaveApi { * @return 请假ID */ @PutMapping - public R put(@RequestBody WfBusLeave main) throws Exception { + public R put(@RequestBody BpmBusLeave main) throws Exception { return R.ok(null,service.update(main)); } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/bus/leave/WfBusLeaveDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/leave/BpmBusLeaveDao.java similarity index 86% rename from vben-modules/vben-wf/src/main/java/vben/wf/bus/leave/WfBusLeaveDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/bus/leave/BpmBusLeaveDao.java index 0aa25ff..46557cb 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/bus/leave/WfBusLeaveDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/leave/BpmBusLeaveDao.java @@ -1,4 +1,4 @@ -package vben.wf.bus.leave; +package vben.bpm.bus.leave; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; @@ -14,21 +14,21 @@ import java.lang.reflect.Field; @Component @RequiredArgsConstructor -public class WfBusLeaveDao { +public class BpmBusLeaveDao { - private static final String table = "wf_bus_leave"; + private static final String table = "bpm_bus_leave"; public PageData findPageData(Sqler sqler) { return jdbcHelper.findPageData(sqler); } - public WfBusLeave findById(Long id) { + public BpmBusLeave findById(Long id) { String sql = "select * from "+table+" where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfBusLeave.class), id); + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmBusLeave.class), id); } @SneakyThrows - public void insert(WfBusLeave main) { + public void insert(BpmBusLeave main) { Isqler sqler = new Isqler(table); Class clazz = main.getClass(); Field[] fields = clazz.getDeclaredFields(); @@ -42,7 +42,7 @@ public class WfBusLeaveDao { } @SneakyThrows - public void update(WfBusLeave main) { + public void update(BpmBusLeave main) { Usqler sqler = new Usqler(table); sqler.addWhere("id=?", main.getId()); Class clazz = main.getClass(); diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/bus/leave/WfBusLeaveService.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/leave/BpmBusLeaveService.java similarity index 71% rename from vben-modules/vben-wf/src/main/java/vben/wf/bus/leave/WfBusLeaveService.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/bus/leave/BpmBusLeaveService.java index 796c85a..8cb97ed 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/bus/leave/WfBusLeaveService.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/leave/BpmBusLeaveService.java @@ -1,4 +1,4 @@ -package vben.wf.bus.leave; +package vben.bpm.bus.leave; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -8,25 +8,25 @@ import vben.common.core.utils.IdUtils; import vben.common.jdbc.dto.PageData; import vben.common.jdbc.sqler.Sqler; import vben.common.satoken.utils.LoginHelper; -import vben.wf.bus.main.WfBusMain; -import vben.wf.bus.main.WfBusMainService; +import vben.bpm.bus.main.BpmBusMain; +import vben.bpm.bus.main.BpmBusMainService; import java.util.Date; @Service @Transactional(rollbackFor = Exception.class) @RequiredArgsConstructor -public class WfBusLeaveService { +public class BpmBusLeaveService { public PageData findPageData(Sqler sqler) { return dao.findPageData(sqler); } - public WfBusLeave findById(Long id) { + public BpmBusLeave findById(Long id) { return dao.findById(id); } - public Long insert(WfBusLeave main) { + public Long insert(BpmBusLeave main) { if(main.getSttim() != null&&main.getEntim()!=null) { long day = DateUtils.betweenDay(main.getSttim(), main.getEntim(), true); main.setDays((int) day + 1); @@ -37,22 +37,22 @@ public class WfBusLeaveService { //启动流程 - WfBusMain flowBo = main.getFlowBo(); + BpmBusMain flowBo = main.getFlowBo(); flowBo.setId(Long.valueOf(main.getId())); flowBo.setCruid(main.getCruid()); - wfBusMainService.insert(flowBo); + bpmBusMainService.insert(flowBo); return main.getId(); } - public Long update(WfBusLeave main) { + public Long update(BpmBusLeave main) { main.setUpuid(LoginHelper.getUserId()); main.setUptim(new Date()); dao.update(main); //流转流程 - WfBusMain flowBo = main.getFlowBo(); - wfBusMainService.update(flowBo); + BpmBusMain flowBo = main.getFlowBo(); + bpmBusMainService.update(flowBo); return main.getId(); } @@ -63,7 +63,7 @@ public class WfBusLeaveService { return ids.length; } - private final WfBusMainService wfBusMainService; + private final BpmBusMainService bpmBusMainService; - private final WfBusLeaveDao dao; + private final BpmBusLeaveDao dao; } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/bus/main/WfBusMain.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/main/BpmBusMain.java similarity index 85% rename from vben-modules/vben-wf/src/main/java/vben/wf/bus/main/WfBusMain.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/bus/main/BpmBusMain.java index 6107e9e..d28c500 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/bus/main/WfBusMain.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/main/BpmBusMain.java @@ -1,8 +1,8 @@ -package vben.wf.bus.main; +package vben.bpm.bus.main; import lombok.Data; -import vben.wf.root.domain.Zproc; -import vben.wf.root.domain.bo.WfStartBo; +import vben.bpm.root.domain.Zproc; +import vben.bpm.root.domain.bo.BpmStartBo; import java.util.Date; @@ -10,7 +10,7 @@ import java.util.Date; * 流程记录 */ @Data -public class WfBusMain { +public class BpmBusMain { /** * 主键ID @@ -85,5 +85,5 @@ public class WfBusMain { /** * 流程启动对象 */ - private WfStartBo wfStartBo; + private BpmStartBo bpmStartBo; } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/bus/main/WfBusMainApi.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/main/BpmBusMainApi.java similarity index 69% rename from vben-modules/vben-wf/src/main/java/vben/wf/bus/main/WfBusMainApi.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/bus/main/BpmBusMainApi.java index e6f0c20..8204486 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/bus/main/WfBusMainApi.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/main/BpmBusMainApi.java @@ -1,4 +1,4 @@ -package vben.wf.bus.main; +package vben.bpm.bus.main; import cn.dev33.satoken.annotation.SaCheckPermission; import lombok.RequiredArgsConstructor; @@ -11,21 +11,21 @@ import vben.common.jdbc.sqler.Sqler; * 流程记录管理 */ @RestController -@RequestMapping("wf/bus/main") +@RequestMapping("bpm/bus/main") @RequiredArgsConstructor -public class WfBusMainApi { +public class BpmBusMainApi { - private final WfBusMainService service; + private final BpmBusMainService service; /** * 流程分页查询 * @param name 流程主题 * @return 分页数据 */ - @SaCheckPermission("wfbus:main:query") + @SaCheckPermission("bpmbus:main:query") @GetMapping public R get(String name) { - Sqler sqler = new Sqler("wf_bus_main"); + Sqler sqler = new Sqler("bpm_bus_main"); sqler.addLike("t.name", name); sqler.addSelect("t.state,t.notes"); sqler.addDescOrder("t.crtim"); @@ -38,10 +38,10 @@ public class WfBusMainApi { * @param id 流程ID * @return 流程对象 */ - @SaCheckPermission("wfbus:main:query") + @SaCheckPermission("bpmbus:main:query") @GetMapping("info/{id}") - public R info(@PathVariable Long id) { - WfBusMain main = service.findById(id); + public R info(@PathVariable Long id) { + BpmBusMain main = service.findById(id); return R.ok(main); } @@ -50,9 +50,9 @@ public class WfBusMainApi { * @param main 流程对象 * @return 流程ID */ - @SaCheckPermission("wfbus:main:add") + @SaCheckPermission("bpmbus:main:add") @PostMapping - public R post(@RequestBody WfBusMain main) { + public R post(@RequestBody BpmBusMain main) { return R.ok(null,service.insert(main)); } @@ -61,9 +61,9 @@ public class WfBusMainApi { * @param main 流程对象 * @return 流程ID */ - @SaCheckPermission("wfbus:main:edit") + @SaCheckPermission("bpmbus:main:edit") @PutMapping - public R put(@RequestBody WfBusMain main) throws Exception { + public R put(@RequestBody BpmBusMain main) throws Exception { return R.ok(null,service.update(main)); } @@ -72,7 +72,7 @@ public class WfBusMainApi { * @param ids 流程ID串 * @return 流程数量 */ - @SaCheckPermission("wfbus:main:delete") + @SaCheckPermission("bpmbus:main:delete") @DeleteMapping("{ids}") public R delete(@PathVariable Long[] ids) { return R.ok(service.delete(ids)); diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/bus/main/WfBusMainDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/main/BpmBusMainDao.java similarity index 79% rename from vben-modules/vben-wf/src/main/java/vben/wf/bus/main/WfBusMainDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/bus/main/BpmBusMainDao.java index ed0dbf6..c8a9968 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/bus/main/WfBusMainDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/main/BpmBusMainDao.java @@ -1,4 +1,4 @@ -package vben.wf.bus.main; +package vben.bpm.bus.main; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -11,19 +11,19 @@ import vben.common.jdbc.sqler.Usqler; @Component @RequiredArgsConstructor -public class WfBusMainDao { +public class BpmBusMainDao { public PageData findPageData(Sqler sqler) { return jdbcHelper.findPageData(sqler); } - public WfBusMain findById(Long id) { - String sql = "select * from wf_bus_main where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfBusMain.class), id); + public BpmBusMain findById(Long id) { + String sql = "select * from bpm_bus_main where id = ?"; + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmBusMain.class), id); } - public void insert(WfBusMain main) { - Isqler sqler = new Isqler("wf_bus_main"); + public void insert(BpmBusMain main) { + Isqler sqler = new Isqler("bpm_bus_main"); sqler.add("id", main.getId()); sqler.add("name", main.getName()); sqler.add("avtag", main.getAvtag()); @@ -39,8 +39,8 @@ public class WfBusMainDao { jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams()); } - public void update(WfBusMain main) { - Usqler sqler = new Usqler("wf_bus_main"); + public void update(BpmBusMain main) { + Usqler sqler = new Usqler("bpm_bus_main"); sqler.addWhere("id=?", main.getId()); sqler.add("name", main.getName()); sqler.add("avtag", main.getAvtag()); @@ -57,13 +57,13 @@ public class WfBusMainDao { } public void deleteById(Long id) { - String sql = "delete from wf_bus_main where id=?"; + String sql = "delete from bpm_bus_main where id=?"; jdbcHelper.getTp().update(sql, id); } - public void updateState(WfBusMain main) { - Usqler sqler = new Usqler("wf_bus_main"); + public void updateState(BpmBusMain main) { + Usqler sqler = new Usqler("bpm_bus_main"); sqler.addWhere("id=?", main.getId()); sqler.add("state", main.getState()); jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams()); diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/bus/main/WfBusMainService.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/main/BpmBusMainService.java similarity index 77% rename from vben-modules/vben-wf/src/main/java/vben/wf/bus/main/WfBusMainService.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/bus/main/BpmBusMainService.java index ce760b0..2305889 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/bus/main/WfBusMainService.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/main/BpmBusMainService.java @@ -1,4 +1,4 @@ -package vben.wf.bus.main; +package vben.bpm.bus.main; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -9,8 +9,8 @@ import vben.common.core.utils.StrUtils; import vben.common.jdbc.dto.PageData; import vben.common.jdbc.sqler.Sqler; import vben.common.satoken.utils.LoginHelper; -import vben.wf.root.WfService; -import vben.wf.root.domain.Zproc; +import vben.bpm.root.BpmService; +import vben.bpm.root.domain.Zproc; import java.util.Date; @@ -18,14 +18,14 @@ import java.util.Date; @Service @RequiredArgsConstructor @Transactional(rollbackFor = Exception.class) -public class WfBusMainService { +public class BpmBusMainService { @Transactional(readOnly = true) public PageData findPageData(Sqler sqler) { return dao.findPageData(sqler); } - public Long insert(WfBusMain main) { + public Long insert(BpmBusMain main) { if(main.getCruid() == null) { main.setCruid(LoginHelper.getUserId()); } @@ -41,12 +41,12 @@ public class WfBusMainService { zproc.setProna(main.getName()); zproc.setInuid(main.getCruid()); zproc.setPrdid(main.getPrdid()); - zproc.setAtids(main.getWfStartBo().getAtids()); - zproc.setOpnot(main.getWfStartBo().getOpnot()); - zproc.setOpurg(main.getWfStartBo().getOpurg()); + zproc.setAtids(main.getBpmStartBo().getAtids()); + zproc.setOpnot(main.getBpmStartBo().getOpnot()); + zproc.setOpurg(main.getBpmStartBo().getOpurg()); try { - wfService.start(zproc); + bpmService.start(zproc); } catch (Exception e) { e.printStackTrace(); throw new ServiceException("流程启动异常："+e.getMessage()); @@ -54,7 +54,7 @@ public class WfBusMainService { return main.getId(); } - public Long update(WfBusMain main) { + public Long update(BpmBusMain main) { main.setUpuid(LoginHelper.getUserId()); main.setUptim(new Date()); dao.update(main); @@ -62,7 +62,7 @@ public class WfBusMainService { main.getZproc().setProna(main.getName()); main.getZproc().setProid(main.getId()); main.getZproc().setInuid(main.getCruid()); - String state= wfService.flow(main.getZproc()); + String state= bpmService.flow(main.getZproc()); if(StrUtils.isNotBlank(state)){ main.setState(state); dao.update(main); @@ -71,7 +71,7 @@ public class WfBusMainService { } @Transactional(readOnly = true) - public WfBusMain findById(Long id) { + public BpmBusMain findById(Long id) { return dao.findById(id); } @@ -83,9 +83,9 @@ public class WfBusMainService { return ids.length; } - private final WfService wfService; + private final BpmService bpmService; - private final WfBusMainDao dao; + private final BpmBusMainDao dao; } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/bus/tmpl/WfBusTmpl.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/tmpl/BpmBusTmpl.java similarity index 92% rename from vben-modules/vben-wf/src/main/java/vben/wf/bus/tmpl/WfBusTmpl.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/bus/tmpl/BpmBusTmpl.java index a41ac09..2002d2f 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/bus/tmpl/WfBusTmpl.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/tmpl/BpmBusTmpl.java @@ -1,4 +1,4 @@ -package vben.wf.bus.tmpl; +package vben.bpm.bus.tmpl; import lombok.Data; @@ -8,7 +8,7 @@ import java.util.Date; * 流程模板 */ @Data -public class WfBusTmpl { +public class BpmBusTmpl { /** * 主键ID @@ -63,7 +63,7 @@ public class WfBusTmpl { /** * 流程定义XML */ - private String wfXml; + private String bpmXml; /** * 流程定义ID diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/bus/tmpl/WfBusTmplApi.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/tmpl/BpmBusTmplApi.java similarity index 81% rename from vben-modules/vben-wf/src/main/java/vben/wf/bus/tmpl/WfBusTmplApi.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/bus/tmpl/BpmBusTmplApi.java index 4260f87..c408e4e 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/bus/tmpl/WfBusTmplApi.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/tmpl/BpmBusTmplApi.java @@ -1,4 +1,4 @@ -package vben.wf.bus.tmpl; +package vben.bpm.bus.tmpl; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -14,11 +14,11 @@ import java.util.List; * 流程模板 */ @RestController -@RequestMapping("wf/bus/tmpl") +@RequestMapping("bpm/bus/tmpl") @RequiredArgsConstructor -public class WfBusTmplApi { +public class BpmBusTmplApi { - private final WfBusTmplService service; + private final BpmBusTmplService service; /** * 流程模板树状查询 @@ -37,7 +37,7 @@ public class WfBusTmplApi { */ @GetMapping public R get(String name) { - Sqler sqler = new Sqler("wf_bus_tmpl"); + Sqler sqler = new Sqler("bpm_bus_tmpl"); sqler.addLike("t.name", name); sqler.addOrder("t.ornum"); sqler.selectCUinfo(); @@ -51,7 +51,7 @@ public class WfBusTmplApi { */ @GetMapping("list") public R> list(Long catid) { - Sqler sqler = new Sqler("wf_bus_tmpl"); + Sqler sqler = new Sqler("bpm_bus_tmpl"); sqler.addEqual("t.catid", catid); sqler.addOrder("t.ornum"); return R.ok(service.findIdNameList(sqler)); @@ -63,8 +63,8 @@ public class WfBusTmplApi { * @return */ @GetMapping("info/{id}") - public R info(@PathVariable Long id) { - WfBusTmpl main = service.findById(id); + public R info(@PathVariable Long id) { + BpmBusTmpl main = service.findById(id); return R.ok(main); } @@ -74,7 +74,7 @@ public class WfBusTmplApi { * @return 流程模板ID */ @PostMapping - public R post(@RequestBody WfBusTmpl main) { + public R post(@RequestBody BpmBusTmpl main) { return R.ok(null,service.insert(main)); } @@ -84,7 +84,7 @@ public class WfBusTmplApi { * @return 流程模板ID */ @PutMapping - public R put(@RequestBody WfBusTmpl main) { + public R put(@RequestBody BpmBusTmpl main) { return R.ok(null,service.update(main)); } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/bus/tmpl/WfBusTmplDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/tmpl/BpmBusTmplDao.java similarity index 80% rename from vben-modules/vben-wf/src/main/java/vben/wf/bus/tmpl/WfBusTmplDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/bus/tmpl/BpmBusTmplDao.java index bc91bf2..492fece 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/bus/tmpl/WfBusTmplDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/tmpl/BpmBusTmplDao.java @@ -1,4 +1,4 @@ -package vben.wf.bus.tmpl; +package vben.bpm.bus.tmpl; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -9,17 +9,17 @@ import vben.common.jdbc.sqler.Usqler; @Component @RequiredArgsConstructor -public class WfBusTmplDao { +public class BpmBusTmplDao { - public WfBusTmpl findById(Long id) { - String sql = "select * from wf_bus_tmpl where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfBusTmpl.class), id); + public BpmBusTmpl findById(Long id) { + String sql = "select * from bpm_bus_tmpl where id = ?"; + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmBusTmpl.class), id); } - public void insert(WfBusTmpl main) { - Isqler sqler = new Isqler("wf_bus_tmpl"); + public void insert(BpmBusTmpl main) { + Isqler sqler = new Isqler("bpm_bus_tmpl"); sqler.add("id", main.getId()); sqler.add("name", main.getName()); sqler.add("avtag", main.getAvtag()); @@ -38,8 +38,8 @@ public class WfBusTmplDao { jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams()); } - public void update(WfBusTmpl main) { - Usqler sqler = new Usqler("wf_bus_tmpl"); + public void update(BpmBusTmpl main) { + Usqler sqler = new Usqler("bpm_bus_tmpl"); sqler.addWhere("id=?", main.getId()); sqler.add("name", main.getName()); sqler.add("avtag", main.getAvtag()); @@ -57,7 +57,7 @@ public class WfBusTmplDao { } public void deleteById(Long id) { - String sql = "delete from wf_bus_tmpl where id=?"; + String sql = "delete from bpm_bus_tmpl where id=?"; jdbcHelper.getTp().update(sql, id); } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/bus/tmpl/WfBusTmplService.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/tmpl/BpmBusTmplService.java similarity index 73% rename from vben-modules/vben-wf/src/main/java/vben/wf/bus/tmpl/WfBusTmplService.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/bus/tmpl/BpmBusTmplService.java index a4f3532..ffc49f5 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/bus/tmpl/WfBusTmplService.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/bus/tmpl/BpmBusTmplService.java @@ -1,8 +1,9 @@ -package vben.wf.bus.tmpl; +package vben.bpm.bus.tmpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import vben.bpm.proc.def.BpmProcDef; import vben.common.core.utils.IdUtils; import vben.common.jdbc.dto.PageData; import vben.common.jdbc.dto.SidName; @@ -10,8 +11,7 @@ import vben.common.jdbc.dto.Stree; import vben.common.jdbc.sqler.JdbcHelper; import vben.common.jdbc.sqler.Sqler; import vben.common.satoken.utils.LoginHelper; -import vben.wf.proc.def.WfProcDef; -import vben.wf.proc.def.WfProcDefDao; +import vben.bpm.proc.def.BpmProcDefDao; import java.util.Date; import java.util.List; @@ -20,7 +20,7 @@ import java.util.List; @Service @RequiredArgsConstructor @Transactional(rollbackFor = Exception.class) -public class WfBusTmplService { +public class BpmBusTmplService { @Transactional(readOnly = true) public PageData findPageData(Sqler sqler) { @@ -30,8 +30,8 @@ public class WfBusTmplService { public List findTreeList() { String sql="SELECT id,pid,name,TYPE FROM ( " + - " SELECT id,pid,name,'cate' type,ORNUM FROM wf_bus_cate WHERE avtag=1 " + - " UNION ALL SELECT id,catid AS pid,name,'tmpl' type,ORNUM FROM wf_bus_tmpl WHERE avtag=1 " + + " SELECT id,pid,name,'cate' type,ORNUM FROM bpm_bus_cate WHERE avtag=1 " + + " UNION ALL SELECT id,catid AS pid,name,'tmpl' type,ORNUM FROM bpm_bus_tmpl WHERE avtag=1 " + ")t ORDER BY ornum"; // List list = jdbcHelper.getTp().query(sql, new BeanPropertyRowMapper<>(ZflatTree.class)); return jdbcHelper.findStreeList(sql); @@ -42,34 +42,34 @@ public class WfBusTmplService { return jdbcHelper.findSidNameList(sqler); } - public Long insert(WfBusTmpl main) { + public Long insert(BpmBusTmpl main) { main.setId(IdUtils.getSnowflakeNextId()); main.setCruid(LoginHelper.getUserId()); - saveWfDef(main); + saveBpmDef(main); tmplDao.insert(main); return main.getId(); } - public Long update(WfBusTmpl main) { - saveWfDef(main); + public Long update(BpmBusTmpl main) { + saveBpmDef(main); main.setUpuid(LoginHelper.getUserId()); main.setUptim(new Date()); tmplDao.update(main); return main.getId(); } - private void saveWfDef(WfBusTmpl main) { - WfProcDef def = new WfProcDef(); + private void saveBpmDef(BpmBusTmpl main) { + BpmProcDef def = new BpmProcDef(); def.setId(IdUtils.getSnowflakeNextId()); def.setName(main.getName()); - def.setDixml(main.getWfXml()); + def.setDixml(main.getBpmXml()); String exxml = "" - + "\n"; def.setExxml(exxml); def.setBusid(main.getId()); - wfProcDefDao.insert(def); + bpmProcDefDao.insert(def); main.setPrdid(def.getId()); } @@ -81,14 +81,14 @@ public class WfBusTmplService { } @Transactional(readOnly = true) - public WfBusTmpl findById(Long id) { + public BpmBusTmpl findById(Long id) { return tmplDao.findById(id); } - private final WfProcDefDao wfProcDefDao; + private final BpmProcDefDao bpmProcDefDao; - private final WfBusTmplDao tmplDao; + private final BpmBusTmplDao tmplDao; private final JdbcHelper jdbcHelper; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/form/def/WfFormDef.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/form/def/BpmFormDef.java similarity index 89% rename from vben-modules/vben-wf/src/main/java/vben/wf/form/def/WfFormDef.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/form/def/BpmFormDef.java index d67adff..b66ffbd 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/form/def/WfFormDef.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/form/def/BpmFormDef.java @@ -1,4 +1,4 @@ -package vben.wf.form.def; +package vben.bpm.form.def; import lombok.Data; @@ -8,7 +8,7 @@ import java.util.Date; @Data -public class WfFormDef implements Serializable { +public class BpmFormDef implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/form/def/WfFormDefDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/form/def/BpmFormDefDao.java similarity index 66% rename from vben-modules/vben-wf/src/main/java/vben/wf/form/def/WfFormDefDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/form/def/BpmFormDefDao.java index a0bc699..e9b493f 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/form/def/WfFormDefDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/form/def/BpmFormDefDao.java @@ -1,4 +1,4 @@ -package vben.wf.form.def; +package vben.bpm.form.def; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -10,16 +10,16 @@ import vben.common.jdbc.sqler.Usqler; @Component @RequiredArgsConstructor -public class WfFormDefDao { +public class BpmFormDefDao { - public WfFormDef findById(Long id) { - String sql = "select * from wf_proc_def where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfFormDef.class), id); + public BpmFormDef findById(Long id) { + String sql = "select * from bpm_proc_def where id = ?"; + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmFormDef.class), id); } - public void insert(WfFormDef main) { - Isqler sqler = new Isqler("wf_form_def"); + public void insert(BpmFormDef main) { + Isqler sqler = new Isqler("bpm_form_def"); if(main.getId()==null){ main.setId(IdUtils.getSnowflakeNextId()); } @@ -28,15 +28,15 @@ public class WfFormDefDao { jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams()); } - public void update(WfFormDef main) { - Usqler sqler = new Usqler("wf_form_def"); + public void update(BpmFormDef main) { + Usqler sqler = new Usqler("bpm_form_def"); sqler.addWhere("id=?", main.getId()); sqler.add("venum", main.getVenum()); jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams()); } public void deleteById(Long id) { - jdbcHelper.update("delete from wf_form_def where id=?", id); + jdbcHelper.update("delete from bpm_form_def where id=?", id); } private final JdbcHelper jdbcHelper; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/form/inst/WfFormInst.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/form/inst/BpmFormInst.java similarity index 80% rename from vben-modules/vben-wf/src/main/java/vben/wf/form/inst/WfFormInst.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/form/inst/BpmFormInst.java index e6b26e3..e9b20e7 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/form/inst/WfFormInst.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/form/inst/BpmFormInst.java @@ -1,4 +1,4 @@ -package vben.wf.form.inst; +package vben.bpm.form.inst; import lombok.Data; @@ -7,7 +7,7 @@ import java.io.Serializable; @Data -public class WfFormInst implements Serializable { +public class BpmFormInst implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/org/node/WfOrgNode.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/node/BpmOrgNode.java similarity index 82% rename from vben-modules/vben-wf/src/main/java/vben/wf/org/node/WfOrgNode.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/org/node/BpmOrgNode.java index 97798f1..e662f89 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/org/node/WfOrgNode.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/node/BpmOrgNode.java @@ -1,4 +1,4 @@ -package vben.wf.org.node; +package vben.bpm.org.node; import lombok.Data; @@ -8,7 +8,7 @@ import java.util.List; //层级节点 @Data -public class WfOrgNode { +public class BpmOrgNode { /** * 主键ID @@ -23,7 +23,7 @@ public class WfOrgNode { /** * 子节点 */ - private List children = new ArrayList<>(); //行项目 + private List children = new ArrayList<>(); //行项目 /** * 父ID @@ -71,10 +71,10 @@ public class WfOrgNode { */ private String memna; - public WfOrgNode() { + public BpmOrgNode() { } - public WfOrgNode(String id) { + public BpmOrgNode(String id) { this.id = id; } } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/org/node/WfOrgNodeApi.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/node/BpmOrgNodeApi.java similarity index 86% rename from vben-modules/vben-wf/src/main/java/vben/wf/org/node/WfOrgNodeApi.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/org/node/BpmOrgNodeApi.java index 5d949cb..5bae694 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/org/node/WfOrgNodeApi.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/node/BpmOrgNodeApi.java @@ -1,4 +1,4 @@ -package vben.wf.org.node; +package vben.bpm.org.node; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; @@ -14,9 +14,9 @@ import vben.common.jdbc.sqler.Sqler; import java.util.List; @RestController -@RequestMapping("wf/org/node") +@RequestMapping("bpm/org/node") @RequiredArgsConstructor -public class WfOrgNodeApi { +public class BpmOrgNodeApi { // @GetMapping // public R get(String treid, String name, String pid, String notes) { @@ -45,7 +45,7 @@ public class WfOrgNodeApi { // //查询层级树 // @GetMapping("treea") // public R getTreea(String treid) { -// Sqler sqler = new Sqler("wf_org_node"); +// Sqler sqler = new Sqler("bpm_org_node"); // sqler.addSelect("t.pid"); // sqler.addEqual("t.treid", treid); // sqler.addOrder("t.ornum"); @@ -69,7 +69,7 @@ public class WfOrgNodeApi { //查询层级树 @GetMapping("tree") public R getTree(String name,String treid,String id) { - Sqler sqler = new Sqler("wf_org_node"); + Sqler sqler = new Sqler("bpm_org_node"); sqler.addSelect("t.pid"); sqler.addLike("t.name", name); sqler.addEqual("t.treid", treid); @@ -83,14 +83,14 @@ public class WfOrgNodeApi { } @GetMapping("list") - public R> list(String name) { - Sqler sqler = new Sqler("wf_org_node"); + public R> list(String name) { + Sqler sqler = new Sqler("bpm_org_node"); sqler.addSelect("t.pid,t.notes,t.crtim,t.uptim,t.ornum,t.tier"); sqler.addLike("t.name", name); sqler.addOrder("t.ornum"); sqler.addLeftJoin("o.name memna","sys_org o","o.id=t.memid"); - List list = jdbcHelper.getTp().query(sqler.getSql(), sqler.getParams(), - new BeanPropertyRowMapper<>(WfOrgNode.class)); + List list = jdbcHelper.getTp().query(sqler.getSql(), sqler.getParams(), + new BeanPropertyRowMapper<>(BpmOrgNode.class)); return R.ok(list); } @@ -106,19 +106,19 @@ public class WfOrgNodeApi { @GetMapping("info/{id}") public R info(@PathVariable String id, HttpServletRequest request) { - WfOrgNode main = service.findById(id); + BpmOrgNode main = service.findById(id); return R.ok(main); } @PostMapping - public R post(@RequestBody WfOrgNode main) { + public R post(@RequestBody BpmOrgNode main) { main.setOrnum(service.getCount(main.getPid(),main.getTreid())+1); service.insert(main); return R.ok(main.getId()); } @PutMapping - public R put(@RequestBody WfOrgNode main) throws Exception { + public R put(@RequestBody BpmOrgNode main) throws Exception { service.update(main); return R.ok(main.getId()); } @@ -136,6 +136,6 @@ public class WfOrgNodeApi { private final JdbcHelper jdbcHelper; - private final WfOrgNodeService service; + private final BpmOrgNodeService service; } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/org/node/WfOrgNodeDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/node/BpmOrgNodeDao.java similarity index 71% rename from vben-modules/vben-wf/src/main/java/vben/wf/org/node/WfOrgNodeDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/org/node/BpmOrgNodeDao.java index 778d08b..0a71cc1 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/org/node/WfOrgNodeDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/node/BpmOrgNodeDao.java @@ -1,4 +1,4 @@ -package vben.wf.org.node; +package vben.bpm.org.node; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -9,16 +9,16 @@ import vben.common.jdbc.sqler.Usqler; @Component @RequiredArgsConstructor -public class WfOrgNodeDao { +public class BpmOrgNodeDao { - public WfOrgNode findById(String id) { - String sql = "select t.*,o.name memna from wf_org_node t left join sys_org o on o.id=t.memid where t.id = ?"; - WfOrgNode node = jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfOrgNode.class), id); + public BpmOrgNode findById(String id) { + String sql = "select t.*,o.name memna from bpm_org_node t left join sys_org o on o.id=t.memid where t.id = ?"; + BpmOrgNode node = jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmOrgNode.class), id); return node; } - public void insert(WfOrgNode tree) { - Isqler sqler = new Isqler("wf_org_node"); + public void insert(BpmOrgNode tree) { + Isqler sqler = new Isqler("bpm_org_node"); sqler.add("id", tree.getId()); sqler.add("name", tree.getName()); sqler.add("notes", tree.getNotes()); @@ -32,8 +32,8 @@ public class WfOrgNodeDao { jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams()); } - public void update(WfOrgNode tree) { - Usqler sqler = new Usqler("wf_org_node"); + public void update(BpmOrgNode tree) { + Usqler sqler = new Usqler("bpm_org_node"); sqler.addWhere("id=?", tree.getId()); sqler.add("name", tree.getName()); sqler.add("notes", tree.getNotes()); @@ -47,7 +47,7 @@ public class WfOrgNodeDao { } public void deleteById(String id) { - String sql = "delete from wf_org_node where id=?"; + String sql = "delete from bpm_org_node where id=?"; jdbcHelper.getTp().update(sql, id); } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/org/node/WfOrgNodeService.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/node/BpmOrgNodeService.java similarity index 85% rename from vben-modules/vben-wf/src/main/java/vben/wf/org/node/WfOrgNodeService.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/org/node/BpmOrgNodeService.java index 76a209e..07fabe3 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/org/node/WfOrgNodeService.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/node/BpmOrgNodeService.java @@ -1,4 +1,4 @@ -package vben.wf.org.node; +package vben.bpm.org.node; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -21,21 +21,21 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) @RequiredArgsConstructor -public class WfOrgNodeService { +public class BpmOrgNodeService { @Transactional(readOnly = true) - public WfOrgNode findById(String id) { + public BpmOrgNode findById(String id) { return dao.findById(id); } - public String insert(WfOrgNode main) { + public String insert(BpmOrgNode main) { if (main.getId() == null || "".equals(main.getId())) { main.setId(IdUtils.getSnowflakeNextIdStr()); } if (main.getPid() == null ) { main.setTier(main.getId()); } else { - String tier = jdbcHelper.findString("select tier from wf_org_node where id=?", main.getPid()); + String tier = jdbcHelper.findString("select tier from bpm_org_node where id=?", main.getPid()); main.setTier(tier + "_" + main.getId()); } dao.insert(main); @@ -43,12 +43,12 @@ public class WfOrgNodeService { } - public String update(WfOrgNode main) throws Exception { + public String update(BpmOrgNode main) throws Exception { main.setUptim(new Date()); if (main.getPid()==null) { main.setTier(main.getId() + ";"); } else { - String tier = jdbcHelper.findString("select tier from wf_org_node where id=?", main.getPid()); + String tier = jdbcHelper.findString("select tier from bpm_org_node where id=?", main.getPid()); main.setTier(tier + "_" + main.getId()); String[] arr = tier.split("_"); for (String str : arr) { @@ -58,7 +58,7 @@ public class WfOrgNodeService { } } dao.update(main); - String oldTier = jdbcHelper.findString("select tier from wf_org_node where id=?", main.getId()); + String oldTier = jdbcHelper.findString("select tier from bpm_org_node where id=?", main.getId()); if(!oldTier.equals(main.getTier())){ dealTier(oldTier, main.getTier(), main.getId()); } @@ -73,9 +73,9 @@ public class WfOrgNodeService { } private void dealTier(String oldTier, String newTier, String id) { - String sql = "select id,tier as name from wf_org_node where tier like ? and id<>?"; + String sql = "select id,tier as name from bpm_org_node where tier like ? and id<>?"; List list = jdbcHelper.findSidNameList(sql, oldTier + "%", id); - String updateSql = "update wf_org_node set tier=? where id=?"; + String updateSql = "update bpm_org_node set tier=? where id=?"; List updateList = new ArrayList(); batchReady(oldTier, newTier, list, updateList); jdbcHelper.batch(updateSql, updateList); @@ -91,8 +91,8 @@ public class WfOrgNodeService { } } - public List findAll(Sqler sqler) { - List list = jdbcHelper.getTp().query(sqler.getSql(), sqler.getParams(), new BeanPropertyRowMapper<>(WfOrgNode.class)); + public List findAll(Sqler sqler) { + List list = jdbcHelper.getTp().query(sqler.getSql(), sqler.getParams(), new BeanPropertyRowMapper<>(BpmOrgNode.class)); return list; } @@ -100,20 +100,20 @@ public class WfOrgNodeService { return jdbcHelper.findPageData(sqler); } - public List findTree(Sqler sqler) { - List list = jdbcHelper.getTp().query(sqler.getSql(), sqler.getParams(), new BeanPropertyRowMapper<>(WfOrgNode.class)); + public List findTree(Sqler sqler) { + List list = jdbcHelper.getTp().query(sqler.getSql(), sqler.getParams(), new BeanPropertyRowMapper<>(BpmOrgNode.class)); return buildByRecursive(list); } //使用递归方法建树 - private List buildByRecursive(List nodes) { - List list = new ArrayList<>(); - for (WfOrgNode node : nodes) { + private List buildByRecursive(List nodes) { + List list = new ArrayList<>(); + for (BpmOrgNode node : nodes) { if (node.getPid() == null) { list.add(findChildrenByTier(node, nodes)); } else { boolean flag = false; - for (WfOrgNode node2 : nodes) { + for (BpmOrgNode node2 : nodes) { if (node.getPid().equals(node2.getId())) { flag = true; break; @@ -128,8 +128,8 @@ public class WfOrgNodeService { } //递归查找子节点 - private WfOrgNode findChildrenByTier(WfOrgNode node, List nodes) { - for (WfOrgNode item : nodes) { + private BpmOrgNode findChildrenByTier(BpmOrgNode node, List nodes) { + for (BpmOrgNode item : nodes) { if (node.getId().equals(item.getPid())) { if (node.getChildren() == null) { node.setChildren(new ArrayList<>()); @@ -183,14 +183,14 @@ public class WfOrgNodeService { public Integer getCount(String pid,String treid){ if(StrUtils.isNotBlank(pid)){ - String countSql="select count(1) from wf_org_node where pid=?"; + String countSql="select count(1) from bpm_org_node where pid=?"; Integer count = jdbcHelper.getTp().queryForObject(countSql, new Object[]{pid}, Integer.class); if(count==null){ count=0; } return count; }else{ - String countSql="select count(1) from wf_org_node where pid is null and treid=?"; + String countSql="select count(1) from bpm_org_node where pid is null and treid=?"; Integer count = jdbcHelper.getTp().queryForObject(countSql,new Object[]{treid}, Integer.class); if(count==null){ count=0; @@ -201,7 +201,7 @@ public class WfOrgNodeService { public void move(TreeMoveBo bo) throws Exception { - WfOrgNode dragDept= dao.findById(bo.getDraid()); + BpmOrgNode dragDept= dao.findById(bo.getDraid()); if(dragDept.getPid()!=null){ dragDept.setPid(dragDept.getPid()); } @@ -235,7 +235,7 @@ public class WfOrgNodeService { } else if ("before".equals(bo.getType())) { - WfOrgNode dropDept= dao.findById(bo.getDroid()); + BpmOrgNode dropDept= dao.findById(bo.getDroid()); if(dropDept.getPid()!=null){ dropDept.setPid(dropDept.getPid()); dragDept.setPid(dropDept.getPid());; @@ -270,7 +270,7 @@ public class WfOrgNodeService { } else if ("after".equals(bo.getType())) { - WfOrgNode dropDept= dao.findById(bo.getDroid()); + BpmOrgNode dropDept= dao.findById(bo.getDroid()); if(dropDept.getPid()!=null){ dropDept.setPid(dropDept.getPid()); } @@ -290,7 +290,7 @@ public class WfOrgNodeService { private final JdbcHelper jdbcHelper; - private final WfOrgNodeDao dao; + private final BpmOrgNodeDao dao; } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/org/role/WfOrgRole.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/role/BpmOrgRole.java similarity index 64% rename from vben-modules/vben-wf/src/main/java/vben/wf/org/role/WfOrgRole.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/org/role/BpmOrgRole.java index 8bf3483..b7120a6 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/org/role/WfOrgRole.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/role/BpmOrgRole.java @@ -1,11 +1,11 @@ -package vben.wf.org.role; +package vben.bpm.org.role; import lombok.Data; //层级角色 @Data -public class WfOrgRole { +public class BpmOrgRole { private String id;//主键 @@ -17,19 +17,19 @@ public class WfOrgRole { private String treid;//角色树ID - public WfOrgRole() { + public BpmOrgRole() { } - public WfOrgRole(String id) { + public BpmOrgRole(String id) { this.id = id; } - public WfOrgRole(String id, String name) { + public BpmOrgRole(String id, String name) { this.id = id; this.name = name; } - public WfOrgRole(String id, String name, Integer ornum) { + public BpmOrgRole(String id, String name, Integer ornum) { this.id = id; this.name = name; this.ornum = ornum; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/org/role/WfOrgRoleDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/role/BpmOrgRoleDao.java similarity index 66% rename from vben-modules/vben-wf/src/main/java/vben/wf/org/role/WfOrgRoleDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/org/role/BpmOrgRoleDao.java index ceac121..bcb0c0a 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/org/role/WfOrgRoleDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/role/BpmOrgRoleDao.java @@ -1,4 +1,4 @@ -package vben.wf.org.role; +package vben.bpm.org.role; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -9,16 +9,16 @@ import vben.common.jdbc.sqler.Usqler; @Component @RequiredArgsConstructor -public class WfOrgRoleDao { +public class BpmOrgRoleDao { - public WfOrgRole findById(String id) { - String sql = "select * from wf_org_role where id = ?"; - WfOrgRole role = jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfOrgRole.class), id); + public BpmOrgRole findById(String id) { + String sql = "select * from bpm_org_role where id = ?"; + BpmOrgRole role = jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmOrgRole.class), id); return role; } - public void insert(WfOrgRole tree) { - Isqler isqler = new Isqler("wf_org_role"); + public void insert(BpmOrgRole tree) { + Isqler isqler = new Isqler("bpm_org_role"); isqler.add("id", tree.getId()); isqler.add("name", tree.getName()); isqler.add("notes", tree.getNotes()); @@ -27,8 +27,8 @@ public class WfOrgRoleDao { jdbcHelper.getTp().update(isqler.getSql(), isqler.getParams()); } - public void update(WfOrgRole tree) { - Usqler usqler = new Usqler("wf_org_role"); + public void update(BpmOrgRole tree) { + Usqler usqler = new Usqler("bpm_org_role"); usqler.addWhere("id=?", tree.getId()); usqler.add("name", tree.getName()); usqler.add("notes", tree.getNotes()); @@ -38,12 +38,12 @@ public class WfOrgRoleDao { } public void deleteById(String id) { - String sql = "delete from wf_org_role where id=?"; + String sql = "delete from bpm_org_role where id=?"; jdbcHelper.getTp().update(sql, id); } public void deleteByTreid(String treid) { - String sql = "delete from wf_org_role where treid=?"; + String sql = "delete from bpm_org_role where treid=?"; jdbcHelper.getTp().update(sql, treid); } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/org/tree/WfOrgTree.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/tree/BpmOrgTree.java similarity index 84% rename from vben-modules/vben-wf/src/main/java/vben/wf/org/tree/WfOrgTree.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/org/tree/BpmOrgTree.java index b443ce1..d490c6b 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/org/tree/WfOrgTree.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/tree/BpmOrgTree.java @@ -1,14 +1,14 @@ -package vben.wf.org.tree; +package vben.bpm.org.tree; import lombok.Data; -import vben.wf.org.role.WfOrgRole; +import vben.bpm.org.role.BpmOrgRole; import java.util.ArrayList; import java.util.Date; import java.util.List; @Data -public class WfOrgTree { +public class BpmOrgTree { /** * 主键 @@ -63,6 +63,6 @@ public class WfOrgTree { /** * 包含角色 */ - private List roles=new ArrayList<>(); + private List roles=new ArrayList<>(); } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/org/tree/WfOrgTreeApi.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/tree/BpmOrgTreeApi.java similarity index 75% rename from vben-modules/vben-wf/src/main/java/vben/wf/org/tree/WfOrgTreeApi.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/org/tree/BpmOrgTreeApi.java index adfd484..a683c9f 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/org/tree/WfOrgTreeApi.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/tree/BpmOrgTreeApi.java @@ -1,4 +1,4 @@ -package vben.wf.org.tree; +package vben.bpm.org.tree; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -7,13 +7,13 @@ import vben.common.jdbc.sqler.JdbcHelper; import vben.common.jdbc.sqler.Sqler; @RestController -@RequestMapping("wf/org/tree") +@RequestMapping("bpm/org/tree") @RequiredArgsConstructor -public class WfOrgTreeApi { +public class BpmOrgTreeApi { @GetMapping public R get(String name,String catid) { - Sqler sqler = new Sqler("wf_org_tree"); + Sqler sqler = new Sqler("bpm_org_tree"); sqler.addLike("t.name", name); sqler.addEqual("t.catid", catid); sqler.addSelect("t.notes,t.ornum,t.crtim,t.uptim"); @@ -23,17 +23,17 @@ public class WfOrgTreeApi { @GetMapping("info/{id}") public R info(@PathVariable String id) { - WfOrgTree main = service.findById(id); + BpmOrgTree main = service.findById(id); return R.ok(main); } @PostMapping - public R post(@RequestBody WfOrgTree main) { + public R post(@RequestBody BpmOrgTree main) { return R.ok(service.insert(main)); } @PutMapping - public R put(@RequestBody WfOrgTree main) { + public R put(@RequestBody BpmOrgTree main) { return R.ok(service.update(main)); } @@ -49,11 +49,11 @@ public class WfOrgTreeApi { @GetMapping("rlist") public R rlist(String treid) { - String sql = "select id,name from wf_org_role where treid=?"; + String sql = "select id,name from bpm_org_role where treid=?"; return R.ok(jdbcHelper.getTp().queryForList(sql, treid)); } - private final WfOrgTreeService service; + private final BpmOrgTreeService service; private final JdbcHelper jdbcHelper; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/org/tree/WfOrgTreeDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/tree/BpmOrgTreeDao.java similarity index 66% rename from vben-modules/vben-wf/src/main/java/vben/wf/org/tree/WfOrgTreeDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/org/tree/BpmOrgTreeDao.java index 1fbaaae..6f788c5 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/org/tree/WfOrgTreeDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/tree/BpmOrgTreeDao.java @@ -1,9 +1,9 @@ -package vben.wf.org.tree; +package vben.bpm.org.tree; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.stereotype.Component; -import vben.wf.org.role.WfOrgRole; +import vben.bpm.org.role.BpmOrgRole; import vben.common.jdbc.sqler.Isqler; import vben.common.jdbc.sqler.JdbcHelper; import vben.common.jdbc.sqler.Usqler; @@ -12,19 +12,19 @@ import java.util.List; @Component @RequiredArgsConstructor -public class WfOrgTreeDao { +public class BpmOrgTreeDao { - public WfOrgTree findById(String id) { - String sql = "select * from wf_org_tree where id = ?"; - WfOrgTree tree = jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfOrgTree.class), id); - String roleSql="select * from wf_org_role where treid = ? order by ornum"; - List list = jdbcHelper.getTp().query(roleSql, new BeanPropertyRowMapper<>(WfOrgRole.class),id); + public BpmOrgTree findById(String id) { + String sql = "select * from bpm_org_tree where id = ?"; + BpmOrgTree tree = jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmOrgTree.class), id); + String roleSql="select * from bpm_org_role where treid = ? order by ornum"; + List list = jdbcHelper.getTp().query(roleSql, new BeanPropertyRowMapper<>(BpmOrgRole.class),id); tree.setRoles(list); return tree; } - public void insert(WfOrgTree tree) { - Isqler isqler = new Isqler("wf_org_tree"); + public void insert(BpmOrgTree tree) { + Isqler isqler = new Isqler("bpm_org_tree"); isqler.add("id", tree.getId()); isqler.add("name", tree.getName()); isqler.add("notes", tree.getNotes()); @@ -39,8 +39,8 @@ public class WfOrgTreeDao { } - public void update(WfOrgTree tree) { - Usqler usqler = new Usqler("wf_org_tree"); + public void update(BpmOrgTree tree) { + Usqler usqler = new Usqler("bpm_org_tree"); usqler.addWhere("id=?", tree.getId()); usqler.add("name", tree.getName()); usqler.add("notes", tree.getNotes()); @@ -54,7 +54,7 @@ public class WfOrgTreeDao { } public void deleteById(String id) { - String sql = "delete from wf_org_tree where id=?"; + String sql = "delete from bpm_org_tree where id=?"; jdbcHelper.getTp().update(sql, id); } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/org/tree/WfOrgTreeService.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/tree/BpmOrgTreeService.java similarity index 72% rename from vben-modules/vben-wf/src/main/java/vben/wf/org/tree/WfOrgTreeService.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/org/tree/BpmOrgTreeService.java index e9d0468..e1636fe 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/org/tree/WfOrgTreeService.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/tree/BpmOrgTreeService.java @@ -1,4 +1,4 @@ -package vben.wf.org.tree; +package vben.bpm.org.tree; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -7,30 +7,30 @@ import org.springframework.transaction.annotation.Transactional; import vben.base.sys.org.root.Org; import vben.common.core.utils.IdUtils; import vben.common.jdbc.sqler.JdbcHelper; -import vben.wf.org.role.WfOrgRole; -import vben.wf.org.role.WfOrgRoleDao; +import vben.bpm.org.role.BpmOrgRole; +import vben.bpm.org.role.BpmOrgRoleDao; import java.util.Map; @Service @Transactional(rollbackFor = Exception.class) @RequiredArgsConstructor -public class WfOrgTreeService { +public class BpmOrgTreeService { @Transactional(readOnly = true) - public WfOrgTree findById(String id) { + public BpmOrgTree findById(String id) { return treedao.findById(id); } - public String insert(WfOrgTree main) { + public String insert(BpmOrgTree main) { main.setId(IdUtils.getSnowflakeNextIdStr()); treedao.insert(main); - for (WfOrgRole role : main.getRoles()) { + for (BpmOrgRole role : main.getRoles()) { role.setTreid(main.getId()); roleDao.insert(role); } // List list = new ArrayList<>(); -// for (WfOrgRoleEntity role : main.getRoles()) { +// for (BpmOrgRoleEntity role : main.getRoles()) { // SysOrg sysOrg = new SysOrg(role.getId(), role.getName(), 32); // list.add(sysOrg); // } @@ -38,16 +38,16 @@ public class WfOrgTreeService { return main.getId(); } - public String update(WfOrgTree main) { + public String update(BpmOrgTree main) { treedao.update(main); roleDao.deleteByTreid(main.getId()); - for (WfOrgRole role : main.getRoles()) { + for (BpmOrgRole role : main.getRoles()) { role.setTreid(main.getId()); roleDao.insert(role); } // List list = new ArrayList<>(); -// for (WfOrgRoleEntity role : main.getRoles()) { +// for (BpmOrgRoleEntity role : main.getRoles()) { // SysOrg sysOrg = new SysOrg(role.getId(), role.getName(), 32); // list.add(sysOrg); // } @@ -65,12 +65,12 @@ public class WfOrgTreeService { public Org calc(String useid, String rolid) { - String sql = "select t.tier \"tier\",m.ornum \"ornum\" from wf_org_tree_node t " + - "inner join wf_org_role m on m.treid=t.treid where t.memid=? and m.id=?"; + String sql = "select t.tier \"tier\",m.ornum \"ornum\" from bpm_org_tree_node t " + + "inner join bpm_org_role m on m.treid=t.treid where t.memid=? and m.id=?"; Map map = jdbcHelper.findMap(sql, useid, rolid); if (map == null) { - sql = "select t.tier \"tier\",m.ornum \"ornum\" from wf_org_tree_node t " + - "inner join wf_org_role m on m.treid=t.treid " + + sql = "select t.tier \"tier\",m.ornum \"ornum\" from bpm_org_tree_node t " + + "inner join bpm_org_role m on m.treid=t.treid " + "inner join sys_org_user u on u.depid=t.memid where u.id=? and m.id=?"; map = jdbcHelper.findMap(sql, useid, rolid); if (map == null) { @@ -80,15 +80,15 @@ public class WfOrgTreeService { String tier = (String) map.get("tier"); Integer ornum =(Integer) map.get("ornum"); String[] idArr = tier.split("_"); - String sql3 = "select o.id,o.name,o.type from wf_org_tree_node t inner join sys_org o on o.id=t.memid where t.id=?"; + String sql3 = "select o.id,o.name,o.type from bpm_org_tree_node t inner join sys_org o on o.id=t.memid where t.id=?"; Org org = jdbcHelper.getTp().queryForObject(sql3, new Object[]{idArr[ornum]}, new BeanPropertyRowMapper<>(Org.class)); return org; } - private final WfOrgRoleDao roleDao; + private final BpmOrgRoleDao roleDao; - private final WfOrgTreeDao treedao; + private final BpmOrgTreeDao treedao; private final JdbcHelper jdbcHelper; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/org/tree/WfUserService.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/tree/BpmUserService.java similarity index 90% rename from vben-modules/vben-wf/src/main/java/vben/wf/org/tree/WfUserService.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/org/tree/BpmUserService.java index af23dd9..69fb820 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/org/tree/WfUserService.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/tree/BpmUserService.java @@ -1,4 +1,4 @@ -package vben.wf.org.tree; +package vben.bpm.org.tree; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -16,11 +16,11 @@ import java.util.List; @Transactional(rollbackFor = Exception.class) @Service @RequiredArgsConstructor -public class WfUserService { +public class BpmUserService { private final JdbcHelper jdbcHelper; - private final WfOrgTreeService sysOrgRoleTreeService; + private final BpmOrgTreeService sysOrgRoleTreeService; /** * 计算目标节点处理人 @@ -33,7 +33,7 @@ public class WfUserService { String tamen = ""; if (StrUtils.isNotBlank(exuids) && exuids.contains("$")) { if ("$creator".equals(exuids)) { - String sql = "select cruid from wf_proc_inst where id=?"; + String sql = "select cruid from bpm_proc_inst where id=?"; exuids = jdbcHelper.findString(sql, proid); } } @@ -43,7 +43,7 @@ public class WfUserService { if (sysOrg.getType() == 32) { String cruid = LoginHelper.getUserId()+""; if (proid != null) { - String sql = "select cruid from wf_proc_inst where id=?"; + String sql = "select cruid from bpm_proc_inst where id=?"; cruid = jdbcHelper.findString(sql, proid); } Org org = sysOrgRoleTreeService.calc(cruid, sysOrg.getId()); @@ -73,7 +73,7 @@ public class WfUserService { if (sysOrg.getType() == 32) { String cruid = LoginHelper.getUserId()+""; if (proid != null) { - String sql = "select cruid from wf_proc_inst where id=?"; + String sql = "select cruid from bpm_proc_inst where id=?"; cruid = jdbcHelper.findString(sql, proid); } Org org = sysOrgRoleTreeService.calc(cruid, sysOrg.getId()); diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/org/treec/WfOrgTreeCate.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/treec/BpmOrgTreeCate.java similarity index 82% rename from vben-modules/vben-wf/src/main/java/vben/wf/org/treec/WfOrgTreeCate.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/org/treec/BpmOrgTreeCate.java index 5584463..1eca56e 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/org/treec/WfOrgTreeCate.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/treec/BpmOrgTreeCate.java @@ -1,4 +1,4 @@ -package vben.wf.org.treec; +package vben.bpm.org.treec; import lombok.Data; @@ -7,7 +7,7 @@ import lombok.Data; * 群组分类 */ @Data -public class WfOrgTreeCate { +public class BpmOrgTreeCate { /** * 主键ID */ diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/org/treec/WfOrgTreeCateApi.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/treec/BpmOrgTreeCateApi.java similarity index 72% rename from vben-modules/vben-wf/src/main/java/vben/wf/org/treec/WfOrgTreeCateApi.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/org/treec/BpmOrgTreeCateApi.java index f3ecc29..9761ac8 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/org/treec/WfOrgTreeCateApi.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/treec/BpmOrgTreeCateApi.java @@ -1,4 +1,4 @@ -package vben.wf.org.treec; +package vben.bpm.org.treec; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -9,9 +9,9 @@ import vben.common.jdbc.dto.Stree; import java.util.List; @RestController -@RequestMapping("wf/org/treec") +@RequestMapping("bpm/org/treec") @RequiredArgsConstructor -public class WfOrgTreeCateApi { +public class BpmOrgTreeCateApi { //查询分类树 @GetMapping("tree") @@ -21,21 +21,21 @@ public class WfOrgTreeCateApi { //查询分类详情 @GetMapping("info/{id}") - public R info(@PathVariable String id) { - WfOrgTreeCate cate = service.findById(id); + public R info(@PathVariable String id) { + BpmOrgTreeCate cate = service.findById(id); return R.ok(cate); } //新增分类 @PostMapping - public R post(@RequestBody WfOrgTreeCate cate) { + public R post(@RequestBody BpmOrgTreeCate cate) { service.insert(cate); return R.ok(null,cate.getId()); } //更新分类 @PutMapping - public R put(@RequestBody WfOrgTreeCate cate) { + public R put(@RequestBody BpmOrgTreeCate cate) { service.update(cate); return R.ok(null,cate.getId()); } @@ -53,5 +53,5 @@ public class WfOrgTreeCateApi { return R.ok(); } - private final WfOrgTreeCateService service; + private final BpmOrgTreeCateService service; } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/org/treec/WfOrgTreeCateDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/treec/BpmOrgTreeCateDao.java similarity index 70% rename from vben-modules/vben-wf/src/main/java/vben/wf/org/treec/WfOrgTreeCateDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/org/treec/BpmOrgTreeCateDao.java index fe19e59..c16c8df 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/org/treec/WfOrgTreeCateDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/treec/BpmOrgTreeCateDao.java @@ -1,4 +1,4 @@ -package vben.wf.org.treec; +package vben.bpm.org.treec; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -13,23 +13,23 @@ import java.util.List; @Component @RequiredArgsConstructor -public class WfOrgTreeCateDao { +public class BpmOrgTreeCateDao { public List findTreeList(String id) { if(StrUtils.isBlank(id)) { - return jdbcHelper.findStreeList("select id,name,pid from wf_org_tree_cate order by ornum"); + return jdbcHelper.findStreeList("select id,name,pid from bpm_org_tree_cate order by ornum"); }else{ - return jdbcHelper.findStreeList("select id,name,pid from wf_org_tree_cate where id <> ? order by ornum",id); + return jdbcHelper.findStreeList("select id,name,pid from bpm_org_tree_cate where id <> ? order by ornum",id); } } - public WfOrgTreeCate findById(String id) { - String sql = "select * from wf_org_tree_cate where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfOrgTreeCate.class), id); + public BpmOrgTreeCate findById(String id) { + String sql = "select * from bpm_org_tree_cate where id = ?"; + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmOrgTreeCate.class), id); } - public void insert(WfOrgTreeCate cate) { - Isqler isqler = new Isqler("wf_org_tree_cate"); + public void insert(BpmOrgTreeCate cate) { + Isqler isqler = new Isqler("bpm_org_tree_cate"); isqler.add("id", cate.getId()); isqler.add("name", cate.getName()); isqler.add("pid", cate.getPid()); @@ -37,8 +37,8 @@ public class WfOrgTreeCateDao { jdbcHelper.getTp().update(isqler.getSql(), isqler.getParams()); } - public void update(WfOrgTreeCate cate) { - Usqler usqler = new Usqler("wf_org_tree_cate"); + public void update(BpmOrgTreeCate cate) { + Usqler usqler = new Usqler("bpm_org_tree_cate"); usqler.addWhere("id=?", cate.getId()); usqler.add("name", cate.getName()); usqler.add("ornum", cate.getOrnum()); @@ -47,12 +47,12 @@ public class WfOrgTreeCateDao { } public void deleteById(String id) { - String sql = "delete from wf_org_tree_cate where id=?"; + String sql = "delete from bpm_org_tree_cate where id=?"; jdbcHelper.getTp().update(sql, id); } public Integer getCount(String pid){ - String countSql="select count(1) from wf_org_tree_cate where pid=?"; + String countSql="select count(1) from bpm_org_tree_cate where pid=?"; Integer count = jdbcHelper.getTp().queryForObject(countSql,Integer.class,pid); if(count==null){ count=0; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/org/treec/WfOrgTreeCateService.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/treec/BpmOrgTreeCateService.java similarity index 75% rename from vben-modules/vben-wf/src/main/java/vben/wf/org/treec/WfOrgTreeCateService.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/org/treec/BpmOrgTreeCateService.java index 0c64846..d037d00 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/org/treec/WfOrgTreeCateService.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/org/treec/BpmOrgTreeCateService.java @@ -1,4 +1,4 @@ -package vben.wf.org.treec; +package vben.bpm.org.treec; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -16,30 +16,30 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) @RequiredArgsConstructor -public class WfOrgTreeCateService { +public class BpmOrgTreeCateService { public List findTreeList(String id) { return cateDao.findTreeList(id); } @Transactional(readOnly = true) - public WfOrgTreeCate findById(String id) { + public BpmOrgTreeCate findById(String id) { return cateDao.findById(id); } - public void insert(WfOrgTreeCate cate) { + public void insert(BpmOrgTreeCate cate) { cate.setId(IdUtils.getSnowflakeNextIdStr()); cate.setOrnum(cateDao.getCount(cate.getPid()) + 1); cateDao.insert(cate); } - public void update(WfOrgTreeCate cate) { + public void update(BpmOrgTreeCate cate) { cateDao.update(cate); } public Integer delete(String id) { Integer size=1; - String sql = "select id from wf_org_tree_cate where pid=?"; + String sql = "select id from bpm_org_tree_cate where pid=?"; List list = jdbcHelper.getTp().queryForList(sql, String.class, id); for (String l : list) { cateDao.deleteById(l); @@ -50,10 +50,10 @@ public class WfOrgTreeCateService { } public void move(TreeMoveBo bo) { - WfOrgTreeCate dragCate = cateDao.findById(bo.getDraid()); - String sql = "select id,ornum from wf_org_tree_cate where ornum>? and pid=?"; + BpmOrgTreeCate dragCate = cateDao.findById(bo.getDraid()); + String sql = "select id,ornum from bpm_org_tree_cate where ornum>? and pid=?"; List list2 = jdbcHelper.getTp().query(sql,new BeanPropertyRowMapper<>(SidOrnum.class),dragCate.getOrnum(), dragCate.getPid()); - String updateSql = "update wf_org_tree_cate set ornum=? where id=?"; + String updateSql = "update bpm_org_tree_cate set ornum=? where id=?"; List updateList = new ArrayList<>(); for (SidOrnum sidOrnum : list2) { Object[] arr = new Object[2]; @@ -67,12 +67,12 @@ public class WfOrgTreeCateService { Integer count = cateDao.getCount(bo.getDroid()); dragCate.setOrnum(count + 1); } else if ("before".equals(bo.getType())) { - WfOrgTreeCate dropCate = cateDao.findById(bo.getDroid()); + BpmOrgTreeCate dropCate = cateDao.findById(bo.getDroid()); dragCate.setPid(dropCate.getPid()); dragCate.setOrnum(dropCate.getOrnum()); - String sql3 = "select id,ornum from wf_org_tree_cate where ornum>? and pid=?"; + String sql3 = "select id,ornum from bpm_org_tree_cate where ornum>? and pid=?"; List list3 = jdbcHelper.getTp().query(sql3, new BeanPropertyRowMapper<>(SidOrnum.class),dropCate.getOrnum(), dropCate.getPid()); - String updateSql3 = "update wf_org_tree_cate set ornum=? where id=?"; + String updateSql3 = "update bpm_org_tree_cate set ornum=? where id=?"; List updateList3 = new ArrayList<>(); for (SidOrnum sidOrnum : list3) { Object[] arr = new Object[2]; @@ -82,15 +82,15 @@ public class WfOrgTreeCateService { } jdbcHelper.batch(updateSql3, updateList3); dropCate.setOrnum(dropCate.getOrnum() + 1); - String updateSql4 = "update wf_org_tree_cate set ornum=? where id=?"; + String updateSql4 = "update bpm_org_tree_cate set ornum=? where id=?"; jdbcHelper.update(updateSql4, dropCate.getOrnum(), dropCate.getId()); } else if ("after".equals(bo.getType())) { - WfOrgTreeCate dropCate = cateDao.findById(bo.getDroid()); + BpmOrgTreeCate dropCate = cateDao.findById(bo.getDroid()); dragCate.setPid(dropCate.getPid()); dragCate.setOrnum(dropCate.getOrnum() + 1); - String sql3 = "select id,ornum from wf_org_tree_cate where ornum>? and pid=?"; + String sql3 = "select id,ornum from bpm_org_tree_cate where ornum>? and pid=?"; List list3 = jdbcHelper.getTp().query(sql3,new BeanPropertyRowMapper<>(SidOrnum.class),dropCate.getOrnum(), dropCate.getPid()); - String updateSql3 = "update wf_org_tree_cate set ornum=? where id=?"; + String updateSql3 = "update bpm_org_tree_cate set ornum=? where id=?"; List updateList3 = new ArrayList<>(); for (SidOrnum sidOrnum : list3) { Object[] arr = new Object[2]; @@ -105,5 +105,5 @@ public class WfOrgTreeCateService { private final JdbcHelper jdbcHelper; - private final WfOrgTreeCateDao cateDao; + private final BpmOrgTreeCateDao cateDao; } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/audit/WfProcAudit.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/audit/BpmProcAudit.java similarity index 93% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/audit/WfProcAudit.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/audit/BpmProcAudit.java index 0dba84b..b42dbe0 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/audit/WfProcAudit.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/audit/BpmProcAudit.java @@ -1,4 +1,4 @@ -package vben.wf.proc.audit; +package vben.bpm.proc.audit; import lombok.Data; @@ -8,7 +8,7 @@ import java.util.Date; @Data -public class WfProcAudit implements Serializable { +public class BpmProcAudit implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/audit/WfProcAuditDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/audit/BpmProcAuditDao.java similarity index 72% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/audit/WfProcAuditDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/audit/BpmProcAuditDao.java index 6a446d9..a9c8f2c 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/audit/WfProcAuditDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/audit/BpmProcAuditDao.java @@ -1,4 +1,4 @@ -package vben.wf.proc.audit; +package vben.bpm.proc.audit; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -7,38 +7,38 @@ import vben.common.core.utils.IdUtils; import vben.common.jdbc.sqler.Isqler; import vben.common.jdbc.sqler.JdbcHelper; import vben.common.jdbc.sqler.Usqler; -import vben.wf.root.domain.vo.WfAuditVo; -import vben.wf.root.domain.vo.WfRefuseInfoVo; +import vben.bpm.root.domain.vo.BpmAuditVo; +import vben.bpm.root.domain.vo.BpmRefuseInfoVo; import java.util.List; @Component @RequiredArgsConstructor -public class WfProcAuditDao { +public class BpmProcAuditDao { - public List findListByProid(Long proid){ - String sql="select t.id,t.crtim,t.facna,t.facno,t.opnot,t.opinf,o.name hauna,t.atids from wf_proc_audit t" + + public List findListByProid(Long proid){ + String sql="select t.id,t.crtim,t.facna,t.facno,t.opnot,t.opinf,o.name hauna,t.atids from bpm_proc_audit t" + " left join sys_org o on o.id=t.hauid where t.proid=? order by t.crtim"; - return jdbcHelper.getTp().query(sql,new BeanPropertyRowMapper<>(WfAuditVo.class),proid); + return jdbcHelper.getTp().query(sql,new BeanPropertyRowMapper<>(BpmAuditVo.class),proid); } - public List findCanRefuseNodeList(Long proid){ + public List findCanRefuseNodeList(Long proid){ String sql=""" select distinct t.facno refno,t.facna refna,t.hauid exuid,t.crtim - from wf_proc_audit t + from bpm_proc_audit t where proid=? and opkey in('dsubmit','pass') order by t.crtim """; - return jdbcHelper.getTp().query(sql,new BeanPropertyRowMapper<>(WfRefuseInfoVo.class),proid); + return jdbcHelper.getTp().query(sql,new BeanPropertyRowMapper<>(BpmRefuseInfoVo.class),proid); } - public WfProcAudit findById(Long id) { - String sql = "select * from wf_proc_audit where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfProcAudit.class), id); + public BpmProcAudit findById(Long id) { + String sql = "select * from bpm_proc_audit where id = ?"; + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmProcAudit.class), id); } - public void insert(WfProcAudit main) { - Isqler isqler = new Isqler("wf_proc_audit"); + public void insert(BpmProcAudit main) { + Isqler isqler = new Isqler("bpm_proc_audit"); if(main.getId()==null){ main.setId(IdUtils.getSnowflakeNextId()); } @@ -57,8 +57,8 @@ public class WfProcAuditDao { jdbcHelper.getTp().update(isqler.getSql(), isqler.getParams()); } - public void update(WfProcAudit main) { - Usqler usqler = new Usqler("wf_proc_audit"); + public void update(BpmProcAudit main) { + Usqler usqler = new Usqler("bpm_proc_audit"); usqler.addWhere("id=?", main.getId()); usqler.add("facno", main.getFacno()); usqler.add("facna", main.getFacna()); @@ -74,7 +74,7 @@ public class WfProcAuditDao { } public void deleteById(Long id) { - jdbcHelper.update("delete from wf_proc_audit where id=?", id); + jdbcHelper.update("delete from bpm_proc_audit where id=?", id); } private final JdbcHelper jdbcHelper; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/audit/WfProcAuditService.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/audit/BpmProcAuditService.java similarity index 68% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/audit/WfProcAuditService.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/audit/BpmProcAuditService.java index 70f8b15..af444b6 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/audit/WfProcAuditService.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/audit/BpmProcAuditService.java @@ -1,11 +1,11 @@ -package vben.wf.proc.audit; +package vben.bpm.proc.audit; import lombok.RequiredArgsConstructor; -import vben.wf.root.domain.Zproc; -import vben.wf.root.domain.Znode; -import vben.wf.root.domain.vo.WfRefuseInfoVo; -import vben.wf.root.domain.vo.WfAuditVo; +import vben.bpm.root.domain.Zproc; +import vben.bpm.root.domain.Znode; +import vben.bpm.root.domain.vo.BpmRefuseInfoVo; +import vben.bpm.root.domain.vo.BpmAuditVo; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -14,12 +14,12 @@ import java.util.List; @Transactional(rollbackFor = Exception.class) @Service @RequiredArgsConstructor -public class WfProcAuditService { +public class BpmProcAuditService { - private final WfProcAuditDao dao; + private final BpmProcAuditDao dao; - public WfProcAudit saveDraftAudit(Zproc zproc, Znode znode) { - WfProcAudit audit = new WfProcAudit(); + public BpmProcAudit saveDraftAudit(Zproc zproc, Znode znode) { + BpmProcAudit audit = new BpmProcAudit(); audit.setFacno(znode.getFacno()); audit.setFacna(znode.getFacna()); audit.setNodid(znode.getNodid()); @@ -33,8 +33,8 @@ public class WfProcAuditService { return audit; } - public WfProcAudit saveAudit(Zproc zproc) { - WfProcAudit audit = new WfProcAudit(); + public BpmProcAudit saveAudit(Zproc zproc) { + BpmProcAudit audit = new BpmProcAudit(); audit.setFacno(zproc.getFacno()); audit.setFacna(zproc.getFacna()); audit.setNodid(zproc.getNodid()); @@ -49,8 +49,8 @@ public class WfProcAuditService { return audit; } - public WfProcAudit saveEndAudit(Zproc zproc, Long nodid) { - WfProcAudit audit = new WfProcAudit(); + public BpmProcAudit saveEndAudit(Zproc zproc, Long nodid) { + BpmProcAudit audit = new BpmProcAudit(); audit.setFacno("NE"); audit.setFacna("结束节点"); audit.setNodid(nodid); @@ -61,11 +61,11 @@ public class WfProcAuditService { return audit; } - public List findListByProid(Long proid) { + public List findListByProid(Long proid) { return dao.findListByProid(proid); } - public List findCanRefuseNodeList(Long proid) { + public List findCanRefuseNodeList(Long proid) { return dao.findCanRefuseNodeList(proid); } } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/cond/WfProcCond.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/cond/BpmProcCond.java similarity index 76% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/cond/WfProcCond.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/cond/BpmProcCond.java index 18beda7..306b112 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/cond/WfProcCond.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/cond/BpmProcCond.java @@ -1,4 +1,4 @@ -package vben.wf.proc.cond; +package vben.bpm.proc.cond; import lombok.Data; @@ -7,7 +7,7 @@ import java.io.Serializable; @Data -public class WfProcCond implements Serializable { +public class BpmProcCond implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/cond/WfProcCondDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/cond/BpmProcCondDao.java similarity index 66% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/cond/WfProcCondDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/cond/BpmProcCondDao.java index dc17cc3..35fbd6c 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/cond/WfProcCondDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/cond/BpmProcCondDao.java @@ -1,4 +1,4 @@ -package vben.wf.proc.cond; +package vben.bpm.proc.cond; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -10,15 +10,15 @@ import vben.common.jdbc.sqler.Usqler; @Component @RequiredArgsConstructor -public class WfProcCondDao { +public class BpmProcCondDao { - public WfProcCond findById(Long id) { - String sql = "select * from wf_proc_cond where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfProcCond.class), id); + public BpmProcCond findById(Long id) { + String sql = "select * from bpm_proc_cond where id = ?"; + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmProcCond.class), id); } - public void insert(WfProcCond main) { - Isqler isqler = new Isqler("wf_proc_cond"); + public void insert(BpmProcCond main) { + Isqler isqler = new Isqler("bpm_proc_cond"); if(main.getId()==null){ main.setId(IdUtils.getSnowflakeNextIdStr()); } @@ -27,15 +27,15 @@ public class WfProcCondDao { jdbcHelper.getTp().update(isqler.getSql(), isqler.getParams()); } - public void update(WfProcCond main) { - Usqler usqler = new Usqler("wf_proc_cond"); + public void update(BpmProcCond main) { + Usqler usqler = new Usqler("bpm_proc_cond"); usqler.addWhere("id=?", main.getId()); usqler.add("name", main.getCond()); jdbcHelper.getTp().update(usqler.getSql(), usqler.getParams()); } public void deleteById(Long id) { - jdbcHelper.update("delete from wf_proc_cond where id=?", id); + jdbcHelper.update("delete from bpm_proc_cond where id=?", id); } private final JdbcHelper jdbcHelper; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/def/WfProcDef.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/def/BpmProcDef.java similarity index 89% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/def/WfProcDef.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/def/BpmProcDef.java index 90680d8..19ca2e0 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/def/WfProcDef.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/def/BpmProcDef.java @@ -1,4 +1,4 @@ -package vben.wf.proc.def; +package vben.bpm.proc.def; import lombok.Data; @@ -8,7 +8,7 @@ import java.util.Date; @Data -public class WfProcDef implements Serializable { +public class BpmProcDef implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -65,7 +65,7 @@ public class WfProcDef implements Serializable { private String exxml; -// private String wfXml; +// private String bpmXml; // /** * diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/def/WfProcDefDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/def/BpmProcDefDao.java similarity index 67% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/def/WfProcDefDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/def/BpmProcDefDao.java index 24be634..7018fd9 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/def/WfProcDefDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/def/BpmProcDefDao.java @@ -1,50 +1,50 @@ -package vben.wf.proc.def; +package vben.bpm.proc.def; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.stereotype.Component; +import vben.bpm.root.domain.vo.BpmProcDefVo; import vben.common.core.utils.IdUtils; import vben.common.jdbc.sqler.Isqler; import vben.common.jdbc.sqler.JdbcHelper; import vben.common.jdbc.sqler.Usqler; -import vben.wf.root.domain.vo.WfProcDefVo; @Component @RequiredArgsConstructor -public class WfProcDefDao { +public class BpmProcDefDao { public String selectExxmlById(Long id){ - String sql="SELECT exxml FROM wf_proc_def WHERE id = ?"; + String sql="SELECT exxml FROM bpm_proc_def WHERE id = ?"; return jdbcHelper.findString(sql,id); } public String selectExxmlByProid(Long proid){ - String sql="SELECT f.exxml FROM wf_proc_def f inner join wf_proc_inst p on p.prdid=f.id WHERE p.id = ?"; + String sql="SELECT f.exxml FROM bpm_proc_def f inner join bpm_proc_inst p on p.prdid=f.id WHERE p.id = ?"; return jdbcHelper.findString(sql,proid); } public String selectDixmlById(Long id){ - String sql="SELECT dixml FROM wf_proc_def WHERE id = ?"; + String sql="SELECT dixml FROM bpm_proc_def WHERE id = ?"; return jdbcHelper.findString(sql,id); } public String selectDixmlByProid(Long proid){ - String sql="SELECT f.dixml FROM wf_proc_def f inner join wf_proc_inst p on p.prdid=f.id WHERE p.id = ?"; + String sql="SELECT f.dixml FROM bpm_proc_def f inner join bpm_proc_inst p on p.prdid=f.id WHERE p.id = ?"; return jdbcHelper.findString(sql,proid); } - public WfProcDef findById(Long id) { - String sql = "select * from wf_proc_def where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfProcDef.class), id); + public BpmProcDef findById(Long id) { + String sql = "select * from bpm_proc_def where id = ?"; + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmProcDef.class), id); } - public WfProcDefVo findVoById(Long id) { - String sql = "select * from wf_proc_def where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfProcDefVo.class), id); + public BpmProcDefVo findVoById(Long id) { + String sql = "select * from bpm_proc_def where id = ?"; + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmProcDefVo.class), id); } - public void insert(WfProcDef main) { - Isqler isqler = new Isqler("wf_proc_def"); + public void insert(BpmProcDef main) { + Isqler isqler = new Isqler("bpm_proc_def"); if(main.getId()==null){ main.setId(IdUtils.getSnowflakeNextId()); } @@ -61,8 +61,8 @@ public class WfProcDefDao { jdbcHelper.getTp().update(isqler.getSql(), isqler.getParams()); } - public void update(WfProcDef main) { - Usqler usqler = new Usqler("wf_proc_def"); + public void update(BpmProcDef main) { + Usqler usqler = new Usqler("bpm_proc_def"); usqler.addWhere("id=?", main.getId()); usqler.add("name", main.getName()); usqler.add("avtag", main.getAvtag()); @@ -76,7 +76,7 @@ public class WfProcDefDao { } public void deleteById(Long id) { - jdbcHelper.update("delete from wf_proc_def where id=?", id); + jdbcHelper.update("delete from bpm_proc_def where id=?", id); } private final JdbcHelper jdbcHelper; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/def/WfProcDefService.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/def/BpmProcDefService.java similarity index 86% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/def/WfProcDefService.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/def/BpmProcDefService.java index 7c6b6f0..af57af4 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/def/WfProcDefService.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/def/BpmProcDefService.java @@ -1,22 +1,22 @@ -package vben.wf.proc.def; +package vben.bpm.proc.def; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import vben.wf.root.domain.Zproc; -import vben.wf.root.domain.vo.WfProcDefVo; +import vben.bpm.root.domain.Zproc; +import vben.bpm.root.domain.vo.BpmProcDefVo; @Transactional(rollbackFor = Exception.class) @Service @RequiredArgsConstructor -public class WfProcDefService { +public class BpmProcDefService { - public WfProcDefVo findVoById(Long id) { + public BpmProcDefVo findVoById(Long id) { return dao.findVoById(id); } - private final WfProcDefDao dao; + private final BpmProcDefDao dao; @Transactional(readOnly = true) public void setExxml(Zproc zproc) { diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/inst/WfProcInst.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/inst/BpmProcInst.java similarity index 85% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/inst/WfProcInst.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/inst/BpmProcInst.java index e707214..b4d6157 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/inst/WfProcInst.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/inst/BpmProcInst.java @@ -1,7 +1,7 @@ -package vben.wf.proc.inst; +package vben.bpm.proc.inst; import lombok.Data; -import vben.wf.root.domain.Zproc; +import vben.bpm.root.domain.Zproc; import java.io.Serial; import java.io.Serializable; @@ -9,7 +9,7 @@ import java.util.Date; @Data -public class WfProcInst implements Serializable { +public class BpmProcInst implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -75,11 +75,11 @@ public class WfProcInst implements Serializable { */ private String state; - public WfProcInst() { + public BpmProcInst() { } - public WfProcInst(Zproc zproc) { + public BpmProcInst(Zproc zproc) { this.id= zproc.getProid(); this.name= zproc.getProna(); this.prdid= zproc.getPrdid(); diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/inst/WfProcInstDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/inst/BpmProcInstDao.java similarity index 81% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/inst/WfProcInstDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/inst/BpmProcInstDao.java index 9eb76c2..7cfe0b4 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/inst/WfProcInstDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/inst/BpmProcInstDao.java @@ -1,4 +1,4 @@ -package vben.wf.proc.inst; +package vben.bpm.proc.inst; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -11,16 +11,16 @@ import vben.common.jdbc.sqler.Usqler; @Component @RequiredArgsConstructor -public class WfProcInstDao { +public class BpmProcInstDao { public void updateEndState(Long id){ - String sql="update wf_proc_inst set state='30' where id=?"; + String sql="update bpm_proc_inst set state='30' where id=?"; jdbcHelper.update(sql,id); } - private static final String table = "wf_proc_inst"; + private static final String table = "bpm_proc_inst"; - private void fieldHandle(BaseSqler sqler, WfProcInst main){ + private void fieldHandle(BaseSqler sqler, BpmProcInst main){ sqler.add("name", main.getName()); sqler.add("avtag", main.getAvtag()); sqler.add("notes", main.getNotes()); @@ -30,12 +30,12 @@ public class WfProcInstDao { sqler.add("state", main.getState()); } - public WfProcInst findById(Long id) { + public BpmProcInst findById(Long id) { String sql = "select * from "+table+" where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfProcInst.class), id); + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmProcInst.class), id); } - public void insert(WfProcInst main) { + public void insert(BpmProcInst main) { Isqler sqler = new Isqler(table); if(main.getId()==null){ main.setId(IdUtils.getSnowflakeNextId()); @@ -49,7 +49,7 @@ public class WfProcInstDao { jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams()); } - public void update(WfProcInst main) { + public void update(BpmProcInst main) { Usqler usqler = new Usqler(table); usqler.addWhere("id=?", main.getId()); usqler.add("uptim", main.getUptim()); diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/inst/WfProcInstService.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/inst/BpmProcInstService.java similarity index 67% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/inst/WfProcInstService.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/inst/BpmProcInstService.java index 15b593c..0b1824e 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/inst/WfProcInstService.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/inst/BpmProcInstService.java @@ -1,7 +1,7 @@ -package vben.wf.proc.inst; +package vben.bpm.proc.inst; import lombok.RequiredArgsConstructor; -import vben.wf.root.domain.Zproc; +import vben.bpm.root.domain.Zproc; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -9,11 +9,11 @@ import org.springframework.transaction.annotation.Transactional; @Transactional(rollbackFor = Exception.class) @Service @RequiredArgsConstructor -public class WfProcInstService { +public class BpmProcInstService { - private final WfProcInstDao dao; + private final BpmProcInstDao dao; - public void insert(WfProcInst process) { + public void insert(BpmProcInst process) { dao.insert(process); } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/node/WfProcNode.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNode.java similarity index 90% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/node/WfProcNode.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNode.java index 8dbca24..cce2f7c 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/node/WfProcNode.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNode.java @@ -1,4 +1,4 @@ -package vben.wf.proc.node; +package vben.bpm.proc.node; import lombok.Data; @@ -8,7 +8,7 @@ import java.util.Date; @Data -public class WfProcNode implements Serializable { +public class BpmProcNode implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeDao.java similarity index 75% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeDao.java index 58e3962..e89d4f9 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeDao.java @@ -1,4 +1,4 @@ -package vben.wf.proc.node; +package vben.bpm.proc.node; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -10,15 +10,15 @@ import vben.common.jdbc.sqler.Usqler; @Component @RequiredArgsConstructor -public class WfProcNodeDao { +public class BpmProcNodeDao { - public WfProcNode findById(Long id) { - String sql = "select * from wf_proc_node where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfProcNode.class), id); + public BpmProcNode findById(Long id) { + String sql = "select * from bpm_proc_node where id = ?"; + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmProcNode.class), id); } - public void insert(WfProcNode main) { - Isqler isqler = new Isqler("wf_proc_node"); + public void insert(BpmProcNode main) { + Isqler isqler = new Isqler("bpm_proc_node"); if(main.getId()==null){ main.setId(IdUtils.getSnowflakeNextId()); } @@ -33,8 +33,8 @@ public class WfProcNodeDao { jdbcHelper.getTp().update(isqler.getSql(), isqler.getParams()); } - public void update(WfProcNode main) { - Usqler usqler = new Usqler("wf_proc_node"); + public void update(BpmProcNode main) { + Usqler usqler = new Usqler("bpm_proc_node"); usqler.addWhere("id=?", main.getId()); usqler.add("facno", main.getFacno()); usqler.add("facna", main.getFacna()); @@ -47,7 +47,7 @@ public class WfProcNodeDao { } public void deleteById(Long id) { - jdbcHelper.update("delete from wf_proc_node where id=?", id); + jdbcHelper.update("delete from bpm_proc_node where id=?", id); } private final JdbcHelper jdbcHelper; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeHi.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeHi.java similarity index 91% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeHi.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeHi.java index c617c38..d0d4641 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeHi.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeHi.java @@ -1,4 +1,4 @@ -package vben.wf.proc.node; +package vben.bpm.proc.node; import lombok.Data; @@ -8,7 +8,7 @@ import java.util.Date; @Data -public class WfProcNodeHi implements Serializable { +public class BpmProcNodeHi implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeHiDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeHiDao.java similarity index 79% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeHiDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeHiDao.java index d095450..692e46f 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeHiDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeHiDao.java @@ -1,4 +1,4 @@ -package vben.wf.proc.node; +package vben.bpm.proc.node; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -13,16 +13,16 @@ import java.util.List; @Component @RequiredArgsConstructor -public class WfProcNodeHiDao { +public class BpmProcNodeHiDao { public List findFacnoListByProid(Long proid){ - String sql="select distinct t.facno id from wf_proc_node_hi t where proid= ?"; + String sql="select distinct t.facno id from bpm_proc_node_hi t where proid= ?"; return jdbcHelper.findSlist(sql, proid); } - private static final String table = "wf_proc_node_hi"; + private static final String table = "bpm_proc_node_hi"; - private void fieldHandle(BaseSqler sqler, WfProcNodeHi main){ + private void fieldHandle(BaseSqler sqler, BpmProcNodeHi main){ sqler.add("facno", main.getFacno()); sqler.add("facna", main.getFacna()); sqler.add("flway", main.getFlway()); @@ -34,12 +34,12 @@ public class WfProcNodeHiDao { sqler.add("entim", main.getEntim()); } - public WfProcNodeHi findById(Long id) { + public BpmProcNodeHi findById(Long id) { String sql = "select * from "+table+" where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfProcNodeHi.class), id); + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmProcNodeHi.class), id); } - public void insert(WfProcNodeHi main) { + public void insert(BpmProcNodeHi main) { Isqler isqler = new Isqler(table); if(main.getId()==null){ main.setId(IdUtils.getSnowflakeNextId()); @@ -49,7 +49,7 @@ public class WfProcNodeHiDao { jdbcHelper.getTp().update(isqler.getSql(), isqler.getParams()); } - public void update(WfProcNodeHi main) { + public void update(BpmProcNodeHi main) { Usqler usqler = new Usqler(table); usqler.addWhere("id=?", main.getId()); fieldHandle(usqler,main); diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeHiService.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeHiService.java similarity index 81% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeHiService.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeHiService.java index 0c461b1..2ecdf7f 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeHiService.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeHiService.java @@ -1,9 +1,9 @@ -package vben.wf.proc.node; +package vben.bpm.proc.node; import lombok.RequiredArgsConstructor; -import vben.wf.root.domain.Zproc; -import vben.wf.root.domain.Znode; +import vben.bpm.root.domain.Zproc; +import vben.bpm.root.domain.Znode; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -13,12 +13,12 @@ import java.util.List; @Transactional(rollbackFor = Exception.class) @Service @RequiredArgsConstructor -public class WfProcNodeHiService { +public class BpmProcNodeHiService { - private final WfProcNodeHiDao dao; + private final BpmProcNodeHiDao dao; public void saveStartNode(Zproc zproc) { - WfProcNodeHi startNode = new WfProcNodeHi(); + BpmProcNodeHi startNode = new BpmProcNodeHi(); startNode.setFacno("NS"); startNode.setFacna("开始节点"); startNode.setFacty("start"); @@ -31,7 +31,7 @@ public class WfProcNodeHiService { } public void saveDraftNode(Zproc zproc, Znode znode) { - WfProcNodeHi draftNode = new WfProcNodeHi(); + BpmProcNodeHi draftNode = new BpmProcNodeHi(); draftNode.setFacno("N1"); draftNode.setFacna("起草节点"); draftNode.setFacty("draft"); @@ -45,7 +45,7 @@ public class WfProcNodeHiService { } public Long saveEndNode(Zproc zproc) { - WfProcNodeHi endNode = new WfProcNodeHi(); + BpmProcNodeHi endNode = new BpmProcNodeHi(); endNode.setFacno("NE"); endNode.setFacna("结束节点"); endNode.setFacty("end"); @@ -58,7 +58,7 @@ public class WfProcNodeHiService { public void saveNodeList(Zproc zproc, List list) { for (Znode znode : list) { - WfProcNodeHi node = new WfProcNodeHi(); + BpmProcNodeHi node = new BpmProcNodeHi(); node.setFacno(znode.getFacno()); node.setFacna(znode.getFacna()); node.setFacty(znode.getFacty()); @@ -71,8 +71,8 @@ public class WfProcNodeHiService { } } - public WfProcNodeHi saveNode(WfProcNode main) { - WfProcNodeHi node = new WfProcNodeHi(); + public BpmProcNodeHi saveNode(BpmProcNode main) { + BpmProcNodeHi node = new BpmProcNodeHi(); node.setId(main.getId()); node.setFacno(main.getFacno()); node.setFacna(main.getFacna()); @@ -85,7 +85,7 @@ public class WfProcNodeHiService { } @Transactional(readOnly = true) - public WfProcNodeHi findOne(Long id) { + public BpmProcNodeHi findOne(Long id) { return dao.findById(id); } @@ -97,7 +97,7 @@ public class WfProcNodeHiService { return dao.findFacnoListByProid(proid); } - public void update(WfProcNodeHi nodeHi) { + public void update(BpmProcNodeHi nodeHi) { dao.update(nodeHi); } } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeService.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeService.java similarity index 67% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeService.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeService.java index 4bb53fb..a771b02 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/node/WfProcNodeService.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/node/BpmProcNodeService.java @@ -1,20 +1,20 @@ -package vben.wf.proc.node; +package vben.bpm.proc.node; import lombok.RequiredArgsConstructor; -import vben.wf.root.domain.Zproc; -import vben.wf.root.domain.Znode; +import vben.bpm.root.domain.Zproc; +import vben.bpm.root.domain.Znode; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Transactional(rollbackFor = Exception.class) @Service @RequiredArgsConstructor -public class WfProcNodeService { +public class BpmProcNodeService { - private final WfProcNodeDao dao; + private final BpmProcNodeDao dao; - public WfProcNode saveNode(Zproc zproc, Znode znode) { - WfProcNode node = new WfProcNode(); + public BpmProcNode saveNode(Zproc zproc, Znode znode) { + BpmProcNode node = new BpmProcNode(); node.setFacno(znode.getFacno()); node.setFacna(znode.getFacna()); node.setFacty(znode.getFacty()); @@ -26,7 +26,7 @@ public class WfProcNodeService { } @Transactional(readOnly = true) - public WfProcNode findOne(Long id) { + public BpmProcNode findOne(Long id) { return dao.findById(id); } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/param/WfProcParam.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/param/BpmProcParam.java similarity index 85% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/param/WfProcParam.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/param/BpmProcParam.java index 1a39a29..00e9011 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/param/WfProcParam.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/param/BpmProcParam.java @@ -1,4 +1,4 @@ -package vben.wf.proc.param; +package vben.bpm.proc.param; import lombok.Data; @@ -6,7 +6,7 @@ import java.io.Serial; import java.io.Serializable; @Data -public class WfProcParam implements Serializable { +public class BpmProcParam implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/param/WfProcParamDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/param/BpmProcParamDao.java similarity index 70% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/param/WfProcParamDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/param/BpmProcParamDao.java index 1088d40..4df9ea2 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/param/WfProcParamDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/param/BpmProcParamDao.java @@ -1,4 +1,4 @@ -package vben.wf.proc.param; +package vben.bpm.proc.param; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -8,26 +8,26 @@ import vben.common.jdbc.sqler.BaseSqler; import vben.common.jdbc.sqler.Isqler; import vben.common.jdbc.sqler.JdbcHelper; import vben.common.jdbc.sqler.Usqler; -import vben.wf.root.domain.dto.WfParamDto; +import vben.bpm.root.domain.dto.BpmParamDto; @Component @RequiredArgsConstructor -public class WfProcParamDao { +public class BpmProcParamDao { - public WfParamDto findParam(Long proid, String pakey){ - String sql="select t.id,t.paval from wf_proc_param t where t.proid=? and t.pakey=?"; - WfParamDto dto = null; + public BpmParamDto findParam(Long proid, String pakey){ + String sql="select t.id,t.paval from bpm_proc_param t where t.proid=? and t.pakey=?"; + BpmParamDto dto = null; try { - dto = jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfParamDto.class),proid,pakey); + dto = jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmParamDto.class),proid,pakey); } catch (Exception ignored) { } return dto; } - private static final String table = "wf_proc_param"; + private static final String table = "bpm_proc_param"; - private void fieldHandle(BaseSqler sqler, WfProcParam main){ + private void fieldHandle(BaseSqler sqler, BpmProcParam main){ sqler.add("pakey", main.getPakey()); sqler.add("paval", main.getPaval()); sqler.add("offty", main.getOffty()); @@ -35,12 +35,12 @@ public class WfProcParamDao { sqler.add("proid", main.getProid()); } - public WfProcParam findById(Long id) { + public BpmProcParam findById(Long id) { String sql = "select * from "+table+" where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfProcParam.class), id); + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmProcParam.class), id); } - public void insert(WfProcParam main) { + public void insert(BpmProcParam main) { Isqler isqler = new Isqler(table); if(main.getId()==null){ main.setId(IdUtils.getSnowflakeNextId()); @@ -50,7 +50,7 @@ public class WfProcParamDao { jdbcHelper.getTp().update(isqler.getSql(), isqler.getParams()); } - public void update(WfProcParam main) { + public void update(BpmProcParam main) { Usqler usqler = new Usqler(table); usqler.addWhere("id=?", main.getId()); fieldHandle(usqler,main); diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/param/WfProcParamService.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/param/BpmProcParamService.java similarity index 60% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/param/WfProcParamService.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/param/BpmProcParamService.java index 55f3284..431b92a 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/param/WfProcParamService.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/param/BpmProcParamService.java @@ -1,19 +1,19 @@ -package vben.wf.proc.param; +package vben.bpm.proc.param; import lombok.RequiredArgsConstructor; -import vben.wf.root.domain.dto.WfParamDto; +import vben.bpm.root.domain.dto.BpmParamDto; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Transactional(rollbackFor = Exception.class) @Service @RequiredArgsConstructor -public class WfProcParamService { +public class BpmProcParamService { - private final WfProcParamDao dao; + private final BpmProcParamDao dao; - public void save(WfProcParam param) { + public void save(BpmProcParam param) { dao.insert(param); } @@ -21,7 +21,7 @@ public class WfProcParamService { dao.deleteById(id); } - public WfParamDto findParam(Long proid, String pakey) { + public BpmParamDto findParam(Long proid, String pakey) { return dao.findParam(proid, pakey); } } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/task/WfProcTask.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTask.java similarity index 92% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/task/WfProcTask.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTask.java index 509de1d..15a42d3 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/task/WfProcTask.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTask.java @@ -1,4 +1,4 @@ -package vben.wf.proc.task; +package vben.bpm.proc.task; import lombok.Data; @@ -8,7 +8,7 @@ import java.util.Date; @Data -public class WfProcTask implements Serializable { +public class BpmProcTask implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskDao.java similarity index 67% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskDao.java index 8ab6416..8b649d8 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskDao.java @@ -1,4 +1,4 @@ -package vben.wf.proc.task; +package vben.bpm.proc.task; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -8,56 +8,56 @@ import vben.common.jdbc.sqler.BaseSqler; import vben.common.jdbc.sqler.Isqler; import vben.common.jdbc.sqler.JdbcHelper; import vben.common.jdbc.sqler.Usqler; -import vben.wf.root.domain.dto.WfTaskDto; -import vben.wf.root.domain.vo.WfCcInfoVo; +import vben.bpm.root.domain.dto.BpmTaskDto; +import vben.bpm.root.domain.vo.BpmCcInfoVo; import java.util.List; @Component @RequiredArgsConstructor -public class WfProcTaskDao { +public class BpmProcTaskDao { - public List findAllByNodidAndActagOrderByOrnum(Long nodid){ - String sql="select * from wf_proc_task where nodid = ? and actag=0 order by ornum"; - return jdbcHelper.getTp().query(sql,new BeanPropertyRowMapper<>(WfProcTask.class),nodid); + public List findAllByNodidAndActagOrderByOrnum(Long nodid){ + String sql="select * from bpm_proc_task where nodid = ? and actag=0 order by ornum"; + return jdbcHelper.getTp().query(sql,new BeanPropertyRowMapper<>(BpmProcTask.class),nodid); } - public List findAllByNodidOrderByOrnum(Long nodid){ - String sql="select * from wf_proc_task where nodid = ? order by ornum"; - return jdbcHelper.getTp().query(sql, new BeanPropertyRowMapper<>(WfProcTask.class),nodid); + public List findAllByNodidOrderByOrnum(Long nodid){ + String sql="select * from bpm_proc_task where nodid = ? order by ornum"; + return jdbcHelper.getTp().query(sql, new BeanPropertyRowMapper<>(BpmProcTask.class),nodid); } - public List findCurrentExmenByProid(Long proid){ + public List findCurrentExmenByProid(Long proid){ String sql=""" select t.id,t.exuid,t.nodid,o.name exuna,t.type,n.facno nodno,n.facna nodna - from wf_proc_task t + from bpm_proc_task t inner join sys_org o on o.id=t.exuid - inner join wf_proc_node n on n.id=t.nodid + inner join bpm_proc_node n on n.id=t.nodid where t.proid=? and t.actag=1 order by t.ornum """; - return jdbcHelper.getTp().query(sql, new BeanPropertyRowMapper<>(WfTaskDto.class),proid); + return jdbcHelper.getTp().query(sql, new BeanPropertyRowMapper<>(BpmTaskDto.class),proid); } - public List findCanCancelCommunitMen(String proid){ + public List findCanCancelCommunitMen(String proid){ String sql=""" - select o.id,o.name,t.id tasid from wf_proc_task t + select o.id,o.name,t.id tasid from bpm_proc_task t inner join sys_org o on o.id=t.exuid where t.proid=? and t.type='communicate' order by t.sttim """; - return jdbcHelper.getTp().query(sql,new BeanPropertyRowMapper<>(WfCcInfoVo.class),proid); + return jdbcHelper.getTp().query(sql,new BeanPropertyRowMapper<>(BpmCcInfoVo.class),proid); } public void deleteAllPyProid(Long proid) { jdbcHelper.update("delete from "+table+" where proid=?", proid); } - private static final String table = "wf_proc_task"; + private static final String table = "bpm_proc_task"; - private void fieldHandle(BaseSqler sqler, WfProcTask main){ + private void fieldHandle(BaseSqler sqler, BpmProcTask main){ sqler.add("type", main.getType()); sqler.add("proid", main.getProid()); sqler.add("nodid", main.getNodid()); @@ -71,12 +71,12 @@ public class WfProcTaskDao { sqler.add("exuid", main.getExuid()); } - public WfProcTask findById(Long id) { + public BpmProcTask findById(Long id) { String sql = "select * from "+table+" where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfProcTask.class), id); + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmProcTask.class), id); } - public void insert(WfProcTask main) { + public void insert(BpmProcTask main) { Isqler isqler = new Isqler(table); if(main.getId()==null){ main.setId(IdUtils.getSnowflakeNextId()); @@ -86,7 +86,7 @@ public class WfProcTaskDao { jdbcHelper.getTp().update(isqler.getSql(), isqler.getParams()); } - public void update(WfProcTask main) { + public void update(BpmProcTask main) { Usqler usqler = new Usqler(table); usqler.addWhere("id=?", main.getId()); fieldHandle(usqler,main); diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskHi.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskHi.java similarity index 91% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskHi.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskHi.java index f9b70ec..6cc7b49 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskHi.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskHi.java @@ -1,4 +1,4 @@ -package vben.wf.proc.task; +package vben.bpm.proc.task; import lombok.Data; @@ -8,7 +8,7 @@ import java.util.Date; @Data -public class WfProcTaskHi implements Serializable { +public class BpmProcTaskHi implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskHiDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskHiDao.java similarity index 81% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskHiDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskHiDao.java index 4c914dc..2e9ab54 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskHiDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskHiDao.java @@ -1,4 +1,4 @@ -package vben.wf.proc.task; +package vben.bpm.proc.task; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -11,11 +11,11 @@ import vben.common.jdbc.sqler.Usqler; @Component @RequiredArgsConstructor -public class WfProcTaskHiDao { +public class BpmProcTaskHiDao { - private static final String table = "wf_proc_task_hi"; + private static final String table = "bpm_proc_task_hi"; - private void fieldHandle(BaseSqler sqler, WfProcTaskHi main){ + private void fieldHandle(BaseSqler sqler, BpmProcTaskHi main){ sqler.add("type", main.getType()); sqler.add("proid", main.getProid()); sqler.add("nodid", main.getNodid()); @@ -27,12 +27,12 @@ public class WfProcTaskHiDao { sqler.add("exuid", main.getExuid()); } - public WfProcTaskHi findById(Long id) { + public BpmProcTaskHi findById(Long id) { String sql = "select * from "+table+" where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfProcTaskHi.class), id); + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmProcTaskHi.class), id); } - public void insert(WfProcTaskHi main) { + public void insert(BpmProcTaskHi main) { Isqler isqler = new Isqler(table); if(main.getId()==null){ main.setId(IdUtils.getSnowflakeNextId()); @@ -42,7 +42,7 @@ public class WfProcTaskHiDao { jdbcHelper.getTp().update(isqler.getSql(), isqler.getParams()); } - public void update(WfProcTaskHi main) { + public void update(BpmProcTaskHi main) { Usqler usqler = new Usqler(table); usqler.addWhere("id=?", main.getId()); fieldHandle(usqler,main); diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskHiService.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskHiService.java similarity index 71% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskHiService.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskHiService.java index c342543..d02c94e 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskHiService.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskHiService.java @@ -1,4 +1,4 @@ -package vben.wf.proc.task; +package vben.bpm.proc.task; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -10,12 +10,12 @@ import java.util.List; @Transactional(rollbackFor = Exception.class) @Service @RequiredArgsConstructor -public class WfProcTaskHiService { +public class BpmProcTaskHiService { - private final WfProcTaskHiDao dao; + private final BpmProcTaskHiDao dao; - public WfProcTaskHi createTask(WfProcTask mainTask) { - WfProcTaskHi histTask = new WfProcTaskHi(); + public BpmProcTaskHi createTask(BpmProcTask mainTask) { + BpmProcTaskHi histTask = new BpmProcTaskHi(); histTask.setId(mainTask.getId()); histTask.setProid(mainTask.getProid()); histTask.setState("20"); @@ -26,11 +26,11 @@ public class WfProcTaskHiService { return histTask; } - public List createTaskList(List mainTaskList) { - List list=new ArrayList<>(); - for (WfProcTask mainTask : mainTaskList) { + public List createTaskList(List mainTaskList) { + List list=new ArrayList<>(); + for (BpmProcTask mainTask : mainTaskList) { if(mainTask.getActag()){ - WfProcTaskHi histTask = new WfProcTaskHi(); + BpmProcTaskHi histTask = new BpmProcTaskHi(); histTask.setId(mainTask.getId()); histTask.setProid(mainTask.getProid()); histTask.setState("20"); @@ -46,12 +46,12 @@ public class WfProcTaskHiService { @Transactional(readOnly = true) - public WfProcTaskHi findOne(Long id) { + public BpmProcTaskHi findOne(Long id) { return dao.findById(id); } - public void update(WfProcTaskHi task) { + public void update(BpmProcTaskHi task) { dao.update(task); } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskService.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskService.java similarity index 78% rename from vben-modules/vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskService.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskService.java index 64ce559..270bfad 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/proc/task/WfProcTaskService.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/proc/task/BpmProcTaskService.java @@ -1,4 +1,4 @@ -package vben.wf.proc.task; +package vben.bpm.proc.task; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -7,10 +7,10 @@ import vben.common.core.utils.StrUtils; import vben.common.jdbc.dto.Stree; import vben.common.jdbc.sqler.JdbcHelper; import vben.common.jdbc.sqler.Sqler; -import vben.wf.root.domain.Znode; -import vben.wf.root.domain.Zproc; -import vben.wf.root.domain.dto.WfTaskDto; -import vben.wf.root.domain.vo.WfCcInfoVo; +import vben.bpm.root.domain.Znode; +import vben.bpm.root.domain.Zproc; +import vben.bpm.root.domain.dto.BpmTaskDto; +import vben.bpm.root.domain.vo.BpmCcInfoVo; import java.util.ArrayList; import java.util.List; @@ -19,20 +19,20 @@ import java.util.Map; @Transactional(rollbackFor = Exception.class) @Service @RequiredArgsConstructor -public class WfProcTaskService { +public class BpmProcTaskService { - private final WfProcTaskDao dao; + private final BpmProcTaskDao dao; - public List findAllByNodidNotActive(Long nodid) { + public List findAllByNodidNotActive(Long nodid) { return dao.findAllByNodidAndActagOrderByOrnum(nodid); } - public List findAllByNodid(Long nodid) { + public List findAllByNodid(Long nodid) { return dao.findAllByNodidOrderByOrnum(nodid); } - public WfProcTask createTask(Zproc zproc, Znode znode) { - WfProcTask task = new WfProcTask(); + public BpmProcTask createTask(Zproc zproc, Znode znode) { + BpmProcTask task = new BpmProcTask(); task.setProid(zproc.getProid()); task.setState("20"); task.setExuid(znode.getExuids()); @@ -44,10 +44,10 @@ public class WfProcTaskService { return task; } - public List createTaskList(Zproc zproc, Znode znode) { - List list = new ArrayList<>(); + public List createTaskList(Zproc zproc, Znode znode) { + List list = new ArrayList<>(); if (StrUtils.isNotBlank(znode.getExuids()) && !znode.getExuids().contains(";")) { - WfProcTask task = new WfProcTask(); + BpmProcTask task = new BpmProcTask(); task.setProid(zproc.getProid()); task.setState("20"); task.setExuid(znode.getExuids()); @@ -60,7 +60,7 @@ public class WfProcTaskService { } else if ("1".equals(znode.getFlway())) { String[] ids = znode.getExuids().split(";"); for (int i = 0; i < ids.length; i++) { - WfProcTask task = new WfProcTask(); + BpmProcTask task = new BpmProcTask(); task.setProid(zproc.getProid()); task.setState("20"); task.setExuid(ids[i]); @@ -78,7 +78,7 @@ public class WfProcTaskService { } else if ("2".equals(znode.getFlway()) || "3".equals(znode.getFlway())) { String[] ids = znode.getExuids().split(";"); for (int i = 0; i < ids.length; i++) { - WfProcTask task = new WfProcTask(); + BpmProcTask task = new BpmProcTask(); task.setProid(zproc.getProid()); task.setState("20"); task.setExuid(ids[i]); @@ -94,7 +94,7 @@ public class WfProcTaskService { } @Transactional(readOnly = true) - public WfProcTask findOne(Long id) { + public BpmProcTask findOne(Long id) { return dao.findById(id); } @@ -106,7 +106,7 @@ public class WfProcTaskService { dao.deleteAllPyProid(proid); } - public void update(WfProcTask task) { + public void update(BpmProcTask task) { dao.update(task); } @@ -119,8 +119,8 @@ public class WfProcTaskService { } if (!"(".equals(ids)) { ids = ids.substring(0, ids.length() - 1) + ")"; - Sqler sqler = new Sqler("n.id as tasid,t.id as nodid,o.name exnam,n.exuid,t.proid,t.facno,t.facna", "wf_proc_node"); - sqler.addInnerJoin("", "wf_proc_task n", "n.nodid=t.id"); + Sqler sqler = new Sqler("n.id as tasid,t.id as nodid,o.name exnam,n.exuid,t.proid,t.facno,t.facna", "bpm_proc_node"); + sqler.addInnerJoin("", "bpm_proc_task n", "n.nodid=t.id"); sqler.addInnerJoin("", "sys_org o", "o.id=n.exuid"); sqler.addWhere("t.proid in " + ids + " and n.actag=1"); sqler.addOrder("t.proid"); @@ -156,20 +156,20 @@ public class WfProcTaskService { } public void updateCommunicateState(Zproc zproc){ - String sql = "select count(1) from wf_proc_task t where t.proid=? and t.type='communicate'"; + String sql = "select count(1) from bpm_proc_task t where t.proid=? and t.type='communicate'"; Integer count = jdbcHelper.getTp().queryForObject(sql,Integer.class, zproc.getProid()); if (count != null && count == 0) { - jdbcHelper.update("update wf_proc_task set type='review' where proid=?", zproc.getProid()); + jdbcHelper.update("update bpm_proc_task set type='review' where proid=?", zproc.getProid()); } } - public List findCurrentExmenByProid(Long proid) { + public List findCurrentExmenByProid(Long proid) { return dao.findCurrentExmenByProid(proid); } - public List findCanCancelCommunitMen(String proid) { + public List findCanCancelCommunitMen(String proid) { return dao.findCanCancelCommunitMen(proid); } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/root/WfApi.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/BpmApi.java similarity index 64% rename from vben-modules/vben-wf/src/main/java/vben/wf/root/WfApi.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/root/BpmApi.java index 353cefe..1d393c3 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/root/WfApi.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/BpmApi.java @@ -1,4 +1,4 @@ -package vben.wf.root; +package vben.bpm.root; import cn.dev33.satoken.annotation.SaIgnore; import lombok.RequiredArgsConstructor; @@ -11,57 +11,57 @@ import vben.common.core.utils.StrUtils; import vben.common.jdbc.dto.SidNamePid; import vben.common.satoken.utils.LoginHelper; import vben.common.web.core.BaseController; -import vben.wf.org.tree.WfUserService; -import vben.wf.proc.audit.WfProcAuditService; -import vben.wf.proc.def.WfProcDefService; -import vben.wf.proc.node.WfProcNodeHiService; -import vben.wf.proc.param.WfProcParamService; -import vben.wf.proc.task.WfProcTaskService; -import vben.wf.root.domain.Znode; -import vben.wf.root.domain.dto.WfParamDto; -import vben.wf.root.domain.dto.WfProcDto; -import vben.wf.root.domain.dto.WfTaskDto; -import vben.wf.root.domain.vo.*; +import vben.bpm.org.tree.BpmUserService; +import vben.bpm.proc.audit.BpmProcAuditService; +import vben.bpm.proc.def.BpmProcDefService; +import vben.bpm.proc.node.BpmProcNodeHiService; +import vben.bpm.proc.param.BpmProcParamService; +import vben.bpm.proc.task.BpmProcTaskService; +import vben.bpm.root.domain.Znode; +import vben.bpm.root.domain.dto.BpmParamDto; +import vben.bpm.root.domain.dto.BpmProcDto; +import vben.bpm.root.domain.dto.BpmTaskDto; +import vben.bpm.root.domain.vo.*; import java.util.*; @RestController -@RequestMapping("/wf") +@RequestMapping("/bpm") @SaIgnore @RequiredArgsConstructor -public class WfApi extends BaseController { +public class BpmApi extends BaseController { - private final WfProcDefService wfProcDefService; + private final BpmProcDefService bpmProcDefService; - private final WfUserService wfUserService; + private final BpmUserService bpmUserService; - private final WfProcAuditService wfAuditService; + private final BpmProcAuditService bpmAuditService; - private final WfProcTaskService wfProcTaskService; + private final BpmProcTaskService bpmProcTaskService; - private final WfProcNodeHiService wfProcNodeHiService; + private final BpmProcNodeHiService bpmProcNodeHiService; - private final WfProcParamService wfProcParamService; + private final BpmProcParamService bpmProcParamService; - private final WfHandler wfHandler; + private final BpmHandler bpmHandler; /** * 获取流程初始化信息 */ @GetMapping("initInfo") - public R initInfo(Long prdid, String busty) throws Exception { + public R initInfo(Long prdid, String busty) throws Exception { - String exxml = wfProcDefService.findExxmlById(prdid); - WfProcDto wfProcDto = new WfProcDto(); - wfProcDto.setPrdid(prdid); - wfProcDto.setBusty(busty); -// wfProcDto.setFacno("N1"); - List goalNodes = wfHandler.getGoalNodes(wfProcDto,exxml,"N1"); - WfInitVo vo = new WfInitVo(); + String exxml = bpmProcDefService.findExxmlById(prdid); + BpmProcDto bpmProcDto = new BpmProcDto(); + bpmProcDto.setPrdid(prdid); + bpmProcDto.setBusty(busty); +// bpmProcDto.setFacno("N1"); + List goalNodes = bpmHandler.getGoalNodes(bpmProcDto,exxml,"N1"); + BpmInitVo vo = new BpmInitVo(); if (goalNodes.isEmpty()) { - WfGoalVo goalVo = new WfGoalVo(); + BpmGoalVo goalVo = new BpmGoalVo(); goalVo.setTarno("NX"); goalVo.setTarna("未知节点"); goalVo.setTamen("暂时无法计算"); @@ -69,8 +69,8 @@ public class WfApi extends BaseController { return R.ok(vo); } for (Znode goalNode : goalNodes) { - String tamen = wfUserService.calcTamen(null, goalNode.getExuids()); - WfGoalVo goalVo = new WfGoalVo(); + String tamen = bpmUserService.calcTamen(null, goalNode.getExuids()); + BpmGoalVo goalVo = new BpmGoalVo(); goalVo.setTamen(tamen); goalVo.setTarna(goalNode.getFacna()); goalVo.setTarno(goalNode.getFacno()); @@ -84,12 +84,12 @@ public class WfApi extends BaseController { public R> viewInfo(Long proid) { Map map = new HashMap<>(); - List audits = wfAuditService.findListByProid(proid); + List audits = bpmAuditService.findListByProid(proid); map.put("audits", audits); //历史处理人 String hiHamen = ""; - for (WfAuditVo audit : audits) { + for (BpmAuditVo audit : audits) { if (audit.getHauna() != null && !hiHamen.contains(audit.getHauna())) { hiHamen += audit.getHauna() + ";"; } @@ -102,14 +102,14 @@ public class WfApi extends BaseController { boolean cutag = false; //当前用户是否在当前处理人中 - List wfTaskDtoList = wfProcTaskService.findCurrentExmenByProid(proid); + List bpmTaskDtoList = bpmProcTaskService.findCurrentExmenByProid(proid); // String cuExmen = ""; String userId = LoginHelper.getUserId(); // Zproc zproc = new Zproc(); //当前节点，当用户同时有一个流程的两个待办时，可能有多个节点 - List cuTasks = new ArrayList<>(); - for (WfTaskDto task : wfTaskDtoList) { + List cuTasks = new ArrayList<>(); + for (BpmTaskDto task : bpmTaskDtoList) { // if (zproc.getProid() == null) { // zproc.setProid(proid); // zproc.setNodid(task.getNodid()); @@ -118,7 +118,7 @@ public class WfApi extends BaseController { // } // cuExmen += task.getExuna() + ";"; - WfTaskVo taskVo = new WfTaskVo(); + BpmTaskVo taskVo = new BpmTaskVo(); taskVo.setNodid(task.getNodid()); taskVo.setNodno(task.getNodno()); taskVo.setNodna(task.getNodna()); @@ -136,8 +136,8 @@ public class WfApi extends BaseController { } //根据岗位来查询当前用户是否在当前处理人中 if (!cutag) { - List postIdList = wfUserService.findPostIdList(userId); - for (WfTaskVo cuTask : cuTasks) { + List postIdList = bpmUserService.findPostIdList(userId); + for (BpmTaskVo cuTask : cuTasks) { for (String postId : postIdList) { if (postId.equals(cuTask.getExuid())) { cutag = true; @@ -149,7 +149,7 @@ public class WfApi extends BaseController { break; } } -// for (WfTaskDto task : wfTaskDtoList) { +// for (BpmTaskDto task : bpmTaskDtoList) { // // } } @@ -174,16 +174,16 @@ public class WfApi extends BaseController { @GetMapping("passInfo") public R> passInfo(Long proid, String facno, String busty) throws Exception { Map map = new HashMap<>(); - List goals = new ArrayList<>(); + List goals = new ArrayList<>(); Znode nextNode; //如果是之前被驳回的节点则，通过后要判断是否直接返回驳回的节点 - WfParamDto paramDto = wfProcParamService.findParam(proid, facno + "#refuse"); - String exxml = wfProcDefService.findExxmlByProid(proid); + BpmParamDto paramDto = bpmProcParamService.findParam(proid, facno + "#refuse"); + String exxml = bpmProcDefService.findExxmlByProid(proid); if (paramDto != null && StrUtils.isNotBlank(paramDto.getPaval())) { - Znode backRefuseNode = wfHandler.getNodeInfo(exxml, paramDto.getPaval()); - String tamen = wfUserService.calcTamen(proid, backRefuseNode.getExuids()); - WfGoalVo goalVo = new WfGoalVo(); + Znode backRefuseNode = bpmHandler.getNodeInfo(exxml, paramDto.getPaval()); + String tamen = bpmUserService.calcTamen(proid, backRefuseNode.getExuids()); + BpmGoalVo goalVo = new BpmGoalVo(); goalVo.setTamen(tamen); goalVo.setTarna(backRefuseNode.getFacna()); goalVo.setTarno(backRefuseNode.getFacno()); @@ -193,14 +193,14 @@ public class WfApi extends BaseController { return R.ok(map); } - WfProcDto wfProcDto = new WfProcDto(); - wfProcDto.setProid(proid); - wfProcDto.setBusty(busty); -// wfProcDto.setFacno(facno); -// List goalNodes = wfHandler.getGoalNodes(null, proid, busty, exxml, facno); - List goalNodes = wfHandler.getGoalNodes(wfProcDto, exxml,facno); + BpmProcDto bpmProcDto = new BpmProcDto(); + bpmProcDto.setProid(proid); + bpmProcDto.setBusty(busty); +// bpmProcDto.setFacno(facno); +// List goalNodes = bpmHandler.getGoalNodes(null, proid, busty, exxml, facno); + List goalNodes = bpmHandler.getGoalNodes(bpmProcDto, exxml,facno); if (goalNodes.isEmpty()) { - WfGoalVo goalVo = new WfGoalVo(); + BpmGoalVo goalVo = new BpmGoalVo(); goalVo.setTarno("NX"); goalVo.setTarna("未知节点"); goalVo.setTamen("暂时无法计算"); @@ -209,8 +209,8 @@ public class WfApi extends BaseController { return R.ok(map); } for (Znode goalNode : goalNodes) { - String tamen = wfUserService.calcTamen(null, goalNode.getExuids()); - WfGoalVo goalVo = new WfGoalVo(); + String tamen = bpmUserService.calcTamen(null, goalNode.getExuids()); + BpmGoalVo goalVo = new BpmGoalVo(); goalVo.setTamen(tamen); goalVo.setTarna(goalNode.getFacna()); goalVo.setTarno(goalNode.getFacno()); @@ -220,14 +220,14 @@ public class WfApi extends BaseController { return R.ok(map); // else { -// List wfTaskList = wfTaskService.findAllByProidNotActive(proid); -// if (wfTaskList.size() > 0) { -// nextNode = wfndler.getNodeInfo(exxml, facno); +// List bpmTaskList = bpmTaskService.findAllByProidNotActive(proid); +// if (bpmTaskList.size() > 0) { +// nextNode = bpmndler.getNodeInfo(exxml, facno); // } else { // Zcond zcond = new Zcond(); // zcond.setProid(proid); // zcond.setBusty(busty); -// nextNode = wfHandler.calcTarget(zcond, exxml, facno); +// nextNode = bpmHandler.calcTarget(zcond, exxml, facno); // } // } // String tamen = "暂时无法计算"; @@ -236,7 +236,7 @@ public class WfApi extends BaseController { // nextNode.setFacno("NX"); // nextNode.setFacna("未知节点"); // } else { -// tamen = wfUserService.calcTamen(proid, nextNode.getExuids()); +// tamen = bpmUserService.calcTamen(proid, nextNode.getExuids()); // } // map.put("tarno", nextNode.getFacno()); // map.put("tarna", nextNode.getFacna()); @@ -252,7 +252,7 @@ public class WfApi extends BaseController { */ @GetMapping("initXml") public R initXml(Long prdid) { - return R.ok("操作成功", wfProcDefService.findDixmlById(prdid)); + return R.ok("操作成功", bpmProcDefService.findDixmlById(prdid)); } /** @@ -264,9 +264,9 @@ public class WfApi extends BaseController { @GetMapping("viewXml") public R viewXml(Long proid) { Map map = new HashMap<>(); - String dixml = wfProcDefService.findDixmlByProid(proid); - List nodeList = wfProcNodeHiService.findFacnoListByProid(proid); - List allLineList = wfHandler.GetAllLineList(dixml); + String dixml = bpmProcDefService.findDixmlByProid(proid); + List nodeList = bpmProcNodeHiService.findFacnoListByProid(proid); + List allLineList = bpmHandler.GetAllLineList(dixml); HashSet lineSet = new HashSet<>(); for (SidNamePid zinp : allLineList) { for (String node : nodeList) { @@ -297,15 +297,15 @@ public class WfApi extends BaseController { * @return */ @GetMapping("refuseInfo") - public R> refuseInfo(Long proid, String facno) { - List refuseNodeList = wfAuditService.findCanRefuseNodeList(proid); - List list = new ArrayList<>(); - for (WfRefuseInfoVo node : refuseNodeList) { + public R> refuseInfo(Long proid, String facno) { + List refuseNodeList = bpmAuditService.findCanRefuseNodeList(proid); + List list = new ArrayList<>(); + for (BpmRefuseInfoVo node : refuseNodeList) { if (facno.equals(node.getRefno())) { break; } boolean flag = false; - for (WfRefuseInfoVo node2 : list) { + for (BpmRefuseInfoVo node2 : list) { if (node.getRefno().equals(node2.getRefno())) { flag = true; break; @@ -326,13 +326,13 @@ public class WfApi extends BaseController { */ @GetMapping("ccInfo") public R ccInfo(String proid) { - return R.ok(wfProcTaskService.findCanCancelCommunitMen(proid)); + return R.ok(bpmProcTaskService.findCanCancelCommunitMen(proid)); } @GetMapping("def/{id}") - public R getInfo(@PathVariable("id") Long id) { - return R.ok(wfProcDefService.findVoById(id)); + public R getInfo(@PathVariable("id") Long id) { + return R.ok(bpmProcDefService.findVoById(id)); } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/root/WfHandler.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/BpmHandler.java similarity index 88% rename from vben-modules/vben-wf/src/main/java/vben/wf/root/WfHandler.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/root/BpmHandler.java index 7235318..61179d4 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/root/WfHandler.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/BpmHandler.java @@ -1,4 +1,4 @@ -package vben.wf.root; +package vben.bpm.root; import cn.hutool.script.ScriptRuntimeException; import cn.hutool.script.ScriptUtil; @@ -13,9 +13,9 @@ import org.springframework.stereotype.Component; import vben.common.core.exception.ServiceException; import vben.common.core.utils.StrUtils; import vben.common.jdbc.dto.SidNamePid; -import vben.wf.root.domain.Znode; -import vben.wf.root.domain.Zproc; -import vben.wf.root.domain.dto.WfProcDto; +import vben.bpm.root.domain.Znode; +import vben.bpm.root.domain.Zproc; +import vben.bpm.root.domain.dto.BpmProcDto; import javax.script.CompiledScript; import javax.script.ScriptException; @@ -28,13 +28,13 @@ import java.util.List; @Component @Slf4j @RequiredArgsConstructor -public class WfHandler { +public class BpmHandler { /** * 获取目标节点 * @return */ - public List getGoalNodes(WfProcDto wfProcDto, String exxml, String facno) throws Exception { + public List getGoalNodes(BpmProcDto bpmProcDto, String exxml, String facno) throws Exception { SAXReader reader = new SAXReader(); Reader stringReader = new StringReader(exxml); Document document = null; @@ -60,7 +60,7 @@ public class WfHandler { } List passNodes = new ArrayList<>(); List goalNodes = new ArrayList<>(); - nodeFlow(wfProcDto,rootNode, passNodes, goalNodes, currNode); + nodeFlow(bpmProcDto,rootNode, passNodes, goalNodes, currNode); return goalNodes; } @@ -134,16 +134,16 @@ public class WfHandler { } } } - WfProcDto wfProcDto = new WfProcDto(); - wfProcDto.setProid(zproc.getProid()); - wfProcDto.setPrdid(zproc.getPrdid()); - wfProcDto.setBusty(zproc.getBusty()); + BpmProcDto bpmProcDto = new BpmProcDto(); + bpmProcDto.setProid(zproc.getProid()); + bpmProcDto.setPrdid(zproc.getPrdid()); + bpmProcDto.setBusty(zproc.getBusty()); //判断nextNode是否为审批节点 - nodeFlow(wfProcDto, rootNode, passNodes, goalNodes, currNode); + nodeFlow(bpmProcDto, rootNode, passNodes, goalNodes, currNode); } //节点流转 - private void nodeFlow(WfProcDto wfProcDto, Element rootNode, List passNodes, List goalNodes, Znode currNode) { + private void nodeFlow(BpmProcDto bpmProcDto, Element rootNode, List passNodes, List goalNodes, Znode currNode) { if ("NE".equals(currNode.getTarno())) { currNode.setTarna("结束节点"); Znode endNode = new Znode(); @@ -161,11 +161,11 @@ public class WfHandler { if ("task".equals(xmlNode.getName()) || "userTask".equals(xmlNode.getName())) { //判断节点是否为审批节点，如果为审批节点则取处理人 userTask(xmlNode, userIds, goalNodes, currNode); - } else if ("exclusiveGateway".equals(xmlNode.getName()) && wfProcDto.getProid() != null) { + } else if ("exclusiveGateway".equals(xmlNode.getName()) && bpmProcDto.getProid() != null) { //如果是互斥网关，则根据分支条件流转到下一个节点 - exclusiveGateway(wfProcDto, rootNode, passNodes, xmlNode, goalNodes, currNode); + exclusiveGateway(bpmProcDto, rootNode, passNodes, xmlNode, goalNodes, currNode); } else if ("parallelGateway".equals(xmlNode.getName())) { - parallelGateway(wfProcDto, rootNode, passNodes, xmlNode, goalNodes, currNode); + parallelGateway(bpmProcDto, rootNode, passNodes, xmlNode, goalNodes, currNode); } break; } @@ -184,7 +184,7 @@ public class WfHandler { userIds = xmlNode.attribute("hamen").getValue(); } else { // if (zcond.getProid() != null && "$creator".equals(node.attribute("hamen").getValue())) { -// userIds = jdbcDao.findOneString("select cruid from wf_proc_inst where id=?", zcond.getProid()); +// userIds = jdbcDao.findOneString("select cruid from bpm_proc_inst where id=?", zcond.getProid()); // } // if (StrUtils.isBlank(userIds) && zcond.getPrdid() != null && "$creator".equals(node.attribute("hamen").getValue())) { // userIds = XuserUtil.getUserId(); @@ -217,7 +217,7 @@ public class WfHandler { /** * 互斥网关逻辑 */ - private void exclusiveGateway(WfProcDto wfProcDto, Element rootNode, List passNodes, + private void exclusiveGateway(BpmProcDto bpmProcDto, Element rootNode, List passNodes, Element xmlNode, List goalNodes, Znode currNode) { String nextNodeId = ""; currNode.setTarna(xmlNode.attribute("name").getValue()); @@ -228,7 +228,7 @@ public class WfHandler { if ("sequenceFlow".equals(xnode.getName())) { if (currNode.getTarno().equals(xnode.attribute("sourceRef").getValue())) { - if (checkConds(wfProcDto, xnode.attribute("conds").getValue())) { + if (checkConds(bpmProcDto, xnode.attribute("conds").getValue())) { nextNodeId = xnode.attribute("targetRef").getValue(); System.out.println("条件分支转到:" + nextNodeId); Znode nextNode = new Znode(); @@ -249,13 +249,13 @@ public class WfHandler { if (!flag) { goalNodes.add(nextNode); } - nodeFlow(wfProcDto, rootNode, passNodes, goalNodes, nextNode); + nodeFlow(bpmProcDto, rootNode, passNodes, goalNodes, nextNode); return; } } } } - if (wfProcDto.isSherr()) { + if (bpmProcDto.isSherr()) { throw new ServiceException("没有合适的条件分支满足流程流转"); } } @@ -263,7 +263,7 @@ public class WfHandler { /** * 并行网关逻辑 */ - private void parallelGateway(WfProcDto wfProcDto, Element rootNode, List passNodes, + private void parallelGateway(BpmProcDto bpmProcDto, Element rootNode, List passNodes, Element xmlNode, List goalNodes, Znode currNode) { //需要判断是并行开始还是并行结束 Iterator pgList = xmlNode.elementIterator(); @@ -296,8 +296,8 @@ public class WfHandler { // goalNodes.add(pendNode); // } // - String sql = "select count(1) from wf_proc_node where proid=? and facno<>? and facty <> 'pend'"; - int size = jdbcTemplate.queryForObject(sql,Integer.class, wfProcDto.getProid(), currNode.getFacno()); + String sql = "select count(1) from bpm_proc_node where proid=? and facno<>? and facty <> 'pend'"; + int size = jdbcTemplate.queryForObject(sql,Integer.class, bpmProcDto.getProid(), currNode.getFacno()); //判断是否都达到了，都达到则流程往下流 // boolean isAllArrive = true; @@ -325,7 +325,7 @@ public class WfHandler { nextNode.setTarno(nextNodeId); passNodes.add(nextNode); goalNodes.add(nextNode); - nodeFlow(wfProcDto, rootNode, passNodes, goalNodes, nextNode); + nodeFlow(bpmProcDto, rootNode, passNodes, goalNodes, nextNode); break; } } @@ -359,7 +359,7 @@ public class WfHandler { if (!flag) { goalNodes.add(nextNode); } - nodeFlow(wfProcDto, rootNode, passNodes, goalNodes, nextNode); + nodeFlow(bpmProcDto, rootNode, passNodes, goalNodes, nextNode); } } } @@ -367,22 +367,22 @@ public class WfHandler { } //互斥网关判断条件 - private boolean checkConds(WfProcDto wfProcDto, String expression) { + private boolean checkConds(BpmProcDto bpmProcDto, String expression) { System.out.println("条件为：" + expression); if (StrUtils.isBlank(expression)) { return false; } String zformJson = ""; - if (wfProcDto != null) { - System.out.println("busty:" + wfProcDto.getBusty()); - if ("oaFlow".equals(wfProcDto.getBusty())) { + if (bpmProcDto != null) { + System.out.println("busty:" + bpmProcDto.getBusty()); + if ("oaFlow".equals(bpmProcDto.getBusty())) { String sql = "select fdata from oa_flow_main where id=?"; - zformJson = jdbcTemplate.queryForObject(sql, new Long[]{wfProcDto.getProid()}, String.class); + zformJson = jdbcTemplate.queryForObject(sql, new Long[]{bpmProcDto.getProid()}, String.class); //zformJson = jdbcDao.findOneString(sql, zcond.getProid()); - } else if (wfProcDto.getBusty().startsWith("app_")) { - String sql = "select cond from wf_proc_cond where id=?"; - zformJson = jdbcTemplate.queryForObject(sql, new Long[]{wfProcDto.getProid()}, String.class); + } else if (bpmProcDto.getBusty().startsWith("app_")) { + String sql = "select cond from bpm_proc_cond where id=?"; + zformJson = jdbcTemplate.queryForObject(sql, new Long[]{bpmProcDto.getProid()}, String.class); //zformJson = jdbcDao.findOneString(sql, zcond.getProid()); } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/root/WfService.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/BpmService.java similarity index 81% rename from vben-modules/vben-wf/src/main/java/vben/wf/root/WfService.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/root/BpmService.java index ce77aae..4f3501f 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/root/WfService.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/BpmService.java @@ -1,4 +1,4 @@ -package vben.wf.root; +package vben.bpm.root; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -12,24 +12,24 @@ import vben.common.jdbc.dto.DbType; import vben.common.jdbc.sqler.JdbcHelper; import vben.common.jdbc.sqler.Sqler; import vben.common.satoken.utils.LoginHelper; -import vben.wf.org.tree.WfOrgTreeService; -import vben.wf.proc.audit.WfProcAuditService; -import vben.wf.proc.def.WfProcDefService; -import vben.wf.proc.inst.WfProcInst; -import vben.wf.proc.inst.WfProcInstService; -import vben.wf.proc.node.WfProcNode; -import vben.wf.proc.node.WfProcNodeHi; -import vben.wf.proc.node.WfProcNodeHiService; -import vben.wf.proc.node.WfProcNodeService; -import vben.wf.proc.param.WfProcParam; -import vben.wf.proc.param.WfProcParamService; -import vben.wf.proc.task.WfProcTask; -import vben.wf.proc.task.WfProcTaskHi; -import vben.wf.proc.task.WfProcTaskHiService; -import vben.wf.proc.task.WfProcTaskService; -import vben.wf.root.domain.Znode; -import vben.wf.root.domain.Zproc; -import vben.wf.todo.main.WfTodoMainService; +import vben.bpm.org.tree.BpmOrgTreeService; +import vben.bpm.proc.audit.BpmProcAuditService; +import vben.bpm.proc.def.BpmProcDefService; +import vben.bpm.proc.inst.BpmProcInst; +import vben.bpm.proc.inst.BpmProcInstService; +import vben.bpm.proc.node.BpmProcNode; +import vben.bpm.proc.node.BpmProcNodeHi; +import vben.bpm.proc.node.BpmProcNodeHiService; +import vben.bpm.proc.node.BpmProcNodeService; +import vben.bpm.proc.param.BpmProcParam; +import vben.bpm.proc.param.BpmProcParamService; +import vben.bpm.proc.task.BpmProcTask; +import vben.bpm.proc.task.BpmProcTaskHi; +import vben.bpm.proc.task.BpmProcTaskHiService; +import vben.bpm.proc.task.BpmProcTaskService; +import vben.bpm.root.domain.Znode; +import vben.bpm.root.domain.Zproc; +import vben.bpm.todo.main.BpmTodoMainService; import java.util.ArrayList; import java.util.Date; @@ -38,13 +38,13 @@ import java.util.List; @RequiredArgsConstructor @Service @Transactional(rollbackFor = Exception.class) -public class WfService { +public class BpmService { //启动流程 public void start(Zproc zproc) throws Exception { //1 保存流程实例 - WfProcInst wfProcInst = new WfProcInst(zproc); - processService.insert(wfProcInst); + BpmProcInst bpmProcInst = new BpmProcInst(zproc); + processService.insert(bpmProcInst); //2 历史节点表保存开始节点 nodeHiService.saveStartNode(zproc); @@ -56,7 +56,7 @@ public class WfService { draftNode.setFacty("draft"); List passNodes = new ArrayList<>(); List goalNodes = new ArrayList<>(); - wfHandler.procFlow(zproc, passNodes, goalNodes, draftNode);//流转核心逻辑 + bpmHandler.procFlow(zproc, passNodes, goalNodes, draftNode);//流转核心逻辑 if (goalNodes.isEmpty()) { throw new Exception("未找到下一个可流的流程节点"); } @@ -75,13 +75,13 @@ public class WfService { //4.4 当前节点表保存下一个待审批节点 for (Znode goalNode : goalNodes) { - WfProcNode nodeMain = nodeService.saveNode(zproc, goalNode); + BpmProcNode nodeMain = nodeService.saveNode(zproc, goalNode); goalNode.setNodid(nodeMain.getId()); //4.5 历史节点表保存下一个待审批节点 nodeHiService.saveNode(nodeMain); //5.1 当前任务表创建待审节点的任务 - List mainTaskList = taskService.createTaskList(zproc, goalNode); + List mainTaskList = taskService.createTaskList(zproc, goalNode); //5.2 历史任务表创建待审节点的任务 taskHiService.createTaskList(mainTaskList); //6 发起待办 @@ -93,7 +93,7 @@ public class WfService { public String flow(Zproc zproc) { //以防万一流转时未设置流程发起人 if(zproc.getInuid()==null){ - String inuidSql = "select cruid from wf_proc_inst where id=?"; + String inuidSql = "select cruid from bpm_proc_inst where id=?"; String inuid = jdbcHelper.findString(inuidSql, zproc.getProid()); zproc.setInuid(inuid); } @@ -148,7 +148,7 @@ public class WfService { } //2.1 将历史任务变成已办 - WfProcTaskHi histTask = taskHiService.findOne(zproc.getTasid()); + BpmProcTaskHi histTask = taskHiService.findOne(zproc.getTasid()); histTask.setHauid(zproc.getHauid()); histTask.setEntim(new Date()); histTask.setState("30"); @@ -165,28 +165,28 @@ public class WfService { currNode.setTarno(zproc.getTarno()); currNode.setTarna(zproc.getTarna()); } - WfProcNode dbNode = nodeService.findOne(currNode.getNodid()); + BpmProcNode dbNode = nodeService.findOne(currNode.getNodid()); if ("1".equals(dbNode.getFlway())) { - List wfProcTaskList = taskService.findAllByNodidNotActive(dbNode.getId()); - if (wfProcTaskList.size() > 0) { - wfProcTaskList.get(0).setActag(true); - taskService.update(wfProcTaskList.get(0)); - taskHiService.createTask(wfProcTaskList.get(0)); + List bpmProcTaskList = taskService.findAllByNodidNotActive(dbNode.getId()); + if (bpmProcTaskList.size() > 0) { + bpmProcTaskList.get(0).setActag(true); + taskService.update(bpmProcTaskList.get(0)); + taskHiService.createTask(bpmProcTaskList.get(0)); //7.1 删除之前的待办 todoService.doneTodos(zproc); //7.2 发起新待办 - todoService.sendTodos(zproc, wfProcTaskList); + todoService.sendTodos(zproc, bpmProcTaskList); return false; } } else if ("2".equals(dbNode.getFlway())) { - List wfProcTaskList = taskService.findAllByNodid(dbNode.getId()); - for (WfProcTask wfProcTask : wfProcTaskList) { - taskService.delete(wfProcTask.getId()); - taskHiService.delete(wfProcTask.getId()); + List bpmProcTaskList = taskService.findAllByNodid(dbNode.getId()); + for (BpmProcTask bpmProcTask : bpmProcTaskList) { + taskService.delete(bpmProcTask.getId()); + taskHiService.delete(bpmProcTask.getId()); } } else if ("3".equals(dbNode.getFlway())) { - List wfProcTaskList = taskService.findAllByNodid(dbNode.getId()); - if (!wfProcTaskList.isEmpty()) { + List bpmProcTaskList = taskService.findAllByNodid(dbNode.getId()); + if (!bpmProcTaskList.isEmpty()) { todoService.doneTodo(zproc); return false; } @@ -196,7 +196,7 @@ public class WfService { defService.setExxml(zproc);//查找并设置流程xml定义 List passNodes = new ArrayList<>(); List goalNodes = new ArrayList<>(); - wfHandler.procFlow(zproc, passNodes, goalNodes, currNode);//流转核心逻辑 + bpmHandler.procFlow(zproc, passNodes, goalNodes, currNode);//流转核心逻辑 if (goalNodes.isEmpty()) { throw new ServiceException("未找到下一个可流的流程节点"); @@ -208,7 +208,7 @@ public class WfService { //4.1 将历史节点变成已办 - WfProcNodeHi histNode = nodeHiService.findOne(zproc.getNodid()); + BpmProcNodeHi histNode = nodeHiService.findOne(zproc.getNodid()); histNode.setEntim(new Date()); histNode.setState("30"); histNode.setTarno(currNode.getTarno()); @@ -225,13 +225,13 @@ public class WfService { if (!"end".equals(goalNodes.get(0).getFacty())) { for (Znode goalNode : goalNodes) { //5.1 当前节点表保存下一个待审批节点 - WfProcNode nodeMain = nodeService.saveNode(zproc, goalNode); + BpmProcNode nodeMain = nodeService.saveNode(zproc, goalNode); goalNode.setNodid(nodeMain.getId()); //5.2 历史节点表保存下一个待审批节点 nodeHiService.saveNode(nodeMain); //6.1 当前任务表创建待审节点的任务 - List mainTaskList = taskService.createTaskList(zproc, goalNode); + List mainTaskList = taskService.createTaskList(zproc, goalNode); //6.2 历史任务表创建待审节点的任务 taskHiService.createTaskList(mainTaskList); @@ -261,7 +261,7 @@ public class WfService { private Znode handlerRefuse(Zproc zproc) { zproc.setHauid(LoginHelper.getUserId()); -// String sql = "select m.id \"proid\",m.name \"prona\" from wf_inst_proc m where m.id=?"; +// String sql = "select m.id \"proid\",m.name \"prona\" from bpm_inst_proc m where m.id=?"; // Map map = jdbcDao.findMap(sql, zproc.getProid()); // zproc.setProna((String) map.get("prona")); @@ -276,7 +276,7 @@ public class WfService { auditService.saveAudit(zproc); //2.1 将历史任务变成已办 - WfProcTaskHi histTask = taskHiService.findOne(zproc.getTasid()); + BpmProcTaskHi histTask = taskHiService.findOne(zproc.getTasid()); histTask.setHauid(zproc.getHauid()); histTask.setEntim(new Date()); histTask.setState("30"); @@ -293,16 +293,16 @@ public class WfService { // refuseNode.setFacna(zproc.getTarna()); // refuseNode.setExuids(zproc.getExuid()); // refuseNode.setFacty("review"); - String xmlSql = "select t.exxml \"exxml\" from wf_proc_def t inner join wf_proc_inst m on m.prdid=t.id where m.id=?"; + String xmlSql = "select t.exxml \"exxml\" from bpm_proc_def t inner join bpm_proc_inst m on m.prdid=t.id where m.id=?"; String exxml = jdbcHelper.findString(xmlSql, zproc.getProid()); - Znode refuseNode = wfHandler.getNodeInfo(exxml, zproc.getTarno()); + Znode refuseNode = bpmHandler.getNodeInfo(exxml, zproc.getTarno()); if ("N1".equals(refuseNode.getFacno())) { refuseNode.setExuids(zproc.getInuid()); } exuidsTran(zproc.getInuid(), refuseNode); //4.1 将历史节点变成已办 - WfProcNodeHi histNode = nodeHiService.findOne(zproc.getNodid()); + BpmProcNodeHi histNode = nodeHiService.findOne(zproc.getNodid()); histNode.setTarno(zproc.getTarno()); histNode.setTarna(zproc.getTarna()); histNode.setEntim(new Date()); @@ -312,13 +312,13 @@ public class WfService { nodeService.delete(zproc.getNodid()); //5.1 当前节点表保存下一个待审批节点 - WfProcNode nodeMain = nodeService.saveNode(zproc, refuseNode); + BpmProcNode nodeMain = nodeService.saveNode(zproc, refuseNode); refuseNode.setNodid(nodeMain.getId()); //5.2 历史节点表保存下一个待审批节点 nodeHiService.saveNode(nodeMain); //5.3 如果驳回时勾选了 驳回的节点通过后直接返回本节点 if (zproc.getRetag()) { - WfProcParam param = new WfProcParam(); + BpmProcParam param = new BpmProcParam(); param.setId(IdUtils.getSnowflakeNextId()); param.setProid(zproc.getProid()); param.setOffty("proc"); @@ -329,7 +329,7 @@ public class WfService { } //6.1 当前任务表创建待审节点的任务 - List mainTaskList = taskService.createTaskList(zproc, refuseNode); + List mainTaskList = taskService.createTaskList(zproc, refuseNode); //6.2 历史任务表创建待审节点的任务 taskHiService.createTaskList(mainTaskList); @@ -344,7 +344,7 @@ public class WfService { private void handlerTurn(Zproc zproc) { zproc.setHauid(LoginHelper.getUserId()); -// String sql = "select m.id \"proid\",m.name \"prona\" from wf_proc_inst m where m.id=?"; +// String sql = "select m.id \"proid\",m.name \"prona\" from bpm_proc_inst m where m.id=?"; // Map map = jdbcDao.findMap(sql, zproc.getProid()); // zproc.setProna((String) map.get("prona")); @@ -358,7 +358,7 @@ public class WfService { //1 评审表保存当前节点的评审信息 auditService.saveAudit(zproc); - WfProcTask task = taskService.findOne(zproc.getTasid()); + BpmProcTask task = taskService.findOne(zproc.getTasid()); task.setExuid(zproc.getTuuid()); taskService.update(task); @@ -371,7 +371,7 @@ public class WfService { private void handlerCommunicate(Zproc zproc) { zproc.setHauid(LoginHelper.getUserId()); -// String sql = "select m.id \"proid\",m.name \"prona\" from wf_proc_inst m where m.id=?"; +// String sql = "select m.id \"proid\",m.name \"prona\" from bpm_proc_inst m where m.id=?"; // Map map = jdbcDao.findMap(sql, zproc.getProid()); // zproc.setProna((String) map.get("prona")); @@ -410,9 +410,9 @@ public class WfService { currNode.setFlway("3"); //6.1 将当前任务置为沟通状态 - jdbcHelper.update("update wf_proc_task set type='to_communicate' where id=?", zproc.getTasid()); + jdbcHelper.update("update bpm_proc_task set type='to_communicate' where id=?", zproc.getTasid()); //6.2 当前任务表创建待审节点的任务 - List mainTaskList = taskService.createTaskList(zproc, currNode); + List mainTaskList = taskService.createTaskList(zproc, currNode); //6.3 历史任务表创建待审节点的任务 taskHiService.createTaskList(mainTaskList); @@ -430,7 +430,7 @@ public class WfService { auditService.saveAudit(zproc); //2.1 将历史任务变成已办 - WfProcTaskHi histTask = taskHiService.findOne(zproc.getTasid()); + BpmProcTaskHi histTask = taskHiService.findOne(zproc.getTasid()); histTask.setHauid(zproc.getHauid()); histTask.setEntim(new Date()); histTask.setState("30"); @@ -445,10 +445,10 @@ public class WfService { todoService.doneTodo(zproc); //判断发起沟通的人那边是否所有沟通都有回复了，如果都回复，讲状态改为待审 -// String sql = "select count(1) from wf_proc_task t where t.proid=? and t.type='communicate'"; +// String sql = "select count(1) from bpm_proc_task t where t.proid=? and t.type='communicate'"; // Integer count = jdbcDao.getTp().queryForObject(sql, Integer.class,zproc.getProid()); // if (count != null && count == 0) { -// jdbcDao.update("update wf_proc_task set type='review' where proid=?", zproc.getProid()); +// jdbcDao.update("update bpm_proc_task set type='review' where proid=?", zproc.getProid()); // } // Znode currNode = new Znode(zproc.getFacno()); @@ -459,7 +459,7 @@ public class WfService { // currNode.setFlway("3"); // // //6.1 当前任务表创建待审节点的任务 -// List mainTaskList = taskMainService.createTaskList(zproc, currNode); +// List mainTaskList = taskMainService.createTaskList(zproc, currNode); // //6.2 历史任务表创建待审节点的任务 // taskHistService.createTaskList(mainTaskList); // //7.2 发起新待办 @@ -474,7 +474,7 @@ public class WfService { String[] taskIds = zproc.getCcids().split(","); String userIds = ""; for (String taskId : taskIds) { - WfProcTaskHi histTask = taskHiService.findOne(Long.parseLong(taskId)); + BpmProcTaskHi histTask = taskHiService.findOne(Long.parseLong(taskId)); histTask.setHauid(zproc.getHauid()); histTask.setEntim(new Date()); histTask.setState("30"); @@ -495,11 +495,11 @@ public class WfService { // //2.3 判断发起沟通的人那边是否所有沟通都有回复了，如果都回复，讲状态改为待审 // taskService.updateCommunicateState(zproc); - String sql = "select count(1) from wf_proc_task t where t.proid=? and t.type='communicate'"; + String sql = "select count(1) from bpm_proc_task t where t.proid=? and t.type='communicate'"; Integer count = jdbcHelper.getTp().queryForObject(sql,Integer.class, zproc.getProid()); //如果取消了所有沟通人员，则更新状态 if (count != null && count == 0) { - jdbcHelper.update("update wf_proc_task set type='review' where id=?", zproc.getTasid()); + jdbcHelper.update("update bpm_proc_task set type='review' where id=?", zproc.getTasid()); } // Znode currNode = new Znode(zproc.getFacno()); // currNode.setNodid(zproc.getNodid()); @@ -509,7 +509,7 @@ public class WfService { // currNode.setFlway("3"); // // //6.1 当前任务表创建待审节点的任务 -// List mainTaskList = taskMainService.createTaskList(zproc, currNode); +// List mainTaskList = taskMainService.createTaskList(zproc, currNode); // //6.2 历史任务表创建待审节点的任务 // taskHistService.createTaskList(mainTaskList); // //7.2 发起新待办 @@ -520,7 +520,7 @@ public class WfService { //废弃流程 private void handlerAbandon(Zproc zproc) { zproc.setHauid(LoginHelper.getUserId()); -// String sql = "select m.id \"proid\",m.name \"prona\" from wf_proc_inst m where m.id=?"; +// String sql = "select m.id \"proid\",m.name \"prona\" from bpm_proc_inst m where m.id=?"; // Map map = jdbcDao.findMap(sql, zproc.getProid()); // zproc.setProna((String) map.get("prona")); @@ -528,7 +528,7 @@ public class WfService { //1 评审表保存当前节点的评审信息 auditService.saveAudit(zproc); //2.1 将历史任务变成已办 - WfProcTaskHi histTask = taskHiService.findOne(zproc.getTasid()); + BpmProcTaskHi histTask = taskHiService.findOne(zproc.getTasid()); histTask.setHauid(zproc.getHauid()); histTask.setEntim(new Date()); histTask.setState("30"); @@ -538,7 +538,7 @@ public class WfService { taskHiService.deleteAllByProidNotEnd(zproc.getProid()); //4.1 将历史节点变成已办 - WfProcNodeHi histNode = nodeHiService.findOne(zproc.getNodid()); + BpmProcNodeHi histNode = nodeHiService.findOne(zproc.getNodid()); histNode.setTarno(zproc.getTarno()); histNode.setTarna(zproc.getTarna()); histNode.setEntim(new Date()); @@ -558,7 +558,7 @@ public class WfService { if (org.getType() == 32) { // String cruid = LoginHelper.getUserId()+""; // if (proid != null) { -// String sql = "select cruid from wf_proc_inst where id=?"; +// String sql = "select cruid from bpm_proc_inst where id=?"; // cruid = jdbcHelper.findOneString(sql, proid); // } Org org2 = sysOrgRoleTreeService.calc(inuid, org.getId()); @@ -587,7 +587,7 @@ public class WfService { if (sysOrg.getType() == 32) { // String cruid = LoginHelper.getUserId()+""; // if (proid != null) { -// String sql = "select cruid from wf_proc_inst where id=?"; +// String sql = "select cruid from bpm_proc_inst where id=?"; // cruid = jdbcHelper.findOneString(sql, proid); // } Org org = sysOrgRoleTreeService.calc(inuid, sysOrg.getId()); @@ -602,8 +602,8 @@ public class WfService { } public Zproc getZproc(String proid) { - String sql = "select t.id as tasid,t.nodid,t.exuid,t.proid,n.facno,n.facna from wf_proc_task t" + - " inner join wf_proc_node n on n.id=t.nodid where t.proid=? and t.actag=1"; + String sql = "select t.id as tasid,t.nodid,t.exuid,t.proid,n.facno,n.facna from bpm_proc_task t" + + " inner join bpm_proc_node n on n.id=t.nodid where t.proid=? and t.actag=1"; List list = jdbcHelper.getTp().query(sql,new BeanPropertyRowMapper<>(Zproc.class),proid); String userid = LoginHelper.getUserId(); for (Zproc zproc : list) { @@ -639,26 +639,26 @@ public class WfService { //----------bean注入------------ private final JdbcHelper jdbcHelper; - private final WfOrgTreeService sysOrgRoleTreeService; + private final BpmOrgTreeService sysOrgRoleTreeService; - private final WfTodoMainService todoService; + private final BpmTodoMainService todoService; - private final WfProcTaskHiService taskHiService; + private final BpmProcTaskHiService taskHiService; - private final WfProcTaskService taskService; + private final BpmProcTaskService taskService; - private final WfProcNodeHiService nodeHiService; + private final BpmProcNodeHiService nodeHiService; - private final WfProcNodeService nodeService; + private final BpmProcNodeService nodeService; - private final WfProcAuditService auditService; + private final BpmProcAuditService auditService; - private final WfProcParamService paramService; + private final BpmProcParamService paramService; - private final WfProcDefService defService; + private final BpmProcDefService defService; - private final WfProcInstService processService; + private final BpmProcInstService processService; - private final WfHandler wfHandler; + private final BpmHandler bpmHandler; } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/Zcond.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/Zcond.java similarity index 87% rename from vben-modules/vben-wf/src/main/java/vben/wf/root/domain/Zcond.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/Zcond.java index 6d8945d..bdf94af 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/Zcond.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/Zcond.java @@ -1,4 +1,4 @@ -package vben.wf.root.domain; +package vben.bpm.root.domain; import lombok.Data; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/Znode.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/Znode.java similarity index 94% rename from vben-modules/vben-wf/src/main/java/vben/wf/root/domain/Znode.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/Znode.java index ecee0a8..98757eb 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/Znode.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/Znode.java @@ -1,4 +1,4 @@ -package vben.wf.root.domain; +package vben.bpm.root.domain; import lombok.Data; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/Zproc.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/Zproc.java similarity index 96% rename from vben-modules/vben-wf/src/main/java/vben/wf/root/domain/Zproc.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/Zproc.java index 07bda1d..877af24 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/Zproc.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/Zproc.java @@ -1,4 +1,4 @@ -package vben.wf.root.domain; +package vben.bpm.root.domain; import lombok.Data; @@ -60,7 +60,7 @@ public class Zproc { private Boolean retag=true; /** - * 驳回后的流程重新提交时的wf_proc_param的id + * 驳回后的流程重新提交时的bpm_proc_param的id */ private Long bacid; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/bo/WfStartBo.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/bo/BpmStartBo.java similarity index 85% rename from vben-modules/vben-wf/src/main/java/vben/wf/root/domain/bo/WfStartBo.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/bo/BpmStartBo.java index 4da1951..9b76750 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/bo/WfStartBo.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/bo/BpmStartBo.java @@ -1,11 +1,11 @@ -package vben.wf.root.domain.bo; +package vben.bpm.root.domain.bo; import jakarta.validation.constraints.NotNull; import lombok.Data; @Data -public class WfStartBo { +public class BpmStartBo { /** * 紧急程度 diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/dto/WfParamDto.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/dto/BpmParamDto.java similarity index 66% rename from vben-modules/vben-wf/src/main/java/vben/wf/root/domain/dto/WfParamDto.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/dto/BpmParamDto.java index 62da4c8..22f42cc 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/dto/WfParamDto.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/dto/BpmParamDto.java @@ -1,11 +1,11 @@ -package vben.wf.root.domain.dto; +package vben.bpm.root.domain.dto; import lombok.Data; import java.io.Serializable; @Data -public class WfParamDto implements Serializable { +public class BpmParamDto implements Serializable { /** * 任务ID */ diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/dto/WfProcDto.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/dto/BpmProcDto.java similarity index 84% rename from vben-modules/vben-wf/src/main/java/vben/wf/root/domain/dto/WfProcDto.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/dto/BpmProcDto.java index 14a116d..2e7df70 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/dto/WfProcDto.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/dto/BpmProcDto.java @@ -1,4 +1,4 @@ -package vben.wf.root.domain.dto; +package vben.bpm.root.domain.dto; import lombok.Data; @@ -6,7 +6,7 @@ import lombok.Data; * 流转用信息 */ @Data -public class WfProcDto { +public class BpmProcDto { /** * 流程实例ID @@ -44,7 +44,7 @@ public class WfProcDto { - public WfProcDto() { + public BpmProcDto() { } @@ -54,7 +54,7 @@ public class WfProcDto { // this.tarno = znode.getTarno(); // } -// public WfProcDto(Long proid, Long prdid, String busty) { +// public BpmProcDto(Long proid, Long prdid, String busty) { // this.proid = proid; // this.prdid = prdid; // this.busty = busty; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/dto/WfTaskDto.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/dto/BpmTaskDto.java similarity index 87% rename from vben-modules/vben-wf/src/main/java/vben/wf/root/domain/dto/WfTaskDto.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/dto/BpmTaskDto.java index abc4e1c..5cd0ff8 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/dto/WfTaskDto.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/dto/BpmTaskDto.java @@ -1,4 +1,4 @@ -package vben.wf.root.domain.dto; +package vben.bpm.root.domain.dto; import lombok.Data; @@ -7,7 +7,7 @@ import java.io.Serializable; @Data -public class WfTaskDto implements Serializable { +public class BpmTaskDto implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfAuditVo.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmAuditVo.java similarity index 90% rename from vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfAuditVo.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmAuditVo.java index 8f28f47..02269d2 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfAuditVo.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmAuditVo.java @@ -1,4 +1,4 @@ -package vben.wf.root.domain.vo; +package vben.bpm.root.domain.vo; import lombok.Data; @@ -8,7 +8,7 @@ import java.util.Date; @Data -public class WfAuditVo implements Serializable { +public class BpmAuditVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfCcInfoVo.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmCcInfoVo.java similarity index 61% rename from vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfCcInfoVo.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmCcInfoVo.java index 517ef33..1949180 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfCcInfoVo.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmCcInfoVo.java @@ -1,11 +1,11 @@ -package vben.wf.root.domain.vo; +package vben.bpm.root.domain.vo; import lombok.Data; import java.io.Serializable; @Data -public class WfCcInfoVo implements Serializable { +public class BpmCcInfoVo implements Serializable { private Long id; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfGoalVo.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmGoalVo.java similarity index 79% rename from vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfGoalVo.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmGoalVo.java index adeec50..5e1bcca 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfGoalVo.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmGoalVo.java @@ -1,4 +1,4 @@ -package vben.wf.root.domain.vo; +package vben.bpm.root.domain.vo; import lombok.Data; @@ -8,7 +8,7 @@ import java.io.Serializable; * 流程初始化Vo */ @Data -public class WfGoalVo implements Serializable { +public class BpmGoalVo implements Serializable { /** * 目标节点编号 diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfInitVo.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmInitVo.java similarity index 76% rename from vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfInitVo.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmInitVo.java index 38435b7..47cd0f8 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfInitVo.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmInitVo.java @@ -1,4 +1,4 @@ -package vben.wf.root.domain.vo; +package vben.bpm.root.domain.vo; import lombok.Data; @@ -10,7 +10,7 @@ import java.util.List; * 流程初始化Vo */ @Data -public class WfInitVo implements Serializable { +public class BpmInitVo implements Serializable { /** * 流程说明 @@ -18,7 +18,7 @@ public class WfInitVo implements Serializable { private String intro; - private List goals= new ArrayList<>(); + private List goals= new ArrayList<>(); // /** // * 目标节点编号 diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfProcDefVo.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmProcDefVo.java similarity index 54% rename from vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfProcDefVo.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmProcDefVo.java index 7d68690..ba5e1bc 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfProcDefVo.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmProcDefVo.java @@ -1,15 +1,15 @@ -package vben.wf.root.domain.vo; +package vben.bpm.root.domain.vo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import vben.wf.proc.def.WfProcDef; +import vben.bpm.proc.def.BpmProcDef; import java.io.Serializable; @Data -@AutoMapper(target = WfProcDef.class) -public class WfProcDefVo implements Serializable { +@AutoMapper(target = BpmProcDef.class) +public class BpmProcDefVo implements Serializable { /** * 主键 diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfRefuseInfoVo.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmRefuseInfoVo.java similarity index 68% rename from vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfRefuseInfoVo.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmRefuseInfoVo.java index a98c873..9254689 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfRefuseInfoVo.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmRefuseInfoVo.java @@ -1,4 +1,4 @@ -package vben.wf.root.domain.vo; +package vben.bpm.root.domain.vo; import lombok.Data; @@ -6,7 +6,7 @@ import java.io.Serializable; import java.util.Date; @Data -public class WfRefuseInfoVo implements Serializable { +public class BpmRefuseInfoVo implements Serializable { private String refno; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfTaskVo.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmTaskVo.java similarity index 87% rename from vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfTaskVo.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmTaskVo.java index 3746bdc..c77534c 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/root/domain/vo/WfTaskVo.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/root/domain/vo/BpmTaskVo.java @@ -1,11 +1,11 @@ -package vben.wf.root.domain.vo; +package vben.bpm.root.domain.vo; import lombok.Data; import java.io.Serializable; @Data -public class WfTaskVo implements Serializable { +public class BpmTaskVo implements Serializable { /** * 当前任务ID diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/todo/done/WfTodoDone.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/done/BpmTodoDone.java similarity index 85% rename from vben-modules/vben-wf/src/main/java/vben/wf/todo/done/WfTodoDone.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/todo/done/BpmTodoDone.java index 944ca24..b64d61d 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/todo/done/WfTodoDone.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/done/BpmTodoDone.java @@ -1,4 +1,4 @@ -package vben.wf.todo.done; +package vben.bpm.todo.done; import lombok.Data; @@ -8,7 +8,7 @@ import java.util.Date; * 流程待办完结 */ @Data -public class WfTodoDone { +public class BpmTodoDone { /** * 主键ID diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/todo/done/WfTodoDoneDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/done/BpmTodoDoneDao.java similarity index 70% rename from vben-modules/vben-wf/src/main/java/vben/wf/todo/done/WfTodoDoneDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/todo/done/BpmTodoDoneDao.java index 32f56f8..5262796 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/todo/done/WfTodoDoneDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/done/BpmTodoDoneDao.java @@ -1,4 +1,4 @@ -package vben.wf.todo.done; +package vben.bpm.todo.done; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -10,15 +10,15 @@ import vben.common.jdbc.sqler.Usqler; @Component @RequiredArgsConstructor -public class WfTodoDoneDao { +public class BpmTodoDoneDao { - public WfTodoDone findById(Long id) { - String sql = "select * from wf_todo_done where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfTodoDone.class), id); + public BpmTodoDone findById(Long id) { + String sql = "select * from bpm_todo_done where id = ?"; + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmTodoDone.class), id); } - public void insert(WfTodoDone main) { - Isqler sqler = new Isqler("wf_todo_done"); + public void insert(BpmTodoDone main) { + Isqler sqler = new Isqler("bpm_todo_done"); if(main.getId()==null){ main.setId(IdUtils.getSnowflakeNextIdStr()); } @@ -29,8 +29,8 @@ public class WfTodoDoneDao { jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams()); } - public void update(WfTodoDone main) { - Usqler sqler = new Usqler("wf_todo_done"); + public void update(BpmTodoDone main) { + Usqler sqler = new Usqler("bpm_todo_done"); sqler.addWhere("id=?", main.getId()); sqler.add("todid", main.getTodid()); sqler.add("useid", main.getUseid()); @@ -39,7 +39,7 @@ public class WfTodoDoneDao { } public void deleteById(Long id) { - jdbcHelper.update("delete from wf_todo_done where id=?", id); + jdbcHelper.update("delete from bpm_todo_done where id=?", id); } private final JdbcHelper jdbcHelper; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/todo/hist/WfTodoHist.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/hist/BpmTodoHi.java similarity index 93% rename from vben-modules/vben-wf/src/main/java/vben/wf/todo/hist/WfTodoHist.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/todo/hist/BpmTodoHi.java index d387a07..f8732b3 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/todo/hist/WfTodoHist.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/hist/BpmTodoHi.java @@ -1,4 +1,4 @@ -package vben.wf.todo.hist; +package vben.bpm.todo.hist; import lombok.Data; @@ -10,7 +10,7 @@ import java.util.Date; * 待办历史记录 */ @Data -public class WfTodoHist { +public class BpmTodoHi { /** * 主键ID diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/todo/hist/WfTodoHistDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/hist/BpmTodoHiDao.java similarity index 77% rename from vben-modules/vben-wf/src/main/java/vben/wf/todo/hist/WfTodoHistDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/todo/hist/BpmTodoHiDao.java index 4adae65..0043d0f 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/todo/hist/WfTodoHistDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/hist/BpmTodoHiDao.java @@ -1,4 +1,4 @@ -package vben.wf.todo.hist; +package vben.bpm.todo.hist; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -10,15 +10,15 @@ import vben.common.jdbc.sqler.Usqler; @Component @RequiredArgsConstructor -public class WfTodoHistDao { +public class BpmTodoHiDao { - public WfTodoHist findById(Long id) { - String sql = "select * from wf_todo_hist where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfTodoHist.class), id); + public BpmTodoHi findById(Long id) { + String sql = "select * from bpm_todo_hist where id = ?"; + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmTodoHi.class), id); } - public void insert(WfTodoHist main) { - Isqler sqler = new Isqler("wf_todo_hist"); + public void insert(BpmTodoHi main) { + Isqler sqler = new Isqler("bpm_todo_hist"); if(main.getId()==null){ main.setId(IdUtils.getSnowflakeNextIdStr()); } @@ -35,8 +35,8 @@ public class WfTodoHistDao { jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams()); } - public void update(WfTodoHist main) { - Usqler sqler = new Usqler("wf_todo_hist"); + public void update(BpmTodoHi main) { + Usqler sqler = new Usqler("bpm_todo_hist"); sqler.addWhere("id=?", main.getId()); sqler.add("name", main.getName()); sqler.add("type", main.getType()); @@ -49,7 +49,7 @@ public class WfTodoHistDao { } public void deleteById(Long id) { - jdbcHelper.update("delete from wf_todo_hist where id=?", id); + jdbcHelper.update("delete from bpm_todo_hist where id=?", id); } private final JdbcHelper jdbcHelper; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/todo/main/WfTodoMain.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/main/BpmTodoMain.java similarity index 92% rename from vben-modules/vben-wf/src/main/java/vben/wf/todo/main/WfTodoMain.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/todo/main/BpmTodoMain.java index 2f2d585..c768a8f 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/todo/main/WfTodoMain.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/main/BpmTodoMain.java @@ -1,4 +1,4 @@ -package vben.wf.todo.main; +package vben.bpm.todo.main; import lombok.Data; @@ -9,7 +9,7 @@ import java.util.Date; * 流程待办 */ @Data -public class WfTodoMain { +public class BpmTodoMain { /** * 主键ID diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/todo/main/WfTodoMainApi.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/main/BpmTodoMainApi.java similarity index 76% rename from vben-modules/vben-wf/src/main/java/vben/wf/todo/main/WfTodoMainApi.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/todo/main/BpmTodoMainApi.java index ca8ba6a..4c2ec87 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/todo/main/WfTodoMainApi.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/main/BpmTodoMainApi.java @@ -1,4 +1,4 @@ -package vben.wf.todo.main; +package vben.bpm.todo.main; import lombok.RequiredArgsConstructor; import org.dom4j.DocumentException; @@ -11,11 +11,11 @@ import vben.common.jdbc.sqler.Sqler; * 流程待办管理 */ @RestController -@RequestMapping("wf/todo/main") +@RequestMapping("bpm/todo/main") @RequiredArgsConstructor -public class WfTodoMainApi { +public class BpmTodoMainApi { - private final WfTodoMainService service; + private final BpmTodoMainService service; /** * 流程待办分页查询 @@ -24,11 +24,11 @@ public class WfTodoMainApi { */ @GetMapping public R get(String name) { - Sqler sqler = new Sqler("wf_todo_main"); + Sqler sqler = new Sqler("bpm_todo_main"); sqler.addLike("t.name", name); sqler.addOrder("t.crtim desc"); sqler.addSelect("t.link,t.crtim"); - sqler.addInnerJoin("","wf_todo_user t2", "t2.todid=t.id"); + sqler.addInnerJoin("","bpm_todo_user t2", "t2.todid=t.id"); sqler.addInnerJoin("o.name as hauna","sys_org o", "o.id=t2.useid"); sqler.addInnerJoin("o2.name as cruna","sys_org o2", "o2.id=t.cruid"); System.out.println(sqler.getSql()); @@ -41,8 +41,8 @@ public class WfTodoMainApi { * @return 待办对象 */ @GetMapping("info/{id}") - public R info(@PathVariable String id) { - WfTodoMain main = service.findOne(id); + public R info(@PathVariable String id) { + BpmTodoMain main = service.findOne(id); return R.ok(main); } @@ -53,7 +53,7 @@ public class WfTodoMainApi { * @throws DocumentException */ @PostMapping - public R post(@RequestBody WfTodoMain main) throws DocumentException { + public R post(@RequestBody BpmTodoMain main) throws DocumentException { return R.ok(null,service.insert(main)); } @@ -63,7 +63,7 @@ public class WfTodoMainApi { * @return 待办ID */ @PutMapping - public R put(@RequestBody WfTodoMain main) { + public R put(@RequestBody BpmTodoMain main) { return R.ok(null,service.update(main)); } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/todo/main/WfTodoMainDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/main/BpmTodoMainDao.java similarity index 76% rename from vben-modules/vben-wf/src/main/java/vben/wf/todo/main/WfTodoMainDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/todo/main/BpmTodoMainDao.java index f0a72e1..5a66c23 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/todo/main/WfTodoMainDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/main/BpmTodoMainDao.java @@ -1,4 +1,4 @@ -package vben.wf.todo.main; +package vben.bpm.todo.main; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -10,15 +10,15 @@ import vben.common.jdbc.sqler.Usqler; @Component @RequiredArgsConstructor -public class WfTodoMainDao { +public class BpmTodoMainDao { - public WfTodoMain findById(String id) { - String sql = "select * from wf_todo_main where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfTodoMain.class), id); + public BpmTodoMain findById(String id) { + String sql = "select * from bpm_todo_main where id = ?"; + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmTodoMain.class), id); } - public void insert(WfTodoMain main) { - Isqler sqler = new Isqler("wf_todo_main"); + public void insert(BpmTodoMain main) { + Isqler sqler = new Isqler("bpm_todo_main"); if(main.getId()==null){ main.setId(IdUtils.getSnowflakeNextIdStr()); } @@ -35,8 +35,8 @@ public class WfTodoMainDao { jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams()); } - public void update(WfTodoMain main) { - Usqler sqler = new Usqler("wf_todo_main"); + public void update(BpmTodoMain main) { + Usqler sqler = new Usqler("bpm_todo_main"); sqler.addWhere("id=?", main.getId()); sqler.add("name", main.getName()); sqler.add("type", main.getType()); @@ -49,7 +49,7 @@ public class WfTodoMainDao { } public void deleteById(String id) { - jdbcHelper.update("delete from wf_todo_main where id=?", id); + jdbcHelper.update("delete from bpm_todo_main where id=?", id); } private final JdbcHelper jdbcHelper; diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/todo/main/WfTodoMainService.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/main/BpmTodoMainService.java similarity index 70% rename from vben-modules/vben-wf/src/main/java/vben/wf/todo/main/WfTodoMainService.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/todo/main/BpmTodoMainService.java index 3083389..f40e886 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/todo/main/WfTodoMainService.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/main/BpmTodoMainService.java @@ -1,4 +1,4 @@ -package vben.wf.todo.main; +package vben.bpm.todo.main; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -9,12 +9,12 @@ import vben.common.core.utils.IdUtils; import vben.common.jdbc.dto.PageData; import vben.common.jdbc.sqler.JdbcHelper; import vben.common.jdbc.sqler.Sqler; -import vben.wf.proc.task.WfProcTask; -import vben.wf.root.domain.Zproc; -import vben.wf.todo.done.WfTodoDone; -import vben.wf.todo.done.WfTodoDoneDao; -import vben.wf.todo.user.WfTodoUser; -import vben.wf.todo.user.WfTodoUserDao; +import vben.bpm.proc.task.BpmProcTask; +import vben.bpm.root.domain.Zproc; +import vben.bpm.todo.done.BpmTodoDone; +import vben.bpm.todo.done.BpmTodoDoneDao; +import vben.bpm.todo.user.BpmTodoUser; +import vben.bpm.todo.user.BpmTodoUserDao; import java.util.Date; import java.util.List; @@ -24,17 +24,17 @@ import java.util.Map; @Service @Transactional(rollbackFor = Exception.class) @RequiredArgsConstructor -public class WfTodoMainService { +public class BpmTodoMainService { @Transactional(readOnly = true) public PageData findPageData(Sqler sqler) { return jdbcHelper.findPageData(sqler); } - public void sendTodos(Zproc zproc, List taskList) { - for (WfProcTask task : taskList) { + public void sendTodos(Zproc zproc, List taskList) { + for (BpmProcTask task : taskList) { if (task.getActag()) { - WfTodoMain todo = new WfTodoMain(); + BpmTodoMain todo = new BpmTodoMain(); // todo.setId(IdUtils.getSnowflakeNextIdStr()); todo.setId(task.getId()+""); todo.setName(zproc.getProna()); @@ -43,24 +43,24 @@ public class WfTodoMainService { todo.setBusca(zproc.getBusty()); todo.setType("1"); todo.setCruid(zproc.getInuid()); - wfTodoMainDao.insert(todo); + bpmTodoMainDao.insert(todo); Org org = orgDao.findById(task.getExuid()); if (org.getType() == 2) { - WfTodoUser todoUser = new WfTodoUser(); + BpmTodoUser todoUser = new BpmTodoUser(); todoUser.setId(IdUtils.getSnowflakeNextIdStr()); todoUser.setTodid(todo.getId()); todoUser.setUseid(task.getExuid()); - wfTodoUserDao.insert(todoUser); + bpmTodoUserDao.insert(todoUser); } else if (org.getType() == 4) { String sql = "select oid id from sys_org_post_org where pid=?"; List userIdList = jdbcHelper.findSlist(sql, task.getExuid()); for (String uid : userIdList) { - WfTodoUser todoUser = new WfTodoUser(); + BpmTodoUser todoUser = new BpmTodoUser(); todoUser.setId(IdUtils.getSnowflakeNextIdStr()); todoUser.setTodid(todo.getId()); todoUser.setUseid(uid); - wfTodoUserDao.insert(todoUser); + bpmTodoUserDao.insert(todoUser); } } } @@ -84,7 +84,7 @@ public class WfTodoMainService { // } public void sendTodo(Zproc zproc,String useid) { - WfTodoMain todo = new WfTodoMain(); + BpmTodoMain todo = new BpmTodoMain(); todo.setId(IdUtils.getSnowflakeNextIdStr()); todo.setName(zproc.getProna()); todo.setLink("/#/page/ofmv?id=" + zproc.getProid()); @@ -92,22 +92,22 @@ public class WfTodoMainService { todo.setCruid(zproc.getInuid()); - WfTodoUser todoUser = new WfTodoUser(); + BpmTodoUser todoUser = new BpmTodoUser(); todoUser.setId(IdUtils.getSnowflakeNextIdStr()); todoUser.setTodid(todo.getId()); todoUser.setUseid(useid); - wfTodoMainDao.insert(todo); - wfTodoUserDao.insert(todoUser); + bpmTodoMainDao.insert(todo); + bpmTodoUserDao.insert(todoUser); } // public void doneTodo(Zbpm zbpm) { -// String sql = "select m.id,t.id as tid from wf_todo_main m inner join wf_todo_user t on t.todid=m.id " + +// String sql = "select m.id,t.id as tid from bpm_todo_main m inner join bpm_todo_user t on t.todid=m.id " + // "where t.useid=? and m.busid=?"; // Map map = jdbcDao.findMap(sql, zbpm.getHauid(), zbpm.getProid()); -// String delsql = "delete from wf_todo_user where id=?"; +// String delsql = "delete from bpm_todo_user where id=?"; // jdbcDao.update(delsql, map.get("tid")); // -// WfTodoDone done = new WfTodoDone(); +// BpmTodoDone done = new BpmTodoDone(); // done.setId(IdUtils.getSnowflakeNextIdStr()); // done.setTodid((String)map.get("id")); // done.setUseid(zbpm.getHauid()); @@ -115,77 +115,77 @@ public class WfTodoMainService { // } public void doneTodo(Zproc zproc) { - String sql = "select t.useid \"useid\",m.id \"todid\",t.id \"tarid\" from wf_todo_main m inner join wf_todo_user t on t.todid=m.id " + + String sql = "select t.useid \"useid\",m.id \"todid\",t.id \"tarid\" from bpm_todo_main m inner join bpm_todo_user t on t.todid=m.id " + "where m.busid=?"; List> mapList = jdbcHelper.getTp().queryForList(sql, zproc.getProid()); for (Map map : mapList) { if (zproc.getHauid().equals(map.get("useid"))) { - String delsql = "delete from wf_todo_user where todid=?"; + String delsql = "delete from bpm_todo_user where todid=?"; jdbcHelper.update(delsql, map.get("todid")); - WfTodoDone done = new WfTodoDone(); + BpmTodoDone done = new BpmTodoDone(); done.setId(IdUtils.getSnowflakeNextIdStr()); done.setTodid((String)map.get("todid")); done.setUseid(zproc.getHauid()); - wfTodoDoneDao.insert(done); + bpmTodoDoneDao.insert(done); } } } public void doneTodos(Zproc zproc) { - String sql = "select t.useid \"useid\",m.id \"todid\",t.id \"tarid\" from wf_todo_main m inner join wf_todo_user t on t.todid=m.id " + + String sql = "select t.useid \"useid\",m.id \"todid\",t.id \"tarid\" from bpm_todo_main m inner join bpm_todo_user t on t.todid=m.id " + "where m.busid=?"; List> mapList = jdbcHelper.getTp().queryForList(sql, zproc.getProid()); for (Map map : mapList) { - String delsql = "delete from wf_todo_user where id=?"; + String delsql = "delete from bpm_todo_user where id=?"; jdbcHelper.update(delsql, map.get("tarid")); if (zproc.getHauid().equals(map.get("useid"))) { - WfTodoDone done = new WfTodoDone(); + BpmTodoDone done = new BpmTodoDone(); done.setId(IdUtils.getSnowflakeNextIdStr()); done.setTodid((String)map.get("todid")); done.setUseid(zproc.getHauid()); - wfTodoDoneDao.insert(done); + bpmTodoDoneDao.insert(done); } } } public void doneTodosByTaskIds(String[] taskIds) { for (String taskId : taskIds) { - String delsql = "delete from wf_todo_main where id=?"; + String delsql = "delete from bpm_todo_main where id=?"; jdbcHelper.update(delsql, taskId); - String delsql2 = "delete from wf_todo_user where todid=?"; + String delsql2 = "delete from bpm_todo_user where todid=?"; jdbcHelper.update(delsql2, taskId); } } - public String insert(WfTodoMain main) { + public String insert(BpmTodoMain main) { if (main.getId() == null || "".equals(main.getId())) { main.setId(IdUtils.getSnowflakeNextIdStr()); } main.setCrtim(new Date()); - wfTodoMainDao.insert(main); + bpmTodoMainDao.insert(main); return main.getId(); } - public String update(WfTodoMain main) { - wfTodoMainDao.update(main); + public String update(BpmTodoMain main) { + bpmTodoMainDao.update(main); return main.getId(); } public int delete(String[] ids) { for (String id : ids) { - wfTodoMainDao.deleteById(id); + bpmTodoMainDao.deleteById(id); } return ids.length; } @Transactional(readOnly = true) - public WfTodoMain findOne(String id) { - return wfTodoMainDao.findById(id); + public BpmTodoMain findOne(String id) { + return bpmTodoMainDao.findById(id); } @@ -193,10 +193,10 @@ public class WfTodoMainService { private final OrgDao orgDao; - private final WfTodoMainDao wfTodoMainDao; + private final BpmTodoMainDao bpmTodoMainDao; - private final WfTodoUserDao wfTodoUserDao; + private final BpmTodoUserDao bpmTodoUserDao; - private final WfTodoDoneDao wfTodoDoneDao; + private final BpmTodoDoneDao bpmTodoDoneDao; } diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/todo/user/WfTodoUser.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/user/BpmTodoUser.java similarity index 80% rename from vben-modules/vben-wf/src/main/java/vben/wf/todo/user/WfTodoUser.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/todo/user/BpmTodoUser.java index 4456f10..787b841 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/todo/user/WfTodoUser.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/user/BpmTodoUser.java @@ -1,4 +1,4 @@ -package vben.wf.todo.user; +package vben.bpm.todo.user; import lombok.Data; @@ -6,7 +6,7 @@ import lombok.Data; * 用户待办记录 */ @Data -public class WfTodoUser { +public class BpmTodoUser { /** * 主键ID diff --git a/vben-modules/vben-wf/src/main/java/vben/wf/todo/user/WfTodoUserDao.java b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/user/BpmTodoUserDao.java similarity index 68% rename from vben-modules/vben-wf/src/main/java/vben/wf/todo/user/WfTodoUserDao.java rename to vben-modules/vben-bpm/src/main/java/vben/bpm/todo/user/BpmTodoUserDao.java index 55e271a..f40825f 100644 --- a/vben-modules/vben-wf/src/main/java/vben/wf/todo/user/WfTodoUserDao.java +++ b/vben-modules/vben-bpm/src/main/java/vben/bpm/todo/user/BpmTodoUserDao.java @@ -1,4 +1,4 @@ -package vben.wf.todo.user; +package vben.bpm.todo.user; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -10,15 +10,15 @@ import vben.common.jdbc.sqler.Usqler; @Component @RequiredArgsConstructor -public class WfTodoUserDao { +public class BpmTodoUserDao { - public WfTodoUser findById(Long id) { - String sql = "select * from wf_todo_user where id = ?"; - return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(WfTodoUser.class), id); + public BpmTodoUser findById(Long id) { + String sql = "select * from bpm_todo_user where id = ?"; + return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(BpmTodoUser.class), id); } - public void insert(WfTodoUser main) { - Isqler sqler = new Isqler("wf_todo_user"); + public void insert(BpmTodoUser main) { + Isqler sqler = new Isqler("bpm_todo_user"); if(main.getId()==null){ main.setId(IdUtils.getSnowflakeNextIdStr()); } @@ -28,8 +28,8 @@ public class WfTodoUserDao { jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams()); } - public void update(WfTodoUser main) { - Usqler sqler = new Usqler("wf_todo_user"); + public void update(BpmTodoUser main) { + Usqler sqler = new Usqler("bpm_todo_user"); sqler.addWhere("id=?", main.getId()); sqler.add("todid", main.getTodid()); sqler.add("useid", main.getUseid()); @@ -37,7 +37,7 @@ public class WfTodoUserDao { } public void deleteById(Long id) { - jdbcHelper.update("delete from wf_todo_user where id=?", id); + jdbcHelper.update("delete from bpm_todo_user where id=?", id); } private final JdbcHelper jdbcHelper;