From f849a2f049e6563c4ff47db08665f02ffbc2727d Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Thu, 6 Aug 2026 14:52:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor(supervision):=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=A8=A1=E5=9D=97=E5=88=B0=20supervision=20?= =?UTF-8?q?=E6=A0=B9=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IProcessPortalService.java | 8 ----- .../constant/BgPartymatterConstant.java | 2 +- .../controller/BgPartymatterController.java | 22 ++++++------- .../dto/BgPartymatterBpmSaveDTO.java | 4 +-- .../bgpartymatter/entity/BgPartymatter.java | 2 +- .../entity/BgPartymatterFeedback.java | 2 +- .../mapper/BgPartymatterFeedbackMapper.java | 4 +-- .../mapper/BgPartymatterMapper.java | 4 +-- .../xml/BgPartymatterFeedbackMapper.xml | 4 +-- .../mapper/xml/BgPartymatterMapper.xml | 2 +- .../IBgPartymatterFeedbackService.java | 4 +-- .../service/IBgPartymatterService.java | 6 ++-- .../BgPartymatterFeedbackServiceImpl.java | 8 ++--- .../impl/BgPartymatterServiceImpl.java | 10 +++--- .../controller/BgTakepulseController.java | 20 ++++++------ .../dto/BgTakepulseBpmSaveDTO.java | 4 +-- .../bqtakepulse/entity/BgTakepulse.java | 2 +- .../entity/BgTakepulseFeedback.java | 2 +- .../mapper/BgTakepulseFeedbackMapper.java | 4 +-- .../bqtakepulse/mapper/BgTakepulseMapper.java | 4 +-- .../mapper/xml/BgTakepulseFeedbackMapper.xml | 4 +-- .../mapper/xml/BgTakepulseMapper.xml | 2 +- .../service/IBgTakepulseFeedbackService.java | 4 +-- .../service/IBgTakepulseService.java | 6 ++-- .../impl/BgTakepulseFeedbackServiceImpl.java | 8 ++--- .../service/impl/BgTakepulseServiceImpl.java | 12 +++---- .../bqtakepulse/vo/BgTakepulsePage.java | 6 ++-- .../common}/BpmStatus.java | 2 +- .../common}/SupervisionConstant.java | 2 +- .../controller/ProcessPortalController.java | 6 ++-- .../dashboard/dto/ProcessPortalStatsDTO.java | 2 +- .../dashboard/mapper/ProcessPortalMapper.java | 2 +- .../service/IProcessPortalService.java | 8 +++++ .../impl/ProcessPortalServiceImpl.java | 8 ++--- .../DqInspectProblemController.java | 6 ++-- .../entity/DqInspectProblem.java | 2 +- .../mapper/DqInspectProblemMapper.java | 4 +-- .../mapper/xml/DqInspectProblemMapper.xml | 2 +- .../service/IDqInspectProblemService.java | 4 +-- .../impl/DqInspectProblemServiceImpl.java | 8 ++--- .../DqInspectProgressController.java | 6 ++-- .../controller/DqInspectTaskController.java | 14 ++++---- .../entity/DqInspectProgress.java | 2 +- .../dqinspecttask/entity/DqInspectTask.java | 2 +- .../mapper/DqInspectProgressMapper.java | 4 +-- .../mapper/DqInspectTaskMapper.java | 6 ++-- .../mapper/xml/DqInspectProgressMapper.xml | 4 +-- .../mapper/xml/DqInspectTaskMapper.xml | 4 +-- .../service/IDqInspectProgressService.java | 4 +-- .../service/IDqInspectTaskService.java | 8 ++--- .../impl/DqInspectProgressServiceImpl.java | 8 ++--- .../impl/DqInspectTaskServiceImpl.java | 18 +++++------ .../vo/DqInspectTaskLedgerVo.java | 2 +- .../dqinspecttask/vo/DqInspectTaskPage.java | 6 ++-- .../constant/FixContactConstant.java | 2 +- .../FixedContact20260730Controller.java | 18 +++++------ .../dto/FixedContact20260730BpmSaveDTO.java | 4 +-- .../entity/FixedContact20260730.java | 4 +-- .../entity/FixedContactFeedback20260730.java | 2 +- .../fixcontact/flow/FixContactFlow.java | 16 +++++----- .../FixContactDeptLeaderApproveListener.java | 4 +-- .../FixContactWorkerApproveListener.java | 12 +++---- .../mapper/FixedContact20260730Mapper.java | 4 +-- .../FixedContactFeedback20260730Mapper.java | 4 +-- .../service/IFixedContact20260730Service.java | 6 ++-- .../IFixedContactFeedback20260730Service.java | 4 +-- .../impl/FixedContact20260730ServiceImpl.java | 16 +++++----- ...xedContactFeedback20260730ServiceImpl.java | 8 ++--- .../vo/FixedContact20260730Page.java | 6 ++-- .../ImprovementProposalController.java | 24 +++++++------- .../dto/ImprovementDeptScoreBpmDTO.java | 2 +- .../ImprovementInstituteVoteCandidateDTO.java | 2 +- .../dto/ImprovementProposalBpmActionDTO.java | 2 +- .../dto/ImprovementProposalDepartmentDTO.java | 2 +- .../entity/ImprovementDeptScore.java | 2 +- .../entity/ImprovementInstituteVote.java | 2 +- .../entity/ImprovementProposal.java | 2 +- .../mapper/ImprovementDeptScoreMapper.java | 4 +-- .../ImprovementInstituteVoteMapper.java | 4 +-- .../mapper/ImprovementProposalMapper.java | 6 ++-- .../mapper/xml/ImprovementDeptScoreMapper.xml | 4 +-- .../xml/ImprovementInstituteVoteMapper.xml | 4 +-- .../mapper/xml/ImprovementProposalMapper.xml | 4 +-- .../service/IImprovementDeptScoreService.java | 4 +-- .../IImprovementInstituteVoteService.java | 4 +-- .../service/IImprovementProposalService.java | 16 +++++----- .../impl/ImprovementDeptScoreServiceImpl.java | 8 ++--- .../ImprovementInstituteVoteServiceImpl.java | 8 ++--- .../impl/ImprovementProposalServiceImpl.java | 24 +++++++------- .../vo/ImprovementProposalPage.java | 8 ++--- .../DjInspectImproveController.java | 12 +++---- .../entity/DjInspectImprove.java | 2 +- .../mapper/DjInspectImproveMapper.java | 4 +-- .../mapper/xml/DjInspectImproveMapper.xml | 2 +- .../service/IDjInspectImproveService.java | 4 +-- .../impl/DjInspectImproveServiceImpl.java | 8 ++--- .../DjOfficialdocDistributeController.java | 6 ++-- .../entity/DjOfficialdocDistribute.java | 2 +- .../mapper/DjOfficialdocDistributeMapper.java | 4 +-- .../xml/DjOfficialdocDistributeMapper.xml | 2 +- .../IDjOfficialdocDistributeService.java | 4 +-- .../DjOfficialdocDistributeServiceImpl.java | 8 ++--- .../controller/TaskListController.java | 30 ++++++++--------- .../controller/TaskListDetialController.java | 10 +++--- .../tasklist/entity/TaskList.java | 2 +- .../tasklist/entity/TaskListDetial.java | 2 +- .../tasklist/entity/TaskListFavorite.java | 2 +- .../tasklist/entity/TaskListPermission.java | 2 +- .../tasklist/mapper/TaskListDetialMapper.java | 4 +-- .../mapper/TaskListFavoriteMapper.java | 4 +-- .../tasklist/mapper/TaskListMapper.java | 4 +-- .../mapper/TaskListPermissionMapper.java | 4 +-- .../mapper/xml/TaskListDetialMapper.xml | 22 ++++++------- .../mapper/xml/TaskListFavoriteMapper.xml | 4 +-- .../tasklist/mapper/xml/TaskListMapper.xml | 6 ++-- .../mapper/xml/TaskListPermissionMapper.xml | 4 +-- .../service/ITaskListDetialService.java | 8 ++--- .../service/ITaskListFavoriteService.java | 4 +-- .../service/ITaskListPermissionService.java | 4 +-- .../tasklist/service/ITaskListService.java | 20 ++++++------ .../impl/TaskListDetialServiceImpl.java | 20 ++++++------ .../impl/TaskListFavoriteServiceImpl.java | 8 ++--- .../impl/TaskListPermissionServiceImpl.java | 8 ++--- .../service/impl/TaskListServiceImpl.java | 32 +++++++++---------- .../tasklist/vo/AddCollaboratorReq.java | 2 +- .../tasklist/vo/CollaboratorVO.java | 2 +- .../tasklist/vo/CreateTaskListGroupReq.java | 2 +- .../tasklist/vo/CreateTaskListReq.java | 2 +- .../tasklist/vo/CreateTaskReq.java | 2 +- .../tasklist/vo/MoveTaskListReq.java | 2 +- .../tasklist/vo/MoveTaskReq.java | 2 +- .../tasklist/vo/TaskListPage.java | 10 +++--- .../xispeak/constant/XiSpeakConstant.java | 2 +- .../controller/BgXiSpeakController.java | 20 ++++++------ .../BgXiSpeakFeedbackController.java | 6 ++-- .../xispeak/dto/BgXiSpeakBpmSaveDTO.java | 4 +-- .../xispeak/entity/BgXiSpeak.java | 2 +- .../xispeak/entity/BgXiSpeakFeedback.java | 2 +- .../xispeak/entity/DeptApproveDetail.java | 2 +- .../xispeak/entity/DeptApproveDetailMap.java | 2 +- .../mapper/BgXiSpeakFeedbackMapper.java | 4 +-- .../xispeak/mapper/BgXiSpeakMapper.java | 4 +-- .../xispeak/mapper/xml/BgXiSpeakMapper.xml | 2 +- .../service/IBgXiSpeakFeedbackService.java | 4 +-- .../xispeak/service/IBgXiSpeakService.java | 4 +-- .../impl/BgXiSpeakFeedbackServiceImpl.java | 8 ++--- .../service/impl/BgXiSpeakServiceImpl.java | 14 ++++---- .../modules/tasklist/vo/SubTaskPageReq.java | 18 ----------- 148 files changed, 458 insertions(+), 476 deletions(-) delete mode 100644 jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/service/IProcessPortalService.java rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bgpartymatter/constant/BgPartymatterConstant.java (96%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bgpartymatter/controller/BgPartymatterController.java (96%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bgpartymatter/dto/BgPartymatterBpmSaveDTO.java (80%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bgpartymatter/entity/BgPartymatter.java (99%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bgpartymatter/entity/BgPartymatterFeedback.java (98%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bgpartymatter/mapper/BgPartymatterFeedbackMapper.java (83%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bgpartymatter/mapper/BgPartymatterMapper.java (69%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bgpartymatter/mapper/xml/BgPartymatterFeedbackMapper.xml (71%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bgpartymatter/mapper/xml/BgPartymatterMapper.xml (63%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bgpartymatter/service/IBgPartymatterFeedbackService.java (76%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bgpartymatter/service/IBgPartymatterService.java (73%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bgpartymatter/service/impl/BgPartymatterFeedbackServiceImpl.java (68%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bgpartymatter/service/impl/BgPartymatterServiceImpl.java (75%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bqtakepulse/controller/BgTakepulseController.java (96%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bqtakepulse/dto/BgTakepulseBpmSaveDTO.java (81%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bqtakepulse/entity/BgTakepulse.java (99%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bqtakepulse/entity/BgTakepulseFeedback.java (98%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bqtakepulse/mapper/BgTakepulseFeedbackMapper.java (83%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bqtakepulse/mapper/BgTakepulseMapper.java (70%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bqtakepulse/mapper/xml/BgTakepulseFeedbackMapper.xml (72%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bqtakepulse/mapper/xml/BgTakepulseMapper.xml (64%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bqtakepulse/service/IBgTakepulseFeedbackService.java (77%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bqtakepulse/service/IBgTakepulseService.java (81%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bqtakepulse/service/impl/BgTakepulseFeedbackServiceImpl.java (69%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bqtakepulse/service/impl/BgTakepulseServiceImpl.java (86%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/bqtakepulse/vo/BgTakepulsePage.java (97%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg/constant => supervision/common}/BpmStatus.java (93%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg/constant => supervision/common}/SupervisionConstant.java (93%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/dashboard/controller/ProcessPortalController.java (83%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/dashboard/dto/ProcessPortalStatsDTO.java (86%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/dashboard/mapper/ProcessPortalMapper.java (97%) create mode 100644 jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/service/IProcessPortalService.java rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/dashboard/service/impl/ProcessPortalServiceImpl.java (85%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspectproblem/controller/DqInspectProblemController.java (98%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspectproblem/entity/DqInspectProblem.java (98%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspectproblem/mapper/DqInspectProblemMapper.java (84%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspectproblem/mapper/xml/DqInspectProblemMapper.xml (89%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspectproblem/service/IDqInspectProblemService.java (93%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspectproblem/service/impl/DqInspectProblemServiceImpl.java (98%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspecttask/controller/DqInspectProgressController.java (96%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspecttask/controller/DqInspectTaskController.java (96%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspecttask/entity/DqInspectProgress.java (98%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspecttask/entity/DqInspectTask.java (99%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspecttask/mapper/DqInspectProgressMapper.java (83%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspecttask/mapper/DqInspectTaskMapper.java (78%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspecttask/mapper/xml/DqInspectProgressMapper.xml (71%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml (94%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspecttask/service/IDqInspectProgressService.java (76%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspecttask/service/IDqInspectTaskService.java (81%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspecttask/service/impl/DqInspectProgressServiceImpl.java (68%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java (83%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspecttask/vo/DqInspectTaskLedgerVo.java (98%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo => supervision}/dqinspecttask/vo/DqInspectTaskPage.java (96%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/fixcontact/constant/FixContactConstant.java (97%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/fixcontact/controller/FixedContact20260730Controller.java (96%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/fixcontact/dto/FixedContact20260730BpmSaveDTO.java (81%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/fixcontact/entity/FixedContact20260730.java (97%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/fixcontact/entity/FixedContactFeedback20260730.java (98%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/fixcontact/flow/FixContactFlow.java (97%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/fixcontact/listener/FixContactDeptLeaderApproveListener.java (96%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/fixcontact/listener/FixContactWorkerApproveListener.java (92%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/fixcontact/mapper/FixedContact20260730Mapper.java (52%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/fixcontact/mapper/FixedContactFeedback20260730Mapper.java (88%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/fixcontact/service/IFixedContact20260730Service.java (77%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/fixcontact/service/IFixedContactFeedback20260730Service.java (64%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/fixcontact/service/impl/FixedContact20260730ServiceImpl.java (86%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/fixcontact/service/impl/FixedContactFeedback20260730ServiceImpl.java (59%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/fixcontact/vo/FixedContact20260730Page.java (63%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/controller/ImprovementProposalController.java (95%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java (94%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/dto/ImprovementInstituteVoteCandidateDTO.java (90%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/dto/ImprovementProposalBpmActionDTO.java (95%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/dto/ImprovementProposalDepartmentDTO.java (90%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/entity/ImprovementDeptScore.java (98%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/entity/ImprovementInstituteVote.java (98%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/entity/ImprovementProposal.java (99%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/mapper/ImprovementDeptScoreMapper.java (82%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/mapper/ImprovementInstituteVoteMapper.java (84%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/mapper/ImprovementProposalMapper.java (83%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/mapper/xml/ImprovementDeptScoreMapper.xml (70%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/mapper/xml/ImprovementInstituteVoteMapper.xml (79%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/mapper/xml/ImprovementProposalMapper.xml (88%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/service/IImprovementDeptScoreService.java (75%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/service/IImprovementInstituteVoteService.java (75%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/service/IImprovementProposalService.java (86%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/service/impl/ImprovementDeptScoreServiceImpl.java (67%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/service/impl/ImprovementInstituteVoteServiceImpl.java (67%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/service/impl/ImprovementProposalServiceImpl.java (97%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/improvementproposal/vo/ImprovementProposalPage.java (95%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{dj => supervision}/inspectimprove/controller/DjInspectImproveController.java (96%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{dj => supervision}/inspectimprove/entity/DjInspectImprove.java (99%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{dj => supervision}/inspectimprove/mapper/DjInspectImproveMapper.java (84%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{dj => supervision}/inspectimprove/mapper/xml/DjInspectImproveMapper.xml (89%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{dj => supervision}/inspectimprove/service/IDjInspectImproveService.java (92%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{dj => supervision}/inspectimprove/service/impl/DjInspectImproveServiceImpl.java (96%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo/officialdocDistribute => supervision/officialdoc}/controller/DjOfficialdocDistributeController.java (92%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo/officialdocDistribute => supervision/officialdoc}/entity/DjOfficialdocDistribute.java (97%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo/officialdocDistribute => supervision/officialdoc}/mapper/DjOfficialdocDistributeMapper.java (70%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo/officialdocDistribute => supervision/officialdoc}/mapper/xml/DjOfficialdocDistributeMapper.xml (61%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo/officialdocDistribute => supervision/officialdoc}/service/IDjOfficialdocDistributeService.java (66%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{demo/officialdocDistribute => supervision/officialdoc}/service/impl/DjOfficialdocDistributeServiceImpl.java (56%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/controller/TaskListController.java (95%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/controller/TaskListDetialController.java (94%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/entity/TaskList.java (98%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/entity/TaskListDetial.java (99%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/entity/TaskListFavorite.java (98%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/entity/TaskListPermission.java (97%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/mapper/TaskListDetialMapper.java (96%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/mapper/TaskListFavoriteMapper.java (93%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/mapper/TaskListMapper.java (91%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/mapper/TaskListPermissionMapper.java (84%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/mapper/xml/TaskListDetialMapper.xml (93%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/mapper/xml/TaskListFavoriteMapper.xml (93%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/mapper/xml/TaskListMapper.xml (96%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/mapper/xml/TaskListPermissionMapper.xml (72%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/service/ITaskListDetialService.java (83%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/service/ITaskListFavoriteService.java (91%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/service/ITaskListPermissionService.java (78%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/service/ITaskListService.java (80%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/service/impl/TaskListDetialServiceImpl.java (97%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/service/impl/TaskListFavoriteServiceImpl.java (93%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/service/impl/TaskListPermissionServiceImpl.java (69%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/service/impl/TaskListServiceImpl.java (97%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/vo/AddCollaboratorReq.java (88%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/vo/CollaboratorVO.java (90%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/vo/CreateTaskListGroupReq.java (83%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/vo/CreateTaskListReq.java (91%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/vo/CreateTaskReq.java (96%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/vo/MoveTaskListReq.java (91%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/vo/MoveTaskReq.java (90%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{ => supervision}/tasklist/vo/TaskListPage.java (88%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/xispeak/constant/XiSpeakConstant.java (90%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/xispeak/controller/BgXiSpeakController.java (96%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg/xispeak/controller/feedback => supervision/xispeak/controller}/BgXiSpeakFeedbackController.java (97%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/xispeak/dto/BgXiSpeakBpmSaveDTO.java (82%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/xispeak/entity/BgXiSpeak.java (99%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/xispeak/entity/BgXiSpeakFeedback.java (99%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/xispeak/entity/DeptApproveDetail.java (93%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/xispeak/entity/DeptApproveDetailMap.java (69%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/xispeak/mapper/BgXiSpeakFeedbackMapper.java (71%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/xispeak/mapper/BgXiSpeakMapper.java (86%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/xispeak/mapper/xml/BgXiSpeakMapper.xml (90%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/xispeak/service/IBgXiSpeakFeedbackService.java (77%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/xispeak/service/IBgXiSpeakService.java (95%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/xispeak/service/impl/BgXiSpeakFeedbackServiceImpl.java (71%) rename jeecg-module-supervision/src/main/java/org/jeecg/modules/{bg => supervision}/xispeak/service/impl/BgXiSpeakServiceImpl.java (97%) delete mode 100644 jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/SubTaskPageReq.java diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/service/IProcessPortalService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/service/IProcessPortalService.java deleted file mode 100644 index 07040b0..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/service/IProcessPortalService.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jeecg.modules.dashboard.service; - -import org.jeecg.modules.dashboard.dto.ProcessPortalStatsDTO; - -public interface IProcessPortalService { - - ProcessPortalStatsDTO getStats(String userId); -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/constant/BgPartymatterConstant.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/constant/BgPartymatterConstant.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/constant/BgPartymatterConstant.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/constant/BgPartymatterConstant.java index a58ef96..31fdaff 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/constant/BgPartymatterConstant.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/constant/BgPartymatterConstant.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.bgpartymatter.constant; +package org.jeecg.modules.supervision.bgpartymatter.constant; /** * 党委/所务会事项模块常量类 diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/controller/BgPartymatterController.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/controller/BgPartymatterController.java index 2343cfc..4189b0f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/controller/BgPartymatterController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.bgpartymatter.controller; +package org.jeecg.modules.supervision.bgpartymatter.controller; import com.alibaba.fastjson.JSONObject; import org.flowable.engine.RuntimeService; @@ -11,10 +11,10 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.excel.ExcelAnnotationUtils; -import org.jeecg.modules.bg.constant.BpmStatus; -import org.jeecg.modules.bg.constant.SupervisionConstant; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.common.BpmStatus; +import org.jeecg.modules.supervision.common.SupervisionConstant; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,12 +29,12 @@ import java.util.List; import java.util.Map; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.demo.bgpartymatter.dto.BgPartymatterBpmSaveDTO; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter; -import org.jeecg.modules.demo.bgpartymatter.service.IBgPartymatterService; -import org.jeecg.modules.demo.bgpartymatter.service.IBgPartymatterFeedbackService; -import org.jeecg.modules.demo.bgpartymatter.constant.BgPartymatterConstant; +import org.jeecg.modules.supervision.bgpartymatter.dto.BgPartymatterBpmSaveDTO; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatterFeedback; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatter; +import org.jeecg.modules.supervision.bgpartymatter.service.IBgPartymatterService; +import org.jeecg.modules.supervision.bgpartymatter.service.IBgPartymatterFeedbackService; +import org.jeecg.modules.supervision.bgpartymatter.constant.BgPartymatterConstant; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.jeecg.common.aspect.annotation.AutoLog; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/dto/BgPartymatterBpmSaveDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/dto/BgPartymatterBpmSaveDTO.java similarity index 80% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/dto/BgPartymatterBpmSaveDTO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/dto/BgPartymatterBpmSaveDTO.java index 6100af2..d6ac58f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/dto/BgPartymatterBpmSaveDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/dto/BgPartymatterBpmSaveDTO.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.bgpartymatter.dto; +package org.jeecg.modules.supervision.bgpartymatter.dto; import java.io.Serializable; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatter; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatter.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/entity/BgPartymatter.java similarity index 99% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatter.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/entity/BgPartymatter.java index 83addc2..02ad88a 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatter.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/entity/BgPartymatter.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.bgpartymatter.entity; +package org.jeecg.modules.supervision.bgpartymatter.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatterFeedback.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/entity/BgPartymatterFeedback.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatterFeedback.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/entity/BgPartymatterFeedback.java index 84bae2c..8ab8764 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatterFeedback.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/entity/BgPartymatterFeedback.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.bgpartymatter.entity; +package org.jeecg.modules.supervision.bgpartymatter.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/BgPartymatterFeedbackMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/BgPartymatterFeedbackMapper.java similarity index 83% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/BgPartymatterFeedbackMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/BgPartymatterFeedbackMapper.java index f6eddc6..32cbfad 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/BgPartymatterFeedbackMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/BgPartymatterFeedbackMapper.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.demo.bgpartymatter.mapper; +package org.jeecg.modules.supervision.bgpartymatter.mapper; import java.util.List; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatterFeedback; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/BgPartymatterMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/BgPartymatterMapper.java similarity index 69% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/BgPartymatterMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/BgPartymatterMapper.java index 8c29acf..66fbcc4 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/BgPartymatterMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/BgPartymatterMapper.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.demo.bgpartymatter.mapper; +package org.jeecg.modules.supervision.bgpartymatter.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/xml/BgPartymatterFeedbackMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/xml/BgPartymatterFeedbackMapper.xml similarity index 71% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/xml/BgPartymatterFeedbackMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/xml/BgPartymatterFeedbackMapper.xml index 9c8919a..df4c29c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/xml/BgPartymatterFeedbackMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/xml/BgPartymatterFeedbackMapper.xml @@ -1,6 +1,6 @@ - + DELETE @@ -9,7 +9,7 @@ main_id = #{mainId} - SELECT * FROM bg_partymatter_feedback WHERE diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/xml/BgPartymatterMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/xml/BgPartymatterMapper.xml similarity index 63% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/xml/BgPartymatterMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/xml/BgPartymatterMapper.xml index 1ebc8f7..946a122 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/xml/BgPartymatterMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/xml/BgPartymatterMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/IBgPartymatterFeedbackService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/IBgPartymatterFeedbackService.java similarity index 76% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/IBgPartymatterFeedbackService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/IBgPartymatterFeedbackService.java index e4ec491..2270f41 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/IBgPartymatterFeedbackService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/IBgPartymatterFeedbackService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.demo.bgpartymatter.service; +package org.jeecg.modules.supervision.bgpartymatter.service; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatterFeedback; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/IBgPartymatterService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/IBgPartymatterService.java similarity index 73% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/IBgPartymatterService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/IBgPartymatterService.java index fc86bd6..4ca822f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/IBgPartymatterService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/IBgPartymatterService.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.demo.bgpartymatter.service; +package org.jeecg.modules.supervision.bgpartymatter.service; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatterFeedback; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatter; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.beans.factory.annotation.Autowired; import java.io.Serializable; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterFeedbackServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/impl/BgPartymatterFeedbackServiceImpl.java similarity index 68% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterFeedbackServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/impl/BgPartymatterFeedbackServiceImpl.java index 9e55e26..bd54108 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterFeedbackServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/impl/BgPartymatterFeedbackServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.bgpartymatter.service.impl; +package org.jeecg.modules.supervision.bgpartymatter.service.impl; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback; -import org.jeecg.modules.demo.bgpartymatter.mapper.BgPartymatterFeedbackMapper; -import org.jeecg.modules.demo.bgpartymatter.service.IBgPartymatterFeedbackService; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatterFeedback; +import org.jeecg.modules.supervision.bgpartymatter.mapper.BgPartymatterFeedbackMapper; +import org.jeecg.modules.supervision.bgpartymatter.service.IBgPartymatterFeedbackService; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/impl/BgPartymatterServiceImpl.java similarity index 75% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/impl/BgPartymatterServiceImpl.java index e3d78b6..9f78a6d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/impl/BgPartymatterServiceImpl.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.demo.bgpartymatter.service.impl; +package org.jeecg.modules.supervision.bgpartymatter.service.impl; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter; -import org.jeecg.modules.demo.bgpartymatter.mapper.BgPartymatterFeedbackMapper; -import org.jeecg.modules.demo.bgpartymatter.mapper.BgPartymatterMapper; -import org.jeecg.modules.demo.bgpartymatter.service.IBgPartymatterService; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatter; +import org.jeecg.modules.supervision.bgpartymatter.mapper.BgPartymatterFeedbackMapper; +import org.jeecg.modules.supervision.bgpartymatter.mapper.BgPartymatterMapper; +import org.jeecg.modules.supervision.bgpartymatter.service.IBgPartymatterService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/controller/BgTakepulseController.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/controller/BgTakepulseController.java index 87489cc..ef67c12 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/controller/BgTakepulseController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.bqtakepulse.controller; +package org.jeecg.modules.supervision.bqtakepulse.controller; import java.io.IOException; import java.util.ArrayList; @@ -13,9 +13,9 @@ import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson.JSONObject; import org.flowable.engine.RuntimeService; -import org.jeecg.modules.bg.constant.BpmStatus; -import org.jeecg.modules.bg.constant.SupervisionConstant; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.common.BpmStatus; +import org.jeecg.modules.supervision.common.SupervisionConstant; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -29,12 +29,12 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.util.excel.ExcelAnnotationUtils; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.demo.bqtakepulse.dto.BgTakepulseBpmSaveDTO; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse; -import org.jeecg.modules.demo.bqtakepulse.vo.BgTakepulsePage; -import org.jeecg.modules.demo.bqtakepulse.service.IBgTakepulseService; -import org.jeecg.modules.demo.bqtakepulse.service.IBgTakepulseFeedbackService; +import org.jeecg.modules.supervision.bqtakepulse.dto.BgTakepulseBpmSaveDTO; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse; +import org.jeecg.modules.supervision.bqtakepulse.vo.BgTakepulsePage; +import org.jeecg.modules.supervision.bqtakepulse.service.IBgTakepulseService; +import org.jeecg.modules.supervision.bqtakepulse.service.IBgTakepulseFeedbackService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/dto/BgTakepulseBpmSaveDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/dto/BgTakepulseBpmSaveDTO.java similarity index 81% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/dto/BgTakepulseBpmSaveDTO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/dto/BgTakepulseBpmSaveDTO.java index 971bcbc..739b852 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/dto/BgTakepulseBpmSaveDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/dto/BgTakepulseBpmSaveDTO.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.bqtakepulse.dto; +package org.jeecg.modules.supervision.bqtakepulse.dto; import java.io.Serializable; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulse.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/entity/BgTakepulse.java similarity index 99% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulse.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/entity/BgTakepulse.java index 5ec7fbc..8d4f665 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulse.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/entity/BgTakepulse.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.bqtakepulse.entity; +package org.jeecg.modules.supervision.bqtakepulse.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulseFeedback.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/entity/BgTakepulseFeedback.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulseFeedback.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/entity/BgTakepulseFeedback.java index 8c0d17a..710cef8 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulseFeedback.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/entity/BgTakepulseFeedback.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.bqtakepulse.entity; +package org.jeecg.modules.supervision.bqtakepulse.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/BgTakepulseFeedbackMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/BgTakepulseFeedbackMapper.java similarity index 83% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/BgTakepulseFeedbackMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/BgTakepulseFeedbackMapper.java index 2b5a35e..de485cc 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/BgTakepulseFeedbackMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/BgTakepulseFeedbackMapper.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.demo.bqtakepulse.mapper; +package org.jeecg.modules.supervision.bqtakepulse.mapper; import java.util.List; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/BgTakepulseMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/BgTakepulseMapper.java similarity index 70% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/BgTakepulseMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/BgTakepulseMapper.java index d43cd35..81520e5 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/BgTakepulseMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/BgTakepulseMapper.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.demo.bqtakepulse.mapper; +package org.jeecg.modules.supervision.bqtakepulse.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/xml/BgTakepulseFeedbackMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/xml/BgTakepulseFeedbackMapper.xml similarity index 72% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/xml/BgTakepulseFeedbackMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/xml/BgTakepulseFeedbackMapper.xml index bd9affb..cb0b2aa 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/xml/BgTakepulseFeedbackMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/xml/BgTakepulseFeedbackMapper.xml @@ -1,6 +1,6 @@ - + DELETE @@ -8,7 +8,7 @@ WHERE main_id = #{mainId} - SELECT * FROM bg_takepulse_feedback WHERE diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/xml/BgTakepulseMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/xml/BgTakepulseMapper.xml similarity index 64% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/xml/BgTakepulseMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/xml/BgTakepulseMapper.xml index 7e7f6a9..f2273b8 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/xml/BgTakepulseMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/xml/BgTakepulseMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/IBgTakepulseFeedbackService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/IBgTakepulseFeedbackService.java similarity index 77% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/IBgTakepulseFeedbackService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/IBgTakepulseFeedbackService.java index 20f0c08..9908e20 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/IBgTakepulseFeedbackService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/IBgTakepulseFeedbackService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.demo.bqtakepulse.service; +package org.jeecg.modules.supervision.bqtakepulse.service; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/IBgTakepulseService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/IBgTakepulseService.java similarity index 81% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/IBgTakepulseService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/IBgTakepulseService.java index ea72925..a3188d7 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/IBgTakepulseService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/IBgTakepulseService.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.demo.bqtakepulse.service; +package org.jeecg.modules.supervision.bqtakepulse.service; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse; import com.baomidou.mybatisplus.extension.service.IService; import java.io.Serializable; import java.util.Collection; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseFeedbackServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/impl/BgTakepulseFeedbackServiceImpl.java similarity index 69% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseFeedbackServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/impl/BgTakepulseFeedbackServiceImpl.java index 8351666..2a0574e 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseFeedbackServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/impl/BgTakepulseFeedbackServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.bqtakepulse.service.impl; +package org.jeecg.modules.supervision.bqtakepulse.service.impl; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback; -import org.jeecg.modules.demo.bqtakepulse.mapper.BgTakepulseFeedbackMapper; -import org.jeecg.modules.demo.bqtakepulse.service.IBgTakepulseFeedbackService; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback; +import org.jeecg.modules.supervision.bqtakepulse.mapper.BgTakepulseFeedbackMapper; +import org.jeecg.modules.supervision.bqtakepulse.service.IBgTakepulseFeedbackService; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/impl/BgTakepulseServiceImpl.java similarity index 86% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/impl/BgTakepulseServiceImpl.java index 4d9012a..b0ee2ce 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/impl/BgTakepulseServiceImpl.java @@ -1,10 +1,10 @@ -package org.jeecg.modules.demo.bqtakepulse.service.impl; +package org.jeecg.modules.supervision.bqtakepulse.service.impl; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback; -import org.jeecg.modules.demo.bqtakepulse.mapper.BgTakepulseFeedbackMapper; -import org.jeecg.modules.demo.bqtakepulse.mapper.BgTakepulseMapper; -import org.jeecg.modules.demo.bqtakepulse.service.IBgTakepulseService; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback; +import org.jeecg.modules.supervision.bqtakepulse.mapper.BgTakepulseFeedbackMapper; +import org.jeecg.modules.supervision.bqtakepulse.mapper.BgTakepulseMapper; +import org.jeecg.modules.supervision.bqtakepulse.service.IBgTakepulseService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/vo/BgTakepulsePage.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/vo/BgTakepulsePage.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/vo/BgTakepulsePage.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/vo/BgTakepulsePage.java index 44cb6ad..09c2fbc 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/vo/BgTakepulsePage.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/vo/BgTakepulsePage.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.bqtakepulse.vo; +package org.jeecg.modules.supervision.bqtakepulse.vo; import java.util.List; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.ExcelEntity; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/BpmStatus.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/BpmStatus.java similarity index 93% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/BpmStatus.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/BpmStatus.java index adfdbe8..6e8198c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/BpmStatus.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/BpmStatus.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.constant; +package org.jeecg.modules.supervision.common; import java.util.Arrays; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/SupervisionConstant.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/SupervisionConstant.java similarity index 93% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/SupervisionConstant.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/SupervisionConstant.java index b4d77ee..190469e 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/SupervisionConstant.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/SupervisionConstant.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.constant; +package org.jeecg.modules.supervision.common; /** * 监督模块通用常量 diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/controller/ProcessPortalController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/controller/ProcessPortalController.java similarity index 83% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/controller/ProcessPortalController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/controller/ProcessPortalController.java index b8d7622..6b959a2 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/controller/ProcessPortalController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/controller/ProcessPortalController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.dashboard.controller; +package org.jeecg.modules.supervision.dashboard.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -6,8 +6,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.modules.dashboard.dto.ProcessPortalStatsDTO; -import org.jeecg.modules.dashboard.service.IProcessPortalService; +import org.jeecg.modules.supervision.dashboard.dto.ProcessPortalStatsDTO; +import org.jeecg.modules.supervision.dashboard.service.IProcessPortalService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/dto/ProcessPortalStatsDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/dto/ProcessPortalStatsDTO.java similarity index 86% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/dto/ProcessPortalStatsDTO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/dto/ProcessPortalStatsDTO.java index 8987030..d9dc205 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/dto/ProcessPortalStatsDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/dto/ProcessPortalStatsDTO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.dashboard.dto; +package org.jeecg.modules.supervision.dashboard.dto; import lombok.Data; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/mapper/ProcessPortalMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/mapper/ProcessPortalMapper.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/mapper/ProcessPortalMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/mapper/ProcessPortalMapper.java index c53b4ac..349156c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/mapper/ProcessPortalMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/mapper/ProcessPortalMapper.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.dashboard.mapper; +package org.jeecg.modules.supervision.dashboard.mapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/service/IProcessPortalService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/service/IProcessPortalService.java new file mode 100644 index 0000000..8136874 --- /dev/null +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/service/IProcessPortalService.java @@ -0,0 +1,8 @@ +package org.jeecg.modules.supervision.dashboard.service; + +import org.jeecg.modules.supervision.dashboard.dto.ProcessPortalStatsDTO; + +public interface IProcessPortalService { + + ProcessPortalStatsDTO getStats(String userId); +} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/service/impl/ProcessPortalServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/service/impl/ProcessPortalServiceImpl.java similarity index 85% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/service/impl/ProcessPortalServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/service/impl/ProcessPortalServiceImpl.java index 04a7872..f65722d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/service/impl/ProcessPortalServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/service/impl/ProcessPortalServiceImpl.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.dashboard.service.impl; +package org.jeecg.modules.supervision.dashboard.service.impl; import lombok.extern.slf4j.Slf4j; -import org.jeecg.modules.dashboard.dto.ProcessPortalStatsDTO; -import org.jeecg.modules.dashboard.mapper.ProcessPortalMapper; -import org.jeecg.modules.dashboard.service.IProcessPortalService; +import org.jeecg.modules.supervision.dashboard.dto.ProcessPortalStatsDTO; +import org.jeecg.modules.supervision.dashboard.mapper.ProcessPortalMapper; +import org.jeecg.modules.supervision.dashboard.service.IProcessPortalService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/controller/DqInspectProblemController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/controller/DqInspectProblemController.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/controller/DqInspectProblemController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/controller/DqInspectProblemController.java index cec3add..c6beed9 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/controller/DqInspectProblemController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/controller/DqInspectProblemController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.dqinspectproblem.controller; +package org.jeecg.modules.supervision.dqinspectproblem.controller; import java.util.Arrays; import java.util.List; @@ -13,8 +13,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.demo.dqinspectproblem.entity.DqInspectProblem; -import org.jeecg.modules.demo.dqinspectproblem.service.IDqInspectProblemService; +import org.jeecg.modules.supervision.dqinspectproblem.entity.DqInspectProblem; +import org.jeecg.modules.supervision.dqinspectproblem.service.IDqInspectProblemService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/entity/DqInspectProblem.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/entity/DqInspectProblem.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/entity/DqInspectProblem.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/entity/DqInspectProblem.java index 0573b06..decfd34 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/entity/DqInspectProblem.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/entity/DqInspectProblem.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.dqinspectproblem.entity; +package org.jeecg.modules.supervision.dqinspectproblem.entity; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/mapper/DqInspectProblemMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/mapper/DqInspectProblemMapper.java similarity index 84% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/mapper/DqInspectProblemMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/mapper/DqInspectProblemMapper.java index 00c805d..c0a96dc 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/mapper/DqInspectProblemMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/mapper/DqInspectProblemMapper.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.demo.dqinspectproblem.mapper; +package org.jeecg.modules.supervision.dqinspectproblem.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.demo.dqinspectproblem.entity.DqInspectProblem; +import org.jeecg.modules.supervision.dqinspectproblem.entity.DqInspectProblem; import java.util.List; import java.util.Map; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/mapper/xml/DqInspectProblemMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/mapper/xml/DqInspectProblemMapper.xml similarity index 89% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/mapper/xml/DqInspectProblemMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/mapper/xml/DqInspectProblemMapper.xml index ae65e21..65ce2a5 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/mapper/xml/DqInspectProblemMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/mapper/xml/DqInspectProblemMapper.xml @@ -1,6 +1,6 @@ - + update dq_inspect_problem set has_child = #{status} where id = #{id} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/service/IDqInspectProblemService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/service/IDqInspectProblemService.java similarity index 93% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/service/IDqInspectProblemService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/service/IDqInspectProblemService.java index 3acd86b..4fc2ce5 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/service/IDqInspectProblemService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/service/IDqInspectProblemService.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.demo.dqinspectproblem.service; +package org.jeecg.modules.supervision.dqinspectproblem.service; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.demo.dqinspectproblem.entity.DqInspectProblem; +import org.jeecg.modules.supervision.dqinspectproblem.entity.DqInspectProblem; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.exception.JeecgBootException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/service/impl/DqInspectProblemServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/service/impl/DqInspectProblemServiceImpl.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/service/impl/DqInspectProblemServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/service/impl/DqInspectProblemServiceImpl.java index d61643e..c7dc66e 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/service/impl/DqInspectProblemServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/service/impl/DqInspectProblemServiceImpl.java @@ -1,12 +1,12 @@ -package org.jeecg.modules.demo.dqinspectproblem.service.impl; +package org.jeecg.modules.supervision.dqinspectproblem.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.demo.dqinspectproblem.entity.DqInspectProblem; -import org.jeecg.modules.demo.dqinspectproblem.mapper.DqInspectProblemMapper; -import org.jeecg.modules.demo.dqinspectproblem.service.IDqInspectProblemService; +import org.jeecg.modules.supervision.dqinspectproblem.entity.DqInspectProblem; +import org.jeecg.modules.supervision.dqinspectproblem.mapper.DqInspectProblemMapper; +import org.jeecg.modules.supervision.dqinspectproblem.service.IDqInspectProblemService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectProgressController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/controller/DqInspectProgressController.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectProgressController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/controller/DqInspectProgressController.java index d6c4f90..b018ddd 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectProgressController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/controller/DqInspectProgressController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.dqinspecttask.controller; +package org.jeecg.modules.supervision.dqinspecttask.controller; import java.util.Arrays; import java.io.IOException; @@ -9,8 +9,8 @@ import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectProgressService; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectProgressService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/controller/DqInspectTaskController.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/controller/DqInspectTaskController.java index e5d22e0..0d279ac 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/controller/DqInspectTaskController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.dqinspecttask.controller; +package org.jeecg.modules.supervision.dqinspecttask.controller; import java.io.UnsupportedEncodingException; import java.io.IOException; @@ -26,12 +26,12 @@ import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.util.excel.ExcelAnnotationUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.base.controller.JeecgController; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; -import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskLedgerVo; -import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskPage; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectProgressService; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.vo.DqInspectTaskLedgerVo; +import org.jeecg.modules.supervision.dqinspecttask.vo.DqInspectTaskPage; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectProgressService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectProgress.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectProgress.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectProgress.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectProgress.java index 37b85e8..6e75028 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectProgress.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectProgress.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.dqinspecttask.entity; +package org.jeecg.modules.supervision.dqinspecttask.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectTask.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectTask.java similarity index 99% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectTask.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectTask.java index 847a94b..d7d4baa 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectTask.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectTask.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.dqinspecttask.entity; +package org.jeecg.modules.supervision.dqinspecttask.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectProgressMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/DqInspectProgressMapper.java similarity index 83% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectProgressMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/DqInspectProgressMapper.java index 41ec189..23893f6 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectProgressMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/DqInspectProgressMapper.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.demo.dqinspecttask.mapper; +package org.jeecg.modules.supervision.dqinspecttask.mapper; import java.util.List; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectTaskMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/DqInspectTaskMapper.java similarity index 78% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectTaskMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/DqInspectTaskMapper.java index a54d3fc..b99fbb7 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectTaskMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/DqInspectTaskMapper.java @@ -1,13 +1,13 @@ -package org.jeecg.modules.demo.dqinspecttask.mapper; +package org.jeecg.modules.supervision.dqinspecttask.mapper; import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskLedgerVo; +import org.jeecg.modules.supervision.dqinspecttask.vo.DqInspectTaskLedgerVo; /** * @Description: dq_inspect_task diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectProgressMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/xml/DqInspectProgressMapper.xml similarity index 71% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectProgressMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/xml/DqInspectProgressMapper.xml index dc6c9ba..3b73b15 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectProgressMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/xml/DqInspectProgressMapper.xml @@ -1,6 +1,6 @@ - + DELETE @@ -8,7 +8,7 @@ WHERE main_id = #{mainId} - SELECT * FROM dq_inspect_progress WHERE diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml similarity index 94% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml index 84f8a70..7df7e2c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml @@ -1,8 +1,8 @@ - + - select t.id, p_category.id as categoryId, diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectProgressService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/IDqInspectProgressService.java similarity index 76% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectProgressService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/IDqInspectProgressService.java index e5706d0..6e04302 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectProgressService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/IDqInspectProgressService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.demo.dqinspecttask.service; +package org.jeecg.modules.supervision.dqinspecttask.service; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectTaskService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/IDqInspectTaskService.java similarity index 81% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectTaskService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/IDqInspectTaskService.java index 4c2b977..4144e82 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectTaskService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/IDqInspectTaskService.java @@ -1,11 +1,11 @@ -package org.jeecg.modules.demo.dqinspecttask.service; +package org.jeecg.modules.supervision.dqinspecttask.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskLedgerVo; +import org.jeecg.modules.supervision.dqinspecttask.vo.DqInspectTaskLedgerVo; import java.io.Serializable; import java.util.Collection; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectProgressServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/impl/DqInspectProgressServiceImpl.java similarity index 68% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectProgressServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/impl/DqInspectProgressServiceImpl.java index 2c9fea1..612e0d6 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectProgressServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/impl/DqInspectProgressServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.dqinspecttask.service.impl; +package org.jeecg.modules.supervision.dqinspecttask.service.impl; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress; -import org.jeecg.modules.demo.dqinspecttask.mapper.DqInspectProgressMapper; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectProgressService; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress; +import org.jeecg.modules.supervision.dqinspecttask.mapper.DqInspectProgressMapper; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectProgressService; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java similarity index 83% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java index a386dd2..1535cc5 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java @@ -1,15 +1,15 @@ -package org.jeecg.modules.demo.dqinspecttask.service.impl; +package org.jeecg.modules.supervision.dqinspecttask.service.impl; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.demo.dqinspectproblem.entity.DqInspectProblem; -import org.jeecg.modules.demo.dqinspectproblem.service.IDqInspectProblemService; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress; -import org.jeecg.modules.demo.dqinspecttask.mapper.DqInspectProgressMapper; -import org.jeecg.modules.demo.dqinspecttask.mapper.DqInspectTaskMapper; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService; -import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskLedgerVo; +import org.jeecg.modules.supervision.dqinspectproblem.entity.DqInspectProblem; +import org.jeecg.modules.supervision.dqinspectproblem.service.IDqInspectProblemService; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress; +import org.jeecg.modules.supervision.dqinspecttask.mapper.DqInspectProgressMapper; +import org.jeecg.modules.supervision.dqinspecttask.mapper.DqInspectTaskMapper; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService; +import org.jeecg.modules.supervision.dqinspecttask.vo.DqInspectTaskLedgerVo; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskLedgerVo.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/vo/DqInspectTaskLedgerVo.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskLedgerVo.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/vo/DqInspectTaskLedgerVo.java index e555250c..8fa9dcb 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskLedgerVo.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/vo/DqInspectTaskLedgerVo.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.dqinspecttask.vo; +package org.jeecg.modules.supervision.dqinspecttask.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskPage.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/vo/DqInspectTaskPage.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskPage.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/vo/DqInspectTaskPage.java index 95af033..a6edb35 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskPage.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/vo/DqInspectTaskPage.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.dqinspecttask.vo; +package org.jeecg.modules.supervision.dqinspecttask.vo; import java.util.List; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.ExcelEntity; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/constant/FixContactConstant.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/constant/FixContactConstant.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/constant/FixContactConstant.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/constant/FixContactConstant.java index fce2931..73d8d84 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/constant/FixContactConstant.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/constant/FixContactConstant.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.fixcontact.constant; +package org.jeecg.modules.supervision.fixcontact.constant; /** * 定点联系模块常量 diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/controller/FixedContact20260730Controller.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/controller/FixedContact20260730Controller.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/controller/FixedContact20260730Controller.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/controller/FixedContact20260730Controller.java index 567ff94..b8fe9b0 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/controller/FixedContact20260730Controller.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/controller/FixedContact20260730Controller.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.fixcontact.controller; +package org.jeecg.modules.supervision.fixcontact.controller; import java.util.*; import java.io.IOException; @@ -16,14 +16,14 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.excel.ExcelAnnotationUtils; -import org.jeecg.modules.bg.constant.BpmStatus; -import org.jeecg.modules.bg.constant.SupervisionConstant; -import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730; -import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730; -import org.jeecg.modules.bg.fixcontact.service.IFixedContact20260730Service; -import org.jeecg.modules.bg.fixcontact.service.IFixedContactFeedback20260730Service; -import org.jeecg.modules.bg.fixcontact.dto.FixedContact20260730BpmSaveDTO; -import org.jeecg.modules.bg.fixcontact.vo.FixedContact20260730Page; +import org.jeecg.modules.supervision.common.BpmStatus; +import org.jeecg.modules.supervision.common.SupervisionConstant; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730; +import org.jeecg.modules.supervision.fixcontact.service.IFixedContact20260730Service; +import org.jeecg.modules.supervision.fixcontact.service.IFixedContactFeedback20260730Service; +import org.jeecg.modules.supervision.fixcontact.dto.FixedContact20260730BpmSaveDTO; +import org.jeecg.modules.supervision.fixcontact.vo.FixedContact20260730Page; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.flowable.engine.RuntimeService; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/dto/FixedContact20260730BpmSaveDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/dto/FixedContact20260730BpmSaveDTO.java similarity index 81% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/dto/FixedContact20260730BpmSaveDTO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/dto/FixedContact20260730BpmSaveDTO.java index 026d51e..fa9f938 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/dto/FixedContact20260730BpmSaveDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/dto/FixedContact20260730BpmSaveDTO.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.bg.fixcontact.dto; +package org.jeecg.modules.supervision.fixcontact.dto; import java.io.Serializable; -import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContact20260730.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/entity/FixedContact20260730.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContact20260730.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/entity/FixedContact20260730.java index 2777e73..d70868b 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContact20260730.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/entity/FixedContact20260730.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.fixcontact.entity; +package org.jeecg.modules.supervision.fixcontact.entity; import java.io.Serializable; import java.util.Date; @@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecg.common.aspect.annotation.AutoLogIgnore; import org.jeecg.common.aspect.annotation.Dict; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap; @Data @TableName(value = "fixed_contact_20260730", autoResultMap = true) diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContactFeedback20260730.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/entity/FixedContactFeedback20260730.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContactFeedback20260730.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/entity/FixedContactFeedback20260730.java index 682ac5a..83a003c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContactFeedback20260730.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/entity/FixedContactFeedback20260730.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.fixcontact.entity; +package org.jeecg.modules.supervision.fixcontact.entity; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/flow/FixContactFlow.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/flow/FixContactFlow.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/flow/FixContactFlow.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/flow/FixContactFlow.java index c45c7c8..97e43b9 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/flow/FixContactFlow.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/flow/FixContactFlow.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.fixcontact.flow; +package org.jeecg.modules.supervision.fixcontact.flow; import com.alibaba.fastjson.JSONObject; import com.jeecg.weibo.exception.BusinessException; @@ -8,13 +8,13 @@ import org.apache.commons.lang.StringUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.DelegateExecution; import org.jeecg.common.system.api.ISysBaseAPI; -import org.jeecg.modules.bg.fixcontact.constant.FixContactConstant; -import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730; -import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730; -import org.jeecg.modules.bg.fixcontact.service.IFixedContact20260730Service; -import org.jeecg.modules.bg.fixcontact.service.IFixedContactFeedback20260730Service; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.supervision.fixcontact.constant.FixContactConstant; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730; +import org.jeecg.modules.supervision.fixcontact.service.IFixedContact20260730Service; +import org.jeecg.modules.supervision.fixcontact.service.IFixedContactFeedback20260730Service; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap; import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/listener/FixContactDeptLeaderApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/listener/FixContactDeptLeaderApproveListener.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/listener/FixContactDeptLeaderApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/listener/FixContactDeptLeaderApproveListener.java index a05da36..66a8fe9 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/listener/FixContactDeptLeaderApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/listener/FixContactDeptLeaderApproveListener.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.fixcontact.listener; +package org.jeecg.modules.supervision.fixcontact.listener; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -7,7 +7,7 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.runtime.Execution; import org.flowable.task.service.delegate.DelegateTask; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.modules.bg.fixcontact.constant.FixContactConstant; +import org.jeecg.modules.supervision.fixcontact.constant.FixContactConstant; import org.springframework.stereotype.Component; /** diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/listener/FixContactWorkerApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/listener/FixContactWorkerApproveListener.java similarity index 92% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/listener/FixContactWorkerApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/listener/FixContactWorkerApproveListener.java index 95ab59a..c0a87c1 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/listener/FixContactWorkerApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/listener/FixContactWorkerApproveListener.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.fixcontact.listener; +package org.jeecg.modules.supervision.fixcontact.listener; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -6,11 +6,11 @@ import org.apache.commons.lang.StringUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.modules.bg.fixcontact.constant.FixContactConstant; -import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730; -import org.jeecg.modules.bg.fixcontact.service.IFixedContact20260730Service; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.supervision.fixcontact.constant.FixContactConstant; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730; +import org.jeecg.modules.supervision.fixcontact.service.IFixedContact20260730Service; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/mapper/FixedContact20260730Mapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/mapper/FixedContact20260730Mapper.java similarity index 52% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/mapper/FixedContact20260730Mapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/mapper/FixedContact20260730Mapper.java index 80ddcae..c6a81e6 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/mapper/FixedContact20260730Mapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/mapper/FixedContact20260730Mapper.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.bg.fixcontact.mapper; +package org.jeecg.modules.supervision.fixcontact.mapper; -import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface FixedContact20260730Mapper extends BaseMapper { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/mapper/FixedContactFeedback20260730Mapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/mapper/FixedContactFeedback20260730Mapper.java similarity index 88% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/mapper/FixedContactFeedback20260730Mapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/mapper/FixedContactFeedback20260730Mapper.java index de91302..ce15dd7 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/mapper/FixedContactFeedback20260730Mapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/mapper/FixedContactFeedback20260730Mapper.java @@ -1,10 +1,10 @@ -package org.jeecg.modules.bg.fixcontact.mapper; +package org.jeecg.modules.supervision.fixcontact.mapper; import java.util.List; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface FixedContactFeedback20260730Mapper extends BaseMapper { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/IFixedContact20260730Service.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/IFixedContact20260730Service.java similarity index 77% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/IFixedContact20260730Service.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/IFixedContact20260730Service.java index 187a4ef..b8cba34 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/IFixedContact20260730Service.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/IFixedContact20260730Service.java @@ -1,10 +1,10 @@ -package org.jeecg.modules.bg.fixcontact.service; +package org.jeecg.modules.supervision.fixcontact.service; import java.io.Serializable; import java.util.Collection; import java.util.List; -import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730; -import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730; import com.baomidou.mybatisplus.extension.service.IService; public interface IFixedContact20260730Service extends IService { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/IFixedContactFeedback20260730Service.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/IFixedContactFeedback20260730Service.java similarity index 64% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/IFixedContactFeedback20260730Service.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/IFixedContactFeedback20260730Service.java index a852d02..463ab99 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/IFixedContactFeedback20260730Service.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/IFixedContactFeedback20260730Service.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.bg.fixcontact.service; +package org.jeecg.modules.supervision.fixcontact.service; import java.util.List; -import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730; import com.baomidou.mybatisplus.extension.service.IService; public interface IFixedContactFeedback20260730Service extends IService { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/impl/FixedContact20260730ServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/impl/FixedContact20260730ServiceImpl.java similarity index 86% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/impl/FixedContact20260730ServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/impl/FixedContact20260730ServiceImpl.java index 7d57e29..d09c691 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/impl/FixedContact20260730ServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/impl/FixedContact20260730ServiceImpl.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.fixcontact.service.impl; +package org.jeecg.modules.supervision.fixcontact.service.impl; import java.io.Serializable; import java.util.ArrayList; @@ -6,13 +6,13 @@ import java.util.Collection; import java.util.List; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730; -import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730; -import org.jeecg.modules.bg.fixcontact.mapper.FixedContact20260730Mapper; -import org.jeecg.modules.bg.fixcontact.mapper.FixedContactFeedback20260730Mapper; -import org.jeecg.modules.bg.fixcontact.service.IFixedContact20260730Service; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730; +import org.jeecg.modules.supervision.fixcontact.mapper.FixedContact20260730Mapper; +import org.jeecg.modules.supervision.fixcontact.mapper.FixedContactFeedback20260730Mapper; +import org.jeecg.modules.supervision.fixcontact.service.IFixedContact20260730Service; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/impl/FixedContactFeedback20260730ServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/impl/FixedContactFeedback20260730ServiceImpl.java similarity index 59% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/impl/FixedContactFeedback20260730ServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/impl/FixedContactFeedback20260730ServiceImpl.java index 4fdb6cc..4561faf 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/impl/FixedContactFeedback20260730ServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/impl/FixedContactFeedback20260730ServiceImpl.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.bg.fixcontact.service.impl; +package org.jeecg.modules.supervision.fixcontact.service.impl; import java.util.List; -import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730; -import org.jeecg.modules.bg.fixcontact.mapper.FixedContactFeedback20260730Mapper; -import org.jeecg.modules.bg.fixcontact.service.IFixedContactFeedback20260730Service; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730; +import org.jeecg.modules.supervision.fixcontact.mapper.FixedContactFeedback20260730Mapper; +import org.jeecg.modules.supervision.fixcontact.service.IFixedContactFeedback20260730Service; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/vo/FixedContact20260730Page.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/vo/FixedContact20260730Page.java similarity index 63% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/vo/FixedContact20260730Page.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/vo/FixedContact20260730Page.java index d1e2703..53ed7a2 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/vo/FixedContact20260730Page.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/vo/FixedContact20260730Page.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.bg.fixcontact.vo; +package org.jeecg.modules.supervision.fixcontact.vo; import java.util.List; -import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730; -import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730; +import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730; import lombok.Data; import lombok.EqualsAndHashCode; import org.jeecgframework.poi.excel.annotation.ExcelCollection; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/controller/ImprovementProposalController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/controller/ImprovementProposalController.java similarity index 95% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/controller/ImprovementProposalController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/controller/ImprovementProposalController.java index acd4714..8dbceb8 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/controller/ImprovementProposalController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/controller/ImprovementProposalController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.improvementproposal.controller; +package org.jeecg.modules.supervision.improvementproposal.controller; import java.io.UnsupportedEncodingException; import java.io.IOException; @@ -25,17 +25,17 @@ import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore; -import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote; -import org.jeecg.modules.improvementproposal.entity.ImprovementProposal; -import org.jeecg.modules.improvementproposal.dto.ImprovementDeptScoreBpmDTO; -import org.jeecg.modules.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO; -import org.jeecg.modules.improvementproposal.dto.ImprovementProposalBpmActionDTO; -import org.jeecg.modules.improvementproposal.dto.ImprovementProposalDepartmentDTO; -import org.jeecg.modules.improvementproposal.vo.ImprovementProposalPage; -import org.jeecg.modules.improvementproposal.service.IImprovementProposalService; -import org.jeecg.modules.improvementproposal.service.IImprovementDeptScoreService; -import org.jeecg.modules.improvementproposal.service.IImprovementInstituteVoteService; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementProposal; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementDeptScoreBpmDTO; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementProposalBpmActionDTO; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementProposalDepartmentDTO; +import org.jeecg.modules.supervision.improvementproposal.vo.ImprovementProposalPage; +import org.jeecg.modules.supervision.improvementproposal.service.IImprovementProposalService; +import org.jeecg.modules.supervision.improvementproposal.service.IImprovementDeptScoreService; +import org.jeecg.modules.supervision.improvementproposal.service.IImprovementInstituteVoteService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java similarity index 94% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java index a65feb2..ba680b0 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.improvementproposal.dto; +package org.jeecg.modules.supervision.improvementproposal.dto; import java.math.BigDecimal; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementInstituteVoteCandidateDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementInstituteVoteCandidateDTO.java similarity index 90% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementInstituteVoteCandidateDTO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementInstituteVoteCandidateDTO.java index 3b777c5..4fbbfde 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementInstituteVoteCandidateDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementInstituteVoteCandidateDTO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.improvementproposal.dto; +package org.jeecg.modules.supervision.improvementproposal.dto; import java.io.Serializable; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementProposalBpmActionDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementProposalBpmActionDTO.java similarity index 95% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementProposalBpmActionDTO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementProposalBpmActionDTO.java index 15373a5..8174f19 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementProposalBpmActionDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementProposalBpmActionDTO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.improvementproposal.dto; +package org.jeecg.modules.supervision.improvementproposal.dto; import java.io.Serializable; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementProposalDepartmentDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementProposalDepartmentDTO.java similarity index 90% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementProposalDepartmentDTO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementProposalDepartmentDTO.java index 9117aee..7f6ada8 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementProposalDepartmentDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementProposalDepartmentDTO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.improvementproposal.dto; +package org.jeecg.modules.supervision.improvementproposal.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementDeptScore.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementDeptScore.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementDeptScore.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementDeptScore.java index 2edf323..41bcc55 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementDeptScore.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementDeptScore.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.improvementproposal.entity; +package org.jeecg.modules.supervision.improvementproposal.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementInstituteVote.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementInstituteVote.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementInstituteVote.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementInstituteVote.java index c1a671a..7e8fcfc 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementInstituteVote.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementInstituteVote.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.improvementproposal.entity; +package org.jeecg.modules.supervision.improvementproposal.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementProposal.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementProposal.java similarity index 99% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementProposal.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementProposal.java index 27d93dd..4cd72aa 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementProposal.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementProposal.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.improvementproposal.entity; +package org.jeecg.modules.supervision.improvementproposal.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementDeptScoreMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementDeptScoreMapper.java similarity index 82% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementDeptScoreMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementDeptScoreMapper.java index fb36f00..0ec953d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementDeptScoreMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementDeptScoreMapper.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.improvementproposal.mapper; +package org.jeecg.modules.supervision.improvementproposal.mapper; import java.util.List; -import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementInstituteVoteMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementInstituteVoteMapper.java similarity index 84% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementInstituteVoteMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementInstituteVoteMapper.java index 93fc97d..597ad79 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementInstituteVoteMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementInstituteVoteMapper.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.improvementproposal.mapper; +package org.jeecg.modules.supervision.improvementproposal.mapper; import java.util.List; -import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementProposalMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementProposalMapper.java similarity index 83% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementProposalMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementProposalMapper.java index 8206aeb..3c27579 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementProposalMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementProposalMapper.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.improvementproposal.mapper; +package org.jeecg.modules.supervision.improvementproposal.mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.jeecg.modules.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO; -import org.jeecg.modules.improvementproposal.entity.ImprovementProposal; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementProposal; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementDeptScoreMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementDeptScoreMapper.xml similarity index 70% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementDeptScoreMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementDeptScoreMapper.xml index c326705..26187cf 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementDeptScoreMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementDeptScoreMapper.xml @@ -1,6 +1,6 @@ - + DELETE @@ -8,7 +8,7 @@ WHERE main_id = #{mainId} - SELECT * FROM improvement_dept_score WHERE diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementInstituteVoteMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementInstituteVoteMapper.xml similarity index 79% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementInstituteVoteMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementInstituteVoteMapper.xml index 4335c78..c6bf72c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementInstituteVoteMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementInstituteVoteMapper.xml @@ -1,6 +1,6 @@ - + DELETE @@ -8,7 +8,7 @@ WHERE main_id = #{mainId} - SELECT * FROM improvement_institute_vote WHERE diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementProposalMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementProposalMapper.xml similarity index 88% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementProposalMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementProposalMapper.xml index 985aacc..eb71488 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementProposalMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementProposalMapper.xml @@ -1,6 +1,6 @@ - + - SELECT DISTINCT u.id, u.username, u.realname FROM sys_role r INNER JOIN sys_user_role ur ON ur.role_id = r.id diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementDeptScoreService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementDeptScoreService.java similarity index 75% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementDeptScoreService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementDeptScoreService.java index bfa5a22..5d46a55 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementDeptScoreService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementDeptScoreService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.improvementproposal.service; +package org.jeecg.modules.supervision.improvementproposal.service; -import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementInstituteVoteService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementInstituteVoteService.java similarity index 75% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementInstituteVoteService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementInstituteVoteService.java index 1555499..7ebbc42 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementInstituteVoteService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementInstituteVoteService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.improvementproposal.service; +package org.jeecg.modules.supervision.improvementproposal.service; -import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementProposalService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementProposalService.java similarity index 86% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementProposalService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementProposalService.java index bf720fc..828084f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementProposalService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementProposalService.java @@ -1,12 +1,12 @@ -package org.jeecg.modules.improvementproposal.service; +package org.jeecg.modules.supervision.improvementproposal.service; -import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore; -import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote; -import org.jeecg.modules.improvementproposal.entity.ImprovementProposal; -import org.jeecg.modules.improvementproposal.dto.ImprovementDeptScoreBpmDTO; -import org.jeecg.modules.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO; -import org.jeecg.modules.improvementproposal.dto.ImprovementProposalBpmActionDTO; -import org.jeecg.modules.improvementproposal.dto.ImprovementProposalDepartmentDTO; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementProposal; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementDeptScoreBpmDTO; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementProposalBpmActionDTO; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementProposalDepartmentDTO; import org.jeecg.common.system.vo.LoginUser; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletRequest; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementDeptScoreServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementDeptScoreServiceImpl.java similarity index 67% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementDeptScoreServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementDeptScoreServiceImpl.java index dd257ea..fac0349 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementDeptScoreServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementDeptScoreServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.improvementproposal.service.impl; +package org.jeecg.modules.supervision.improvementproposal.service.impl; -import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore; -import org.jeecg.modules.improvementproposal.mapper.ImprovementDeptScoreMapper; -import org.jeecg.modules.improvementproposal.service.IImprovementDeptScoreService; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore; +import org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementDeptScoreMapper; +import org.jeecg.modules.supervision.improvementproposal.service.IImprovementDeptScoreService; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementInstituteVoteServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementInstituteVoteServiceImpl.java similarity index 67% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementInstituteVoteServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementInstituteVoteServiceImpl.java index 2e81dca..3b92c40 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementInstituteVoteServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementInstituteVoteServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.improvementproposal.service.impl; +package org.jeecg.modules.supervision.improvementproposal.service.impl; -import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote; -import org.jeecg.modules.improvementproposal.mapper.ImprovementInstituteVoteMapper; -import org.jeecg.modules.improvementproposal.service.IImprovementInstituteVoteService; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote; +import org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementInstituteVoteMapper; +import org.jeecg.modules.supervision.improvementproposal.service.IImprovementInstituteVoteService; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementProposalServiceImpl.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementProposalServiceImpl.java index 0e4a9dd..66dc74f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementProposalServiceImpl.java @@ -1,16 +1,16 @@ -package org.jeecg.modules.improvementproposal.service.impl; +package org.jeecg.modules.supervision.improvementproposal.service.impl; -import org.jeecg.modules.improvementproposal.entity.ImprovementProposal; -import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore; -import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote; -import org.jeecg.modules.improvementproposal.dto.ImprovementDeptScoreBpmDTO; -import org.jeecg.modules.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO; -import org.jeecg.modules.improvementproposal.dto.ImprovementProposalBpmActionDTO; -import org.jeecg.modules.improvementproposal.dto.ImprovementProposalDepartmentDTO; -import org.jeecg.modules.improvementproposal.mapper.ImprovementDeptScoreMapper; -import org.jeecg.modules.improvementproposal.mapper.ImprovementInstituteVoteMapper; -import org.jeecg.modules.improvementproposal.mapper.ImprovementProposalMapper; -import org.jeecg.modules.improvementproposal.service.IImprovementProposalService; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementProposal; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementDeptScoreBpmDTO; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementProposalBpmActionDTO; +import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementProposalDepartmentDTO; +import org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementDeptScoreMapper; +import org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementInstituteVoteMapper; +import org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementProposalMapper; +import org.jeecg.modules.supervision.improvementproposal.service.IImprovementProposalService; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.vo.LoginUser; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/vo/ImprovementProposalPage.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/vo/ImprovementProposalPage.java similarity index 95% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/vo/ImprovementProposalPage.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/vo/ImprovementProposalPage.java index 47c01a5..e70931e 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/vo/ImprovementProposalPage.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/vo/ImprovementProposalPage.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.improvementproposal.vo; +package org.jeecg.modules.supervision.improvementproposal.vo; import java.util.List; -import org.jeecg.modules.improvementproposal.entity.ImprovementProposal; -import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore; -import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementProposal; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore; +import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.ExcelEntity; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/controller/DjInspectImproveController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/controller/DjInspectImproveController.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/controller/DjInspectImproveController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/controller/DjInspectImproveController.java index 780c35d..c810df4 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/controller/DjInspectImproveController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/controller/DjInspectImproveController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.dj.inspectimprove.controller; +package org.jeecg.modules.supervision.inspectimprove.controller; import java.util.Arrays; import java.util.List; @@ -13,11 +13,11 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.bg.constant.BpmStatus; -import org.jeecg.modules.bg.constant.SupervisionConstant; -import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse; -import org.jeecg.modules.dj.inspectimprove.entity.DjInspectImprove; -import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService; +import org.jeecg.modules.supervision.common.BpmStatus; +import org.jeecg.modules.supervision.common.SupervisionConstant; +import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse; +import org.jeecg.modules.supervision.inspectimprove.entity.DjInspectImprove; +import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/entity/DjInspectImprove.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/entity/DjInspectImprove.java similarity index 99% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/entity/DjInspectImprove.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/entity/DjInspectImprove.java index ad820c1..c17fbf7 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/entity/DjInspectImprove.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/entity/DjInspectImprove.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.dj.inspectimprove.entity; +package org.jeecg.modules.supervision.inspectimprove.entity; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/mapper/DjInspectImproveMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/mapper/DjInspectImproveMapper.java similarity index 84% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/mapper/DjInspectImproveMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/mapper/DjInspectImproveMapper.java index 0bf2e1e..eeb45c2 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/mapper/DjInspectImproveMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/mapper/DjInspectImproveMapper.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.dj.inspectimprove.mapper; +package org.jeecg.modules.supervision.inspectimprove.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.dj.inspectimprove.entity.DjInspectImprove; +import org.jeecg.modules.supervision.inspectimprove.entity.DjInspectImprove; import java.util.List; import java.util.Map; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/mapper/xml/DjInspectImproveMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/mapper/xml/DjInspectImproveMapper.xml similarity index 89% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/mapper/xml/DjInspectImproveMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/mapper/xml/DjInspectImproveMapper.xml index 8f46221..d7a48a0 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/mapper/xml/DjInspectImproveMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/mapper/xml/DjInspectImproveMapper.xml @@ -1,6 +1,6 @@ - + update dj_inspect_improve set has_child = #{status} where id = #{id} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/service/IDjInspectImproveService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/service/IDjInspectImproveService.java similarity index 92% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/service/IDjInspectImproveService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/service/IDjInspectImproveService.java index 8d0825b..7efbd09 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/service/IDjInspectImproveService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/service/IDjInspectImproveService.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.dj.inspectimprove.service; +package org.jeecg.modules.supervision.inspectimprove.service; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.dj.inspectimprove.entity.DjInspectImprove; +import org.jeecg.modules.supervision.inspectimprove.entity.DjInspectImprove; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.exception.JeecgBootException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/service/impl/DjInspectImproveServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/service/impl/DjInspectImproveServiceImpl.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/service/impl/DjInspectImproveServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/service/impl/DjInspectImproveServiceImpl.java index 726820a..bf16181 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/dj/inspectimprove/service/impl/DjInspectImproveServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/service/impl/DjInspectImproveServiceImpl.java @@ -1,12 +1,12 @@ -package org.jeecg.modules.dj.inspectimprove.service.impl; +package org.jeecg.modules.supervision.inspectimprove.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.dj.inspectimprove.entity.DjInspectImprove; -import org.jeecg.modules.dj.inspectimprove.mapper.DjInspectImproveMapper; -import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService; +import org.jeecg.modules.supervision.inspectimprove.entity.DjInspectImprove; +import org.jeecg.modules.supervision.inspectimprove.mapper.DjInspectImproveMapper; +import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/controller/DjOfficialdocDistributeController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/controller/DjOfficialdocDistributeController.java similarity index 92% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/controller/DjOfficialdocDistributeController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/controller/DjOfficialdocDistributeController.java index 0e42f19..06f2ea3 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/controller/DjOfficialdocDistributeController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/controller/DjOfficialdocDistributeController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.officialdocDistribute.controller; +package org.jeecg.modules.supervision.officialdoc.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -6,8 +6,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.util.JwtUtil; -import org.jeecg.modules.officialdocDistribute.entity.DjOfficialdocDistribute; -import org.jeecg.modules.officialdocDistribute.service.IDjOfficialdocDistributeService; +import org.jeecg.modules.supervision.officialdoc.entity.DjOfficialdocDistribute; +import org.jeecg.modules.supervision.officialdoc.service.IDjOfficialdocDistributeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/entity/DjOfficialdocDistribute.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/entity/DjOfficialdocDistribute.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/entity/DjOfficialdocDistribute.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/entity/DjOfficialdocDistribute.java index 97e6009..738f50c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/entity/DjOfficialdocDistribute.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/entity/DjOfficialdocDistribute.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.officialdocDistribute.entity; +package org.jeecg.modules.supervision.officialdoc.entity; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/mapper/DjOfficialdocDistributeMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/mapper/DjOfficialdocDistributeMapper.java similarity index 70% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/mapper/DjOfficialdocDistributeMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/mapper/DjOfficialdocDistributeMapper.java index c66787a..e5340ec 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/mapper/DjOfficialdocDistributeMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/mapper/DjOfficialdocDistributeMapper.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.officialdocDistribute.mapper; +package org.jeecg.modules.supervision.officialdoc.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.officialdocDistribute.entity.DjOfficialdocDistribute; +import org.jeecg.modules.supervision.officialdoc.entity.DjOfficialdocDistribute; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/mapper/xml/DjOfficialdocDistributeMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/mapper/xml/DjOfficialdocDistributeMapper.xml similarity index 61% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/mapper/xml/DjOfficialdocDistributeMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/mapper/xml/DjOfficialdocDistributeMapper.xml index 69d16c0..1b9baf5 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/mapper/xml/DjOfficialdocDistributeMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/mapper/xml/DjOfficialdocDistributeMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/service/IDjOfficialdocDistributeService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/service/IDjOfficialdocDistributeService.java similarity index 66% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/service/IDjOfficialdocDistributeService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/service/IDjOfficialdocDistributeService.java index d838fb9..c8d30e3 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/service/IDjOfficialdocDistributeService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/service/IDjOfficialdocDistributeService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.officialdocDistribute.service; +package org.jeecg.modules.supervision.officialdoc.service; -import org.jeecg.modules.officialdocDistribute.entity.DjOfficialdocDistribute; +import org.jeecg.modules.supervision.officialdoc.entity.DjOfficialdocDistribute; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/service/impl/DjOfficialdocDistributeServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/service/impl/DjOfficialdocDistributeServiceImpl.java similarity index 56% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/service/impl/DjOfficialdocDistributeServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/service/impl/DjOfficialdocDistributeServiceImpl.java index ca53244..28ca3b0 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/officialdocDistribute/service/impl/DjOfficialdocDistributeServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/officialdoc/service/impl/DjOfficialdocDistributeServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.officialdocDistribute.service.impl; +package org.jeecg.modules.supervision.officialdoc.service.impl; -import org.jeecg.modules.officialdocDistribute.entity.DjOfficialdocDistribute; -import org.jeecg.modules.officialdocDistribute.mapper.DjOfficialdocDistributeMapper; -import org.jeecg.modules.officialdocDistribute.service.IDjOfficialdocDistributeService; +import org.jeecg.modules.supervision.officialdoc.entity.DjOfficialdocDistribute; +import org.jeecg.modules.supervision.officialdoc.mapper.DjOfficialdocDistributeMapper; +import org.jeecg.modules.supervision.officialdoc.service.IDjOfficialdocDistributeService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/controller/TaskListController.java similarity index 95% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/controller/TaskListController.java index 913dce3..0672d06 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/controller/TaskListController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.controller; +package org.jeecg.modules.supervision.tasklist.controller; import java.io.UnsupportedEncodingException; import java.io.IOException; @@ -24,20 +24,20 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.demo.tasklist.entity.TaskListDetial; -import org.jeecg.modules.demo.tasklist.entity.TaskListPermission; -import org.jeecg.modules.demo.tasklist.entity.TaskListFavorite; -import org.jeecg.modules.demo.tasklist.entity.TaskList; -import org.jeecg.modules.demo.tasklist.vo.TaskListPage; -import org.jeecg.modules.demo.tasklist.vo.CreateTaskListReq; -import org.jeecg.modules.demo.tasklist.vo.CreateTaskListGroupReq; -import org.jeecg.modules.demo.tasklist.vo.MoveTaskListReq; -import org.jeecg.modules.demo.tasklist.vo.AddCollaboratorReq; -import org.jeecg.modules.demo.tasklist.vo.CollaboratorVO; -import org.jeecg.modules.demo.tasklist.service.ITaskListService; -import org.jeecg.modules.demo.tasklist.service.ITaskListDetialService; -import org.jeecg.modules.demo.tasklist.service.ITaskListPermissionService; -import org.jeecg.modules.demo.tasklist.service.ITaskListFavoriteService; +import org.jeecg.modules.supervision.tasklist.entity.TaskListDetial; +import org.jeecg.modules.supervision.tasklist.entity.TaskListPermission; +import org.jeecg.modules.supervision.tasklist.entity.TaskListFavorite; +import org.jeecg.modules.supervision.tasklist.entity.TaskList; +import org.jeecg.modules.supervision.tasklist.vo.TaskListPage; +import org.jeecg.modules.supervision.tasklist.vo.CreateTaskListReq; +import org.jeecg.modules.supervision.tasklist.vo.CreateTaskListGroupReq; +import org.jeecg.modules.supervision.tasklist.vo.MoveTaskListReq; +import org.jeecg.modules.supervision.tasklist.vo.AddCollaboratorReq; +import org.jeecg.modules.supervision.tasklist.vo.CollaboratorVO; +import org.jeecg.modules.supervision.tasklist.service.ITaskListService; +import org.jeecg.modules.supervision.tasklist.service.ITaskListDetialService; +import org.jeecg.modules.supervision.tasklist.service.ITaskListPermissionService; +import org.jeecg.modules.supervision.tasklist.service.ITaskListFavoriteService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListDetialController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/controller/TaskListDetialController.java similarity index 94% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListDetialController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/controller/TaskListDetialController.java index 136cf4a..6bef3e8 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/controller/TaskListDetialController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/controller/TaskListDetialController.java @@ -1,12 +1,12 @@ -package org.jeecg.modules.demo.tasklist.controller; +package org.jeecg.modules.supervision.tasklist.controller; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.constant.CommonConstant; -import org.jeecg.modules.demo.tasklist.entity.TaskListDetial; -import org.jeecg.modules.demo.tasklist.service.ITaskListDetialService; -import org.jeecg.modules.demo.tasklist.vo.CreateTaskReq; -import org.jeecg.modules.demo.tasklist.vo.MoveTaskReq; +import org.jeecg.modules.supervision.tasklist.entity.TaskListDetial; +import org.jeecg.modules.supervision.tasklist.service.ITaskListDetialService; +import org.jeecg.modules.supervision.tasklist.vo.CreateTaskReq; +import org.jeecg.modules.supervision.tasklist.vo.MoveTaskReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import lombok.extern.slf4j.Slf4j; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskList.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskList.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskList.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskList.java index 767014f..ad4c86f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskList.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskList.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.entity; +package org.jeecg.modules.supervision.tasklist.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskListDetial.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskListDetial.java similarity index 99% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskListDetial.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskListDetial.java index 22c0933..1bcf87d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskListDetial.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskListDetial.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.entity; +package org.jeecg.modules.supervision.tasklist.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskListFavorite.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskListFavorite.java similarity index 98% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskListFavorite.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskListFavorite.java index 6ecd951..b70a76f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskListFavorite.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskListFavorite.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.entity; +package org.jeecg.modules.supervision.tasklist.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskListPermission.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskListPermission.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskListPermission.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskListPermission.java index 5a0959d..3b761ed 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskListPermission.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/entity/TaskListPermission.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.entity; +package org.jeecg.modules.supervision.tasklist.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListDetialMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListDetialMapper.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListDetialMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListDetialMapper.java index 703a07c..debb87d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListDetialMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListDetialMapper.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.tasklist.mapper; +package org.jeecg.modules.supervision.tasklist.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.tasklist.entity.TaskListDetial; +import org.jeecg.modules.supervision.tasklist.entity.TaskListDetial; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface TaskListDetialMapper extends BaseMapper { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListFavoriteMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListFavoriteMapper.java similarity index 93% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListFavoriteMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListFavoriteMapper.java index c305012..bbea2ce 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListFavoriteMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListFavoriteMapper.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.demo.tasklist.mapper; +package org.jeecg.modules.supervision.tasklist.mapper; import java.util.List; -import org.jeecg.modules.demo.tasklist.entity.TaskListFavorite; +import org.jeecg.modules.supervision.tasklist.entity.TaskListFavorite; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListMapper.java similarity index 91% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListMapper.java index 80e7619..bc7eeed 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListMapper.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.demo.tasklist.mapper; +package org.jeecg.modules.supervision.tasklist.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.tasklist.entity.TaskList; +import org.jeecg.modules.supervision.tasklist.entity.TaskList; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListPermissionMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListPermissionMapper.java similarity index 84% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListPermissionMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListPermissionMapper.java index 65a6d86..ecaced2 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/TaskListPermissionMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/TaskListPermissionMapper.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.demo.tasklist.mapper; +package org.jeecg.modules.supervision.tasklist.mapper; import java.util.List; -import org.jeecg.modules.demo.tasklist.entity.TaskListPermission; +import org.jeecg.modules.supervision.tasklist.entity.TaskListPermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListDetialMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListDetialMapper.xml similarity index 93% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListDetialMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListDetialMapper.xml index 6566b9b..0411605 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListDetialMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListDetialMapper.xml @@ -1,12 +1,12 @@ - + DELETE FROM task_list_detial WHERE main_id = #{mainId} - SELECT * FROM task_list_detial WHERE main_id = #{mainId} @@ -56,13 +56,13 @@ WHERE id = #{taskId} AND del_flag = '0' - SELECT * FROM task_list_detial WHERE main_id = #{mainId} AND del_flag = '0' ORDER BY sort_order ASC - SELECT * FROM task_list_detial WHERE main_id = #{mainId} AND del_flag = '0' AND ( @@ -74,7 +74,7 @@ ORDER BY sort_order ASC - SELECT * FROM task_list_detial WHERE pid = #{parentId} AND type = '1' AND del_flag = '0' ORDER BY sort_order ASC @@ -87,7 +87,7 @@ WHERE id = #{id} - SELECT * FROM task_list_detial WHERE pid = #{pid} AND del_flag = '0' @@ -157,7 +157,7 @@ WHERE pid = #{pid} AND del_flag = '0' - SELECT d.*, t.tasklist_name AS listName, p.permission AS myPermission @@ -169,7 +169,7 @@ AND d.assignee_id LIKE CONCAT('%', #{assigneeId}, '%') - SELECT d.*, t.tasklist_name AS listName, p.permission AS myPermission @@ -189,7 +189,7 @@ AND (assign_id IS NULL OR assign_id NOT LIKE CONCAT('%', #{userId}, '%')) - SELECT * FROM task_list_detial WHERE main_id = #{mainId} AND del_flag = '0' ORDER BY sort_order ASC @@ -201,7 +201,7 @@ WHERE main_id = #{mainId} AND type = '1' AND del_flag = '0' - SELECT d.*, t.tasklist_name AS listName, p.permission AS myPermission FROM task_list_detial d LEFT JOIN task_list t ON d.main_id = t.id AND t.del_flag = '0' @@ -219,7 +219,7 @@ AND d.assignee_id LIKE CONCAT('%', #{assigneeId}, '%') - SELECT d.*, t.tasklist_name AS listName, p.permission AS myPermission FROM task_list_detial d LEFT JOIN task_list t ON d.main_id = t.id AND t.del_flag = '0' diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListFavoriteMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListFavoriteMapper.xml similarity index 93% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListFavoriteMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListFavoriteMapper.xml index 3cdcd29..b5b8710 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListFavoriteMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListFavoriteMapper.xml @@ -1,6 +1,6 @@ - + DELETE @@ -8,7 +8,7 @@ WHERE main_id = #{mainId} - SELECT * FROM task_list_favorite WHERE diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListMapper.xml similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListMapper.xml index bddc655..2f84226 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListMapper.xml @@ -1,8 +1,8 @@ - + - SELECT DISTINCT t.* FROM task_list t WHERE t.del_flag = '0' @@ -42,7 +42,7 @@ ORDER BY t.create_time ASC - SELECT DISTINCT t.* FROM task_list t WHERE t.del_flag = '0' diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListPermissionMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListPermissionMapper.xml similarity index 72% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListPermissionMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListPermissionMapper.xml index e620060..3e84bdb 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListPermissionMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/mapper/xml/TaskListPermissionMapper.xml @@ -1,6 +1,6 @@ - + DELETE @@ -8,7 +8,7 @@ WHERE main_id = #{mainId} - SELECT * FROM task_list_permission WHERE diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListDetialService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListDetialService.java similarity index 83% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListDetialService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListDetialService.java index b355492..3a22285 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListDetialService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListDetialService.java @@ -1,10 +1,10 @@ -package org.jeecg.modules.demo.tasklist.service; +package org.jeecg.modules.supervision.tasklist.service; -import org.jeecg.modules.demo.tasklist.entity.TaskListDetial; +import org.jeecg.modules.supervision.tasklist.entity.TaskListDetial; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; -import org.jeecg.modules.demo.tasklist.vo.CreateTaskReq; -import org.jeecg.modules.demo.tasklist.vo.MoveTaskReq; +import org.jeecg.modules.supervision.tasklist.vo.CreateTaskReq; +import org.jeecg.modules.supervision.tasklist.vo.MoveTaskReq; public interface ITaskListDetialService extends IService { diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListFavoriteService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListFavoriteService.java similarity index 91% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListFavoriteService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListFavoriteService.java index 154c7e6..884020d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListFavoriteService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListFavoriteService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.demo.tasklist.service; +package org.jeecg.modules.supervision.tasklist.service; -import org.jeecg.modules.demo.tasklist.entity.TaskListFavorite; +import org.jeecg.modules.supervision.tasklist.entity.TaskListFavorite; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListPermissionService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListPermissionService.java similarity index 78% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListPermissionService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListPermissionService.java index 35895f0..5fc451c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListPermissionService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListPermissionService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.demo.tasklist.service; +package org.jeecg.modules.supervision.tasklist.service; -import org.jeecg.modules.demo.tasklist.entity.TaskListPermission; +import org.jeecg.modules.supervision.tasklist.entity.TaskListPermission; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListService.java similarity index 80% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListService.java index 61aa8ae..c209c98 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/ITaskListService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/ITaskListService.java @@ -1,14 +1,14 @@ -package org.jeecg.modules.demo.tasklist.service; +package org.jeecg.modules.supervision.tasklist.service; -import org.jeecg.modules.demo.tasklist.entity.TaskListDetial; -import org.jeecg.modules.demo.tasklist.entity.TaskListPermission; -import org.jeecg.modules.demo.tasklist.entity.TaskListFavorite; -import org.jeecg.modules.demo.tasklist.entity.TaskList; -import org.jeecg.modules.demo.tasklist.vo.CreateTaskListReq; -import org.jeecg.modules.demo.tasklist.vo.CreateTaskListGroupReq; -import org.jeecg.modules.demo.tasklist.vo.MoveTaskListReq; -import org.jeecg.modules.demo.tasklist.vo.AddCollaboratorReq; -import org.jeecg.modules.demo.tasklist.vo.CollaboratorVO; +import org.jeecg.modules.supervision.tasklist.entity.TaskListDetial; +import org.jeecg.modules.supervision.tasklist.entity.TaskListPermission; +import org.jeecg.modules.supervision.tasklist.entity.TaskListFavorite; +import org.jeecg.modules.supervision.tasklist.entity.TaskList; +import org.jeecg.modules.supervision.tasklist.vo.CreateTaskListReq; +import org.jeecg.modules.supervision.tasklist.vo.CreateTaskListGroupReq; +import org.jeecg.modules.supervision.tasklist.vo.MoveTaskListReq; +import org.jeecg.modules.supervision.tasklist.vo.AddCollaboratorReq; +import org.jeecg.modules.supervision.tasklist.vo.CollaboratorVO; import com.baomidou.mybatisplus.extension.service.IService; import java.io.Serializable; import java.util.Collection; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListDetialServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListDetialServiceImpl.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListDetialServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListDetialServiceImpl.java index f3d63db..52f1b44 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListDetialServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListDetialServiceImpl.java @@ -1,14 +1,14 @@ -package org.jeecg.modules.demo.tasklist.service.impl; +package org.jeecg.modules.supervision.tasklist.service.impl; -import org.jeecg.modules.demo.tasklist.entity.TaskList; -import org.jeecg.modules.demo.tasklist.entity.TaskListDetial; -import org.jeecg.modules.demo.tasklist.entity.TaskListPermission; -import org.jeecg.modules.demo.tasklist.mapper.TaskListDetialMapper; -import org.jeecg.modules.demo.tasklist.mapper.TaskListMapper; -import org.jeecg.modules.demo.tasklist.mapper.TaskListPermissionMapper; -import org.jeecg.modules.demo.tasklist.service.ITaskListDetialService; -import org.jeecg.modules.demo.tasklist.vo.CreateTaskReq; -import org.jeecg.modules.demo.tasklist.vo.MoveTaskReq; +import org.jeecg.modules.supervision.tasklist.entity.TaskList; +import org.jeecg.modules.supervision.tasklist.entity.TaskListDetial; +import org.jeecg.modules.supervision.tasklist.entity.TaskListPermission; +import org.jeecg.modules.supervision.tasklist.mapper.TaskListDetialMapper; +import org.jeecg.modules.supervision.tasklist.mapper.TaskListMapper; +import org.jeecg.modules.supervision.tasklist.mapper.TaskListPermissionMapper; +import org.jeecg.modules.supervision.tasklist.service.ITaskListDetialService; +import org.jeecg.modules.supervision.tasklist.vo.CreateTaskReq; +import org.jeecg.modules.supervision.tasklist.vo.MoveTaskReq; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListFavoriteServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListFavoriteServiceImpl.java similarity index 93% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListFavoriteServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListFavoriteServiceImpl.java index c758fbd..4266f40 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListFavoriteServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListFavoriteServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.tasklist.service.impl; +package org.jeecg.modules.supervision.tasklist.service.impl; -import org.jeecg.modules.demo.tasklist.entity.TaskListFavorite; -import org.jeecg.modules.demo.tasklist.mapper.TaskListFavoriteMapper; -import org.jeecg.modules.demo.tasklist.service.ITaskListFavoriteService; +import org.jeecg.modules.supervision.tasklist.entity.TaskListFavorite; +import org.jeecg.modules.supervision.tasklist.mapper.TaskListFavoriteMapper; +import org.jeecg.modules.supervision.tasklist.service.ITaskListFavoriteService; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListPermissionServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListPermissionServiceImpl.java similarity index 69% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListPermissionServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListPermissionServiceImpl.java index fc6a148..cc0608c 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListPermissionServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListPermissionServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.tasklist.service.impl; +package org.jeecg.modules.supervision.tasklist.service.impl; -import org.jeecg.modules.demo.tasklist.entity.TaskListPermission; -import org.jeecg.modules.demo.tasklist.mapper.TaskListPermissionMapper; -import org.jeecg.modules.demo.tasklist.service.ITaskListPermissionService; +import org.jeecg.modules.supervision.tasklist.entity.TaskListPermission; +import org.jeecg.modules.supervision.tasklist.mapper.TaskListPermissionMapper; +import org.jeecg.modules.supervision.tasklist.service.ITaskListPermissionService; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListServiceImpl.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListServiceImpl.java index bebe8d7..ea43daf 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/service/impl/TaskListServiceImpl.java @@ -1,20 +1,20 @@ -package org.jeecg.modules.demo.tasklist.service.impl; +package org.jeecg.modules.supervision.tasklist.service.impl; -import org.jeecg.modules.demo.tasklist.entity.TaskList; -import org.jeecg.modules.demo.tasklist.entity.TaskListDetial; -import org.jeecg.modules.demo.tasklist.entity.TaskListPermission; -import org.jeecg.modules.demo.tasklist.entity.TaskListFavorite; -import org.jeecg.modules.demo.tasklist.mapper.TaskListDetialMapper; -import org.jeecg.modules.demo.tasklist.mapper.TaskListPermissionMapper; -import org.jeecg.modules.demo.tasklist.mapper.TaskListFavoriteMapper; -import org.jeecg.modules.demo.tasklist.mapper.TaskListMapper; -import org.jeecg.modules.demo.tasklist.service.ITaskListService; -import org.jeecg.modules.demo.tasklist.service.ITaskListFavoriteService; -import org.jeecg.modules.demo.tasklist.vo.CreateTaskListReq; -import org.jeecg.modules.demo.tasklist.vo.CreateTaskListGroupReq; -import org.jeecg.modules.demo.tasklist.vo.MoveTaskListReq; -import org.jeecg.modules.demo.tasklist.vo.AddCollaboratorReq; -import org.jeecg.modules.demo.tasklist.vo.CollaboratorVO; +import org.jeecg.modules.supervision.tasklist.entity.TaskList; +import org.jeecg.modules.supervision.tasklist.entity.TaskListDetial; +import org.jeecg.modules.supervision.tasklist.entity.TaskListPermission; +import org.jeecg.modules.supervision.tasklist.entity.TaskListFavorite; +import org.jeecg.modules.supervision.tasklist.mapper.TaskListDetialMapper; +import org.jeecg.modules.supervision.tasklist.mapper.TaskListPermissionMapper; +import org.jeecg.modules.supervision.tasklist.mapper.TaskListFavoriteMapper; +import org.jeecg.modules.supervision.tasklist.mapper.TaskListMapper; +import org.jeecg.modules.supervision.tasklist.service.ITaskListService; +import org.jeecg.modules.supervision.tasklist.service.ITaskListFavoriteService; +import org.jeecg.modules.supervision.tasklist.vo.CreateTaskListReq; +import org.jeecg.modules.supervision.tasklist.vo.CreateTaskListGroupReq; +import org.jeecg.modules.supervision.tasklist.vo.MoveTaskListReq; +import org.jeecg.modules.supervision.tasklist.vo.AddCollaboratorReq; +import org.jeecg.modules.supervision.tasklist.vo.CollaboratorVO; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.vo.LoginUser; import org.apache.shiro.SecurityUtils; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/AddCollaboratorReq.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/AddCollaboratorReq.java similarity index 88% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/AddCollaboratorReq.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/AddCollaboratorReq.java index abf7262..b722dbe 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/AddCollaboratorReq.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/AddCollaboratorReq.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.vo; +package org.jeecg.modules.supervision.tasklist.vo; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CollaboratorVO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CollaboratorVO.java similarity index 90% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CollaboratorVO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CollaboratorVO.java index 58f5d83..9937e6d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CollaboratorVO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CollaboratorVO.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.vo; +package org.jeecg.modules.supervision.tasklist.vo; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CreateTaskListGroupReq.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CreateTaskListGroupReq.java similarity index 83% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CreateTaskListGroupReq.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CreateTaskListGroupReq.java index cd0f242..4417105 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CreateTaskListGroupReq.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CreateTaskListGroupReq.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.vo; +package org.jeecg.modules.supervision.tasklist.vo; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CreateTaskListReq.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CreateTaskListReq.java similarity index 91% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CreateTaskListReq.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CreateTaskListReq.java index d59e601..23f8a18 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CreateTaskListReq.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CreateTaskListReq.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.vo; +package org.jeecg.modules.supervision.tasklist.vo; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CreateTaskReq.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CreateTaskReq.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CreateTaskReq.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CreateTaskReq.java index c735048..c59496f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/CreateTaskReq.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/CreateTaskReq.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.vo; +package org.jeecg.modules.supervision.tasklist.vo; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/MoveTaskListReq.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/MoveTaskListReq.java similarity index 91% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/MoveTaskListReq.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/MoveTaskListReq.java index 2316e76..b2a83ee 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/MoveTaskListReq.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/MoveTaskListReq.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.vo; +package org.jeecg.modules.supervision.tasklist.vo; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/MoveTaskReq.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/MoveTaskReq.java similarity index 90% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/MoveTaskReq.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/MoveTaskReq.java index a842689..267495b 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/MoveTaskReq.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/MoveTaskReq.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.tasklist.vo; +package org.jeecg.modules.supervision.tasklist.vo; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/TaskListPage.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/TaskListPage.java similarity index 88% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/TaskListPage.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/TaskListPage.java index 16f911a..432481f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/TaskListPage.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/tasklist/vo/TaskListPage.java @@ -1,10 +1,10 @@ -package org.jeecg.modules.demo.tasklist.vo; +package org.jeecg.modules.supervision.tasklist.vo; import java.util.List; -import org.jeecg.modules.demo.tasklist.entity.TaskList; -import org.jeecg.modules.demo.tasklist.entity.TaskListDetial; -import org.jeecg.modules.demo.tasklist.entity.TaskListPermission; -import org.jeecg.modules.demo.tasklist.entity.TaskListFavorite; +import org.jeecg.modules.supervision.tasklist.entity.TaskList; +import org.jeecg.modules.supervision.tasklist.entity.TaskListDetial; +import org.jeecg.modules.supervision.tasklist.entity.TaskListPermission; +import org.jeecg.modules.supervision.tasklist.entity.TaskListFavorite; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.ExcelEntity; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/constant/XiSpeakConstant.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/constant/XiSpeakConstant.java similarity index 90% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/constant/XiSpeakConstant.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/constant/XiSpeakConstant.java index 9d4d5ee..78a9017 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/constant/XiSpeakConstant.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/constant/XiSpeakConstant.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.xispeak.constant; +package org.jeecg.modules.supervision.xispeak.constant; /** * 语音/演讲模块常量类 diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/controller/BgXiSpeakController.java similarity index 96% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/controller/BgXiSpeakController.java index ed084c8..59d93d2 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/controller/BgXiSpeakController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.xispeak.controller; +package org.jeecg.modules.supervision.xispeak.controller; import java.util.*; import java.util.stream.Collectors; @@ -21,19 +21,19 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.excel.ExcelAnnotationUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.bg.constant.BpmStatus; -import org.jeecg.modules.bg.constant.SupervisionConstant; +import org.jeecg.modules.supervision.common.BpmStatus; +import org.jeecg.modules.supervision.common.SupervisionConstant; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeakFeedback; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakFeedbackService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeakFeedback; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakFeedbackService; -import org.jeecg.modules.bg.xispeak.dto.BgXiSpeakBpmSaveDTO; +import org.jeecg.modules.supervision.xispeak.dto.BgXiSpeakBpmSaveDTO; import org.flowable.engine.RuntimeService; import com.alibaba.fastjson.JSONObject; -import org.jeecg.modules.demo.bgpartymatter.constant.BgPartymatterConstant; -import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter; +import org.jeecg.modules.supervision.bgpartymatter.constant.BgPartymatterConstant; +import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatter; import org.jeecg.modules.tasktask.entity.TaskTask; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/feedback/BgXiSpeakFeedbackController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/controller/BgXiSpeakFeedbackController.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/feedback/BgXiSpeakFeedbackController.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/controller/BgXiSpeakFeedbackController.java index de56c41..afc9f60 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/feedback/BgXiSpeakFeedbackController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/controller/BgXiSpeakFeedbackController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.xispeak.controller.feedback; +package org.jeecg.modules.supervision.xispeak.controller; import java.util.Arrays; import java.util.List; @@ -13,8 +13,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeakFeedback; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakFeedbackService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeakFeedback; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakFeedbackService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/dto/BgXiSpeakBpmSaveDTO.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/dto/BgXiSpeakBpmSaveDTO.java similarity index 82% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/dto/BgXiSpeakBpmSaveDTO.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/dto/BgXiSpeakBpmSaveDTO.java index 2ed5d85..fe164d9 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/dto/BgXiSpeakBpmSaveDTO.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/dto/BgXiSpeakBpmSaveDTO.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.bg.xispeak.dto; +package org.jeecg.modules.supervision.xispeak.dto; import java.io.Serializable; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeak.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/BgXiSpeak.java similarity index 99% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeak.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/BgXiSpeak.java index acc8a50..8e01b5f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeak.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/BgXiSpeak.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.xispeak.entity; +package org.jeecg.modules.supervision.xispeak.entity; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeakFeedback.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/BgXiSpeakFeedback.java similarity index 99% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeakFeedback.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/BgXiSpeakFeedback.java index 74bfffe..036d8c5 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeakFeedback.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/BgXiSpeakFeedback.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.xispeak.entity; +package org.jeecg.modules.supervision.xispeak.entity; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetail.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/DeptApproveDetail.java similarity index 93% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetail.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/DeptApproveDetail.java index e067a2a..7fbe70f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetail.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/DeptApproveDetail.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.xispeak.entity; +package org.jeecg.modules.supervision.xispeak.entity; import com.fasterxml.jackson.annotation.JsonAlias; import lombok.AllArgsConstructor; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetailMap.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/DeptApproveDetailMap.java similarity index 69% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetailMap.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/DeptApproveDetailMap.java index 8448794..72b512e 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetailMap.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/entity/DeptApproveDetailMap.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.xispeak.entity; +package org.jeecg.modules.supervision.xispeak.entity; import java.util.LinkedHashMap; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/mapper/BgXiSpeakFeedbackMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/mapper/BgXiSpeakFeedbackMapper.java similarity index 71% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/mapper/BgXiSpeakFeedbackMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/mapper/BgXiSpeakFeedbackMapper.java index 93d2b74..f45dc3d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/mapper/BgXiSpeakFeedbackMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/mapper/BgXiSpeakFeedbackMapper.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.bg.xispeak.mapper; +package org.jeecg.modules.supervision.xispeak.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeakFeedback; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeakFeedback; /** * @Description: 习总书记重要讲话反馈表 diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/mapper/BgXiSpeakMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/mapper/BgXiSpeakMapper.java similarity index 86% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/mapper/BgXiSpeakMapper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/mapper/BgXiSpeakMapper.java index e7c2c3c..975722d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/mapper/BgXiSpeakMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/mapper/BgXiSpeakMapper.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.bg.xispeak.mapper; +package org.jeecg.modules.supervision.xispeak.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; import java.util.List; import java.util.Map; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/mapper/xml/BgXiSpeakMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/mapper/xml/BgXiSpeakMapper.xml similarity index 90% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/mapper/xml/BgXiSpeakMapper.xml rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/mapper/xml/BgXiSpeakMapper.xml index a0d44f1..78cccc0 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/mapper/xml/BgXiSpeakMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/mapper/xml/BgXiSpeakMapper.xml @@ -1,6 +1,6 @@ - + update bg_xi_speak set has_child = #{status} where id = #{id} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/IBgXiSpeakFeedbackService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/IBgXiSpeakFeedbackService.java similarity index 77% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/IBgXiSpeakFeedbackService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/IBgXiSpeakFeedbackService.java index 2d04b0f..c4685d0 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/IBgXiSpeakFeedbackService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/IBgXiSpeakFeedbackService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.bg.xispeak.service; +package org.jeecg.modules.supervision.xispeak.service; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeakFeedback; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeakFeedback; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/IBgXiSpeakService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/IBgXiSpeakService.java similarity index 95% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/IBgXiSpeakService.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/IBgXiSpeakService.java index ffb6894..2a39d8d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/IBgXiSpeakService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/IBgXiSpeakService.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.bg.xispeak.service; +package org.jeecg.modules.supervision.xispeak.service; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.exception.JeecgBootException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakFeedbackServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/impl/BgXiSpeakFeedbackServiceImpl.java similarity index 71% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakFeedbackServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/impl/BgXiSpeakFeedbackServiceImpl.java index 4531f2d..c3178ab 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakFeedbackServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/impl/BgXiSpeakFeedbackServiceImpl.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.bg.xispeak.service.impl; +package org.jeecg.modules.supervision.xispeak.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeakFeedback; -import org.jeecg.modules.bg.xispeak.mapper.BgXiSpeakFeedbackMapper; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakFeedbackService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeakFeedback; +import org.jeecg.modules.supervision.xispeak.mapper.BgXiSpeakFeedbackMapper; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakFeedbackService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/impl/BgXiSpeakServiceImpl.java similarity index 97% rename from jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakServiceImpl.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/impl/BgXiSpeakServiceImpl.java index b25ddf0..97ce878 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/service/impl/BgXiSpeakServiceImpl.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.bg.xispeak.service.impl; +package org.jeecg.modules.supervision.xispeak.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; @@ -9,14 +9,14 @@ import java.util.Objects; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.bg.constant.BpmStatus; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.supervision.common.BpmStatus; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap; import org.jeecg.modules.extbpm.process.entity.ExtActTaskCc; import org.jeecg.modules.extbpm.process.service.IExtActTaskCcService; -import org.jeecg.modules.bg.xispeak.mapper.BgXiSpeakMapper; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.mapper.BgXiSpeakMapper; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; import org.jeecg.modules.taskapprovalopinion.entity.TaskApprovalOpinion; import org.jeecg.modules.taskapprovalopinion.service.ITaskApprovalOpinionService; import org.jeecg.modules.tasktask.entity.TaskTask; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/SubTaskPageReq.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/SubTaskPageReq.java deleted file mode 100644 index 4a32552..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/vo/SubTaskPageReq.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.jeecg.modules.demo.tasklist.vo; - -import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; - -@Data -@Schema(description = "子任务分页请求") -public class SubTaskPageReq { - - @Schema(description = "父任务ID") - private String parentTaskId; - - @Schema(description = "页码，默认1") - private Integer pageNo = 1; - - @Schema(description = "每页条数，默认20") - private Integer pageSize = 20; -} From 6f7e4c8587a25e587d14efae0cdcbe7a1d01353f Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Thu, 6 Aug 2026 14:52:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor(supervision):=20=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=20jeecg-module-flow=20=E6=B5=81=E7=A8=8B=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=88=B0=20supervision=20=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/common}/OrgConfig.java | 2 +- .../config}/InspectCloseoutConfig.java | 2 +- .../config}/InspectImproveConfig.java | 2 +- .../constant}/InspectCloseoutConstant.java | 2 +- .../constant}/InspectConstant.java | 4 ++-- .../flow}/InspectCloseoutFlow.java | 6 ++++-- .../flow}/InspectImproveFlow.java | 14 +++++++------ .../AfterCloseoutApprovedListener.java | 4 ++-- .../AfterDqLeaderApproveListener.java | 8 ++++---- .../AfterImplDeptLeaderApproveListener.java | 8 ++++---- .../AfterInspectImproveCompleteListener.java | 8 ++++---- .../AfterMeasureResLeaderStoreListener.java | 8 ++++---- .../DqInspectTaskStageIncrementListener.java | 8 ++++---- .../listener/LeaderApproveHelper.java | 2 +- .../xispeak/config}/XiSpeakConfig.java | 2 +- .../config}/XiSpeakFeedbackConfig.java | 2 +- .../xispeak/flow}/XiSpeakFeedbackFlow.java | 13 ++++++------ .../xispeak/flow}/XiSpeakFlow.java | 11 +++++----- .../AfterBgLeaderApproveListener.java | 10 +++++----- .../AfterBgWorkerFinalApproveListener.java | 10 +++++----- ...ImplDeptLeaderApproveFeedbackListener.java | 20 +++++++++---------- .../AfterImplDeptLeaderApproveListener.java | 10 +++++----- .../AfterImplDeptLeaderStoreJsonListener.java | 12 +++++------ .../AfterImplWorkerApproveListener.java | 12 +++++------ .../AfterImplWorkerTemStoreListener.java | 10 +++++----- .../listener/AfterSDWApproveHqListener.java | 4 ++-- .../src/main/resources/application-flow.yml | 0 .../InspectCloseoutFlowTest.java | 8 +++++--- .../InspectImproveFlowTest.java | 13 +++++++----- .../AfterCloseoutApprovedListenerTest.java | 6 +++--- .../AfterDqLeaderApproveListenerTest.java | 4 ++-- ...fterImplDeptLeaderApproveListenerTest.java | 4 ++-- ...terInspectImproveCompleteListenerTest.java | 10 +++++----- ...fterMeasureResLeaderStoreListenerTest.java | 10 +++++----- .../listener/LeaderApproveHelperTest.java | 2 +- 35 files changed, 131 insertions(+), 120 deletions(-) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common}/OrgConfig.java (93%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config}/InspectCloseoutConfig.java (94%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config}/InspectImproveConfig.java (95%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant}/InspectCloseoutConstant.java (57%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant}/InspectConstant.java (82%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow}/InspectCloseoutFlow.java (97%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow}/InspectImproveFlow.java (96%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove}/listener/AfterCloseoutApprovedListener.java (90%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision}/inspectimprove/listener/AfterDqLeaderApproveListener.java (77%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision}/inspectimprove/listener/AfterImplDeptLeaderApproveListener.java (77%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision}/inspectimprove/listener/AfterInspectImproveCompleteListener.java (85%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision}/inspectimprove/listener/AfterMeasureResLeaderStoreListener.java (87%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision}/inspectimprove/listener/DqInspectTaskStageIncrementListener.java (87%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision}/inspectimprove/listener/LeaderApproveHelper.java (93%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/config}/XiSpeakConfig.java (96%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/config}/XiSpeakFeedbackConfig.java (90%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/flow}/XiSpeakFeedbackFlow.java (96%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/flow}/XiSpeakFlow.java (97%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision}/xispeak/listener/AfterBgLeaderApproveListener.java (91%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision}/xispeak/listener/AfterBgWorkerFinalApproveListener.java (88%) rename jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/listener/AfterImplDeptLeaderApproveListener.java => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderApproveFeedbackListener.java (87%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision}/xispeak/listener/AfterImplDeptLeaderApproveListener.java (91%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision}/xispeak/listener/AfterImplDeptLeaderStoreJsonListener.java (93%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision}/xispeak/listener/AfterImplWorkerApproveListener.java (91%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision}/xispeak/listener/AfterImplWorkerTemStoreListener.java (91%) rename {jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg => jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision}/xispeak/listener/AfterSDWApproveHqListener.java (97%) rename {jeecg-boot-module/jeecg-module-flow => jeecg-module-supervision}/src/main/resources/application-flow.yml (100%) rename {jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectcloseout => jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove}/InspectCloseoutFlowTest.java (96%) rename {jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg => jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision}/inspectimprove/InspectImproveFlowTest.java (95%) rename {jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectcloseout => jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove}/listener/AfterCloseoutApprovedListenerTest.java (88%) rename {jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg => jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision}/inspectimprove/listener/AfterDqLeaderApproveListenerTest.java (90%) rename {jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg => jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision}/inspectimprove/listener/AfterImplDeptLeaderApproveListenerTest.java (89%) rename {jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg => jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision}/inspectimprove/listener/AfterInspectImproveCompleteListenerTest.java (83%) rename {jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg => jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision}/inspectimprove/listener/AfterMeasureResLeaderStoreListenerTest.java (89%) rename {jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg => jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision}/inspectimprove/listener/LeaderApproveHelperTest.java (96%) diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/OrgConfig.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/OrgConfig.java similarity index 93% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/OrgConfig.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/OrgConfig.java index 79c290c..c6dad53 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/OrgConfig.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/OrgConfig.java @@ -1,4 +1,4 @@ -package org.jeecg; +package org.jeecg.modules.supervision.common; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutConfig.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectCloseoutConfig.java similarity index 94% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutConfig.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectCloseoutConfig.java index 99f51e8..f285ca1 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutConfig.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectCloseoutConfig.java @@ -1,4 +1,4 @@ -package org.jeecg.inspectcloseout; +package org.jeecg.modules.supervision.inspectimprove.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectImproveConfig.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectImproveConfig.java similarity index 95% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectImproveConfig.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectImproveConfig.java index da509b4..0652dd3 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectImproveConfig.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectImproveConfig.java @@ -1,4 +1,4 @@ -package org.jeecg.inspectimprove; +package org.jeecg.modules.supervision.inspectimprove.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutConstant.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectCloseoutConstant.java similarity index 57% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutConstant.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectCloseoutConstant.java index 95834a2..1fe0ac3 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutConstant.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectCloseoutConstant.java @@ -1,4 +1,4 @@ -package org.jeecg.inspectcloseout; +package org.jeecg.modules.supervision.inspectimprove.constant; public class InspectCloseoutConstant { public static final int ZERO_INDEX = 0; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectConstant.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectConstant.java similarity index 82% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectConstant.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectConstant.java index e003e37..17f41c3 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectConstant.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectConstant.java @@ -1,6 +1,6 @@ -package org.jeecg.inspectimprove; +package org.jeecg.modules.supervision.inspectimprove.constant; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; public class InspectConstant { public static final String NEED_APPROVE_STR = "1"; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutFlow.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectCloseoutFlow.java similarity index 97% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutFlow.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectCloseoutFlow.java index 4dfea11..078a4a9 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutFlow.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectCloseoutFlow.java @@ -1,11 +1,13 @@ -package org.jeecg.inspectcloseout; +package org.jeecg.modules.supervision.inspectimprove.flow; import com.alibaba.fastjson.JSONObject; import com.jeecg.weibo.exception.BusinessException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.jeecg.OrgConfig; +import org.jeecg.modules.supervision.common.OrgConfig; +import org.jeecg.modules.supervision.inspectimprove.constant.InspectCloseoutConstant; +import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectImproveFlow.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectImproveFlow.java similarity index 96% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectImproveFlow.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectImproveFlow.java index f831bb6..bbde1f6 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectImproveFlow.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectImproveFlow.java @@ -1,4 +1,4 @@ -package org.jeecg.inspectimprove; +package org.jeecg.modules.supervision.inspectimprove.flow; import com.alibaba.fastjson.JSONObject; import com.jeecg.weibo.exception.BusinessException; @@ -7,12 +7,14 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.DelegateExecution; -import org.jeecg.OrgConfig; +import org.jeecg.modules.supervision.common.OrgConfig; +import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; import org.jeecg.common.system.api.ISysBaseAPI; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService; -import org.jeecg.modules.dj.inspectimprove.entity.DjInspectImprove; -import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService; +import org.jeecg.modules.supervision.inspectimprove.entity.DjInspectImprove; +import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService; import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/listener/AfterCloseoutApprovedListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListener.java similarity index 90% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/listener/AfterCloseoutApprovedListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListener.java index bb0f00c..12573f7 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/listener/AfterCloseoutApprovedListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListener.java @@ -1,10 +1,10 @@ -package org.jeecg.inspectcloseout.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.inspectcloseout.InspectCloseoutConfig; +import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterDqLeaderApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListener.java similarity index 77% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterDqLeaderApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListener.java index 10b7909..275084f 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterDqLeaderApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListener.java @@ -1,12 +1,12 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import lombok.RequiredArgsConstructor; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.inspectimprove.InspectConstant; -import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService; -import org.jeecg.inspectimprove.InspectImproveConfig; +import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant; +import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterImplDeptLeaderApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListener.java similarity index 77% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterImplDeptLeaderApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListener.java index 4ad07a3..15a3b4b 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterImplDeptLeaderApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListener.java @@ -1,12 +1,12 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import lombok.RequiredArgsConstructor; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.inspectimprove.InspectConstant; -import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService; -import org.jeecg.inspectimprove.InspectImproveConfig; +import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant; +import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterInspectImproveCompleteListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterInspectImproveCompleteListener.java similarity index 85% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterInspectImproveCompleteListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterInspectImproveCompleteListener.java index bbb8b2f..6d4499a 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterInspectImproveCompleteListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterInspectImproveCompleteListener.java @@ -1,12 +1,12 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.modules.dj.inspectimprove.entity.DjInspectImprove; -import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService; -import org.jeecg.inspectimprove.InspectImproveConfig; +import org.jeecg.modules.supervision.inspectimprove.entity.DjInspectImprove; +import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterMeasureResLeaderStoreListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListener.java similarity index 87% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterMeasureResLeaderStoreListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListener.java index ad09dbf..bf67bf2 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterMeasureResLeaderStoreListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListener.java @@ -1,13 +1,13 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.inspectimprove.InspectImproveConfig; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/DqInspectTaskStageIncrementListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/DqInspectTaskStageIncrementListener.java similarity index 87% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/DqInspectTaskStageIncrementListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/DqInspectTaskStageIncrementListener.java index 59e60e7..eb36cc6 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/DqInspectTaskStageIncrementListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/DqInspectTaskStageIncrementListener.java @@ -1,13 +1,13 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.ExecutionListener; -import org.jeecg.inspectimprove.InspectImproveConfig; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/LeaderApproveHelper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelper.java similarity index 93% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/LeaderApproveHelper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelper.java index 9467875..0d79a77 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/LeaderApproveHelper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelper.java @@ -1,4 +1,4 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/XiSpeakConfig.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/config/XiSpeakConfig.java similarity index 96% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/XiSpeakConfig.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/config/XiSpeakConfig.java index 1906616..7f8b161 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/XiSpeakConfig.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/config/XiSpeakConfig.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeak; +package org.jeecg.modules.supervision.xispeak.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/XiSpeakFeedbackConfig.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/config/XiSpeakFeedbackConfig.java similarity index 90% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/XiSpeakFeedbackConfig.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/config/XiSpeakFeedbackConfig.java index ca6740e..a620fcc 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/XiSpeakFeedbackConfig.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/config/XiSpeakFeedbackConfig.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeakfb; +package org.jeecg.modules.supervision.xispeak.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/XiSpeakFeedbackFlow.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/flow/XiSpeakFeedbackFlow.java similarity index 96% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/XiSpeakFeedbackFlow.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/flow/XiSpeakFeedbackFlow.java index cb929e4..8232c38 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/XiSpeakFeedbackFlow.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/flow/XiSpeakFeedbackFlow.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeakfb; +package org.jeecg.modules.supervision.xispeak.flow; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -8,13 +8,14 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.DelegateExecution; -import org.jeecg.OrgConfig; +import org.jeecg.modules.supervision.common.OrgConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakFeedbackConfig; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.system.api.ISysBaseAPI; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; import org.jeecg.modules.tasktask.entity.TaskTask; import org.jeecg.modules.tasktask.service.ITaskTaskService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/XiSpeakFlow.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/flow/XiSpeakFlow.java similarity index 97% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/XiSpeakFlow.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/flow/XiSpeakFlow.java index 59bfcba..bd22001 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/XiSpeakFlow.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/flow/XiSpeakFlow.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeak; +package org.jeecg.modules.supervision.xispeak.flow; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -8,12 +8,13 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shiro.util.StringUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.DelegateExecution; -import org.jeecg.OrgConfig; +import org.jeecg.modules.supervision.common.OrgConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.system.api.ISysBaseAPI; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterBgLeaderApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterBgLeaderApproveListener.java similarity index 91% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterBgLeaderApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterBgLeaderApproveListener.java index 22d4804..0100266 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterBgLeaderApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterBgLeaderApproveListener.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeak.listener; +package org.jeecg.modules.supervision.xispeak.listener; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -6,9 +6,9 @@ import org.apache.commons.lang.StringUtils; import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.runtime.Execution; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression; import lombok.RequiredArgsConstructor; import org.flowable.engine.RuntimeService; @@ -18,7 +18,7 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.extbpm.process.common.WorkFlowGlobals; import org.jeecg.modules.tasktask.entity.TaskTask; import org.jeecg.modules.tasktask.service.ITaskTaskService; -import org.jeecg.xispeak.XiSpeakConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterBgWorkerFinalApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterBgWorkerFinalApproveListener.java similarity index 88% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterBgWorkerFinalApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterBgWorkerFinalApproveListener.java index ee8825c..bf0f96e 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterBgWorkerFinalApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterBgWorkerFinalApproveListener.java @@ -1,14 +1,14 @@ -package org.jeecg.xispeak.listener; +package org.jeecg.modules.supervision.xispeak.listener; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.modules.bg.xispeak.constant.XiSpeakConstant; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.constant.XiSpeakConstant; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; import lombok.RequiredArgsConstructor; -import org.jeecg.xispeak.XiSpeakConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/listener/AfterImplDeptLeaderApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderApproveFeedbackListener.java similarity index 87% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/listener/AfterImplDeptLeaderApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderApproveFeedbackListener.java index 62ac96e..759fa8e 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/listener/AfterImplDeptLeaderApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderApproveFeedbackListener.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeakfb.listener; +package org.jeecg.modules.supervision.xispeak.listener; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -6,17 +6,17 @@ import org.apache.commons.lang.StringUtils; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeakFeedback; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakFeedbackService; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeakFeedback; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakFeedbackService; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; import org.jeecg.modules.tasktask.constant.FlowConstants; import org.jeecg.modules.tasktask.entity.TaskTask; import org.jeecg.modules.tasktask.service.ITaskTaskService; -import org.jeecg.xispeak.XiSpeakConfig; -import org.jeecg.xispeakfb.XiSpeakFeedbackConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakFeedbackConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -26,7 +26,7 @@ import java.util.*; @Slf4j @Component("AfterImplDeptLeaderApproveFeedbackListener") @RequiredArgsConstructor(onConstructor_ = @Autowired) -public class AfterImplDeptLeaderApproveListener implements TaskListener { +public class AfterImplDeptLeaderApproveFeedbackListener implements TaskListener { private static final long serialVersionUID = 1L; private final XiSpeakFeedbackConfig xiSpeakFeedbackConfig; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplDeptLeaderApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderApproveListener.java similarity index 91% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplDeptLeaderApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderApproveListener.java index d9cef0c..614e972 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplDeptLeaderApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderApproveListener.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeak.listener; +package org.jeecg.modules.supervision.xispeak.listener; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -7,9 +7,9 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.runtime.Execution; import org.flowable.task.service.delegate.DelegateTask; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression; import lombok.RequiredArgsConstructor; import org.flowable.engine.RuntimeService; @@ -19,7 +19,7 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.extbpm.process.common.WorkFlowGlobals; import org.jeecg.modules.tasktask.entity.TaskTask; import org.jeecg.modules.tasktask.service.ITaskTaskService; -import org.jeecg.xispeak.XiSpeakConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplDeptLeaderStoreJsonListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderStoreJsonListener.java similarity index 93% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplDeptLeaderStoreJsonListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderStoreJsonListener.java index fa463f9..b7ba150 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplDeptLeaderStoreJsonListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderStoreJsonListener.java @@ -1,15 +1,15 @@ -package org.jeecg.xispeak.listener; +package org.jeecg.modules.supervision.xispeak.listener; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.flowable.task.service.delegate.DelegateTask; import org.flowable.engine.delegate.TaskListener; // 🎯 1. 必须引入标准接口 -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; -import org.jeecg.xispeak.XiSpeakConfig; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplWorkerApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplWorkerApproveListener.java similarity index 91% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplWorkerApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplWorkerApproveListener.java index 286d84b..07a6ee7 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplWorkerApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplWorkerApproveListener.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeak.listener; +package org.jeecg.modules.supervision.xispeak.listener; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -6,10 +6,10 @@ import org.apache.commons.lang.StringUtils; import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.runtime.Execution; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression; import lombok.RequiredArgsConstructor; import org.flowable.engine.RuntimeService; @@ -19,7 +19,7 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.extbpm.process.common.WorkFlowGlobals; import org.jeecg.modules.tasktask.entity.TaskTask; import org.jeecg.modules.tasktask.service.ITaskTaskService; -import org.jeecg.xispeak.XiSpeakConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplWorkerTemStoreListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplWorkerTemStoreListener.java similarity index 91% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplWorkerTemStoreListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplWorkerTemStoreListener.java index a01a4ef..67c4601 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplWorkerTemStoreListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplWorkerTemStoreListener.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeak.listener; +package org.jeecg.modules.supervision.xispeak.listener; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -7,9 +7,9 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.runtime.Execution; import org.flowable.task.service.delegate.DelegateTask; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression; import lombok.RequiredArgsConstructor; import org.flowable.engine.RuntimeService; @@ -19,7 +19,7 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.extbpm.process.common.WorkFlowGlobals; import org.jeecg.modules.tasktask.entity.TaskTask; import org.jeecg.modules.tasktask.service.ITaskTaskService; -import org.jeecg.xispeak.XiSpeakConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterSDWApproveHqListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterSDWApproveHqListener.java similarity index 97% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterSDWApproveHqListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterSDWApproveHqListener.java index 17557d5..4d9d0ca 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterSDWApproveHqListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterSDWApproveHqListener.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeak.listener; +package org.jeecg.modules.supervision.xispeak.listener; import lombok.extern.slf4j.Slf4j; import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression; @@ -8,7 +8,7 @@ import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.ExecutionListener; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.extbpm.process.common.WorkFlowGlobals; -import org.jeecg.xispeak.XiSpeakConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/resources/application-flow.yml b/jeecg-module-supervision/src/main/resources/application-flow.yml similarity index 100% rename from jeecg-boot-module/jeecg-module-flow/src/main/resources/application-flow.yml rename to jeecg-module-supervision/src/main/resources/application-flow.yml diff --git a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectcloseout/InspectCloseoutFlowTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectCloseoutFlowTest.java similarity index 96% rename from jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectcloseout/InspectCloseoutFlowTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectCloseoutFlowTest.java index f096372..1159eb4 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectcloseout/InspectCloseoutFlowTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectCloseoutFlowTest.java @@ -1,13 +1,15 @@ -package org.jeecg.inspectcloseout; +package org.jeecg.modules.supervision.inspectimprove; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import com.alibaba.fastjson.JSONObject; import com.jeecg.weibo.exception.BusinessException; -import org.jeecg.OrgConfig; +import org.jeecg.modules.supervision.common.OrgConfig; import org.jeecg.common.system.api.ISysBaseAPI; -import org.jeecg.inspectcloseout.InspectCloseoutConfig.InspectCloseoutProperties; +import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig; +import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig.InspectCloseoutProperties; +import org.jeecg.modules.supervision.inspectimprove.flow.InspectCloseoutFlow; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/InspectImproveFlowTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectImproveFlowTest.java similarity index 95% rename from jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/InspectImproveFlowTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectImproveFlowTest.java index f551f16..9c7c1be 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/InspectImproveFlowTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectImproveFlowTest.java @@ -1,4 +1,4 @@ -package org.jeecg.inspectimprove; +package org.jeecg.modules.supervision.inspectimprove; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; @@ -7,11 +7,14 @@ import com.alibaba.fastjson.JSONObject; import com.jeecg.weibo.exception.BusinessException; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.DelegateExecution; -import org.jeecg.OrgConfig; +import org.jeecg.modules.supervision.common.OrgConfig; import org.jeecg.common.system.api.ISysBaseAPI; -import org.jeecg.inspectimprove.InspectImproveConfig.InspectImproveProperties; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig.InspectImproveProperties; +import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant; +import org.jeecg.modules.supervision.inspectimprove.flow.InspectImproveFlow; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectcloseout/listener/AfterCloseoutApprovedListenerTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListenerTest.java similarity index 88% rename from jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectcloseout/listener/AfterCloseoutApprovedListenerTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListenerTest.java index 463abbc..4462fd4 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectcloseout/listener/AfterCloseoutApprovedListenerTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListenerTest.java @@ -1,10 +1,10 @@ -package org.jeecg.inspectcloseout.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import static org.mockito.Mockito.*; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.inspectcloseout.InspectCloseoutConfig; -import org.jeecg.inspectcloseout.InspectCloseoutConfig.InspectCloseoutProperties; +import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig; +import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig.InspectCloseoutProperties; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterDqLeaderApproveListenerTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListenerTest.java similarity index 90% rename from jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterDqLeaderApproveListenerTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListenerTest.java index 1a08a03..b2bbd67 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterDqLeaderApproveListenerTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListenerTest.java @@ -1,10 +1,10 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import static org.mockito.Mockito.*; import org.flowable.engine.RuntimeService; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.inspectimprove.InspectConstant; +import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterImplDeptLeaderApproveListenerTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListenerTest.java similarity index 89% rename from jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterImplDeptLeaderApproveListenerTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListenerTest.java index 104fd84..eedf323 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterImplDeptLeaderApproveListenerTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListenerTest.java @@ -1,10 +1,10 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import static org.mockito.Mockito.*; import org.flowable.engine.RuntimeService; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.inspectimprove.InspectConstant; +import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterInspectImproveCompleteListenerTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterInspectImproveCompleteListenerTest.java similarity index 83% rename from jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterInspectImproveCompleteListenerTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterInspectImproveCompleteListenerTest.java index 03fcadc..8ed7d00 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterInspectImproveCompleteListenerTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterInspectImproveCompleteListenerTest.java @@ -1,12 +1,12 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import static org.mockito.Mockito.*; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.inspectimprove.InspectImproveConfig; -import org.jeecg.inspectimprove.InspectImproveConfig.InspectImproveProperties; -import org.jeecg.modules.dj.inspectimprove.entity.DjInspectImprove; -import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig.InspectImproveProperties; +import org.jeecg.modules.supervision.inspectimprove.entity.DjInspectImprove; +import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterMeasureResLeaderStoreListenerTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListenerTest.java similarity index 89% rename from jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterMeasureResLeaderStoreListenerTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListenerTest.java index cbd219a..0b957f4 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterMeasureResLeaderStoreListenerTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListenerTest.java @@ -1,13 +1,13 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.inspectimprove.InspectImproveConfig; -import org.jeecg.inspectimprove.InspectImproveConfig.InspectImproveProperties; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig.InspectImproveProperties; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/LeaderApproveHelperTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelperTest.java similarity index 96% rename from jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/LeaderApproveHelperTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelperTest.java index e285b7e..2288f76 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/LeaderApproveHelperTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelperTest.java @@ -1,4 +1,4 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; From a88ea47b5aaee13bbf406138bf31828ab5d58814 Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Thu, 6 Aug 2026 14:52:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?chore(supervision):=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=BA=9F=E5=BC=83=20flow=20=E6=A8=A1=E5=9D=97=E5=B9=B6?= =?UTF-8?q?=E6=B8=85=E7=90=86=20pom=20=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + jeecg-boot-module/jeecg-module-flow/pom.xml | 57 ---- .../main/java/org/jeecg/FLOW-MODULE-AUDIT.md | 244 ------------------ .../main/java/org/jeecg/FLOW-MODULE-GUIDE.md | 139 ---------- .../src/main/java/org/jeecg/Main.java | 17 -- jeecg-boot-module/pom.xml | 1 - .../src/main/java/org/jeecg/Main.java | 17 -- .../jeecg-system-start/pom.xml | 4 - pom.xml | 5 - 9 files changed, 1 insertion(+), 484 deletions(-) delete mode 100644 jeecg-boot-module/jeecg-module-flow/pom.xml delete mode 100644 jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/FLOW-MODULE-AUDIT.md delete mode 100644 jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/FLOW-MODULE-GUIDE.md delete mode 100644 jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/Main.java delete mode 100644 jeecg-module-supervision/src/main/java/org/jeecg/Main.java diff --git a/.gitignore b/.gitignore index f9cf829..1973d68 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ localDocs **/.claude **/yml *.bundle +jeecg-module-system/jeecg-system-start/config/ ## front **/*.lock diff --git a/jeecg-boot-module/jeecg-module-flow/pom.xml b/jeecg-boot-module/jeecg-module-flow/pom.xml deleted file mode 100644 index c7725bd..0000000 --- a/jeecg-boot-module/jeecg-module-flow/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - 4.0.0 - - jeecg-boot-module - org.jeecgframework.boot - ${jeecgProjectVersion} - - - jeecg-module-flow - - - 21 - 21 - UTF-8 - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - - - - - - - org.jeecgframework.boot - jeecg-boot-base-core - - - org.jeecgframework.boot - jeecg-system-local-api - - - org.jeecgframework.boot - jeecg-boot-module-bpm-flowable - 3.8.0 - compile - - - org.jeecgframework.boot - jeecg-system-biz - - - org.jeecgframework.boot - jeecg-module-supervision - - - - \ No newline at end of file diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/FLOW-MODULE-AUDIT.md b/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/FLOW-MODULE-AUDIT.md deleted file mode 100644 index 083294a..0000000 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/FLOW-MODULE-AUDIT.md +++ /dev/null @@ -1,244 +0,0 @@ -# 流程模块架构审计报告 - -> 审计范围：`org.jeecg` 下 4 个流程模块（xispeak / xispeakfb / inspectimprove / inspectcloseout） -> 共 18 个 Java 文件，含 4 个 Config、4 个 Flow、10 个 Listener - -## 一、模块概览 - -| 模块 | 文件数 | Flow 行数 | 业务完整度 | DI 健康度 | -|------|--------|-----------|-----------|-----------| -| xispeak | 9 (1C+1F+7L) | 432 | 完整 | 4/7 正常，3/7 有问题 | -| xispeakfb | 3 (1C+1F+1L) | 322 | 完整 | 正常 | -| inspectimprove | 3 (1C+1F+1L) | 164 | TODO 未完成 | 正常 | -| inspectcloseout | 3 (1C+1F+1L) | 132 | TODO 未完成 | 正常 | - ---- - -## 二、P0 致命问题 - -### 2.1 `StringUtil` 拼写错误 — 编译/运行时报错 - -**文件** `AfterSDWApproveHqListener.java` 第 50 行： - -```java -if(org.apache.commons.lang.StringUtil.isEmpty(url)) { -``` - -Apache Commons Lang 中不存在 `StringUtil` 类，应为 `StringUtils`。 - -**影响**：该行不会通过编译；如果通过（如 IDE 自动导入），运行时会抛出 `NoClassDefFoundError`。 - -### 2.2 链式调用直接 NPE（3 处） - -**`XiSpeakFlow.java`：** - -1. **行 166**：`xiSpeakConfig.getXiSpeak().getNeedSdwApproveCode()` — `getXiSpeak()` 可能返回 null（yml 缺失此段落时 Spring Boot 不会注入默认值，导致属性为 null） -2. **行 172**：`xiSpeakConfig.getXiSpeak().getFeedbackRightNowCode()` — 同上 -3. **行 178**：`xiSpeakConfig.getXiSpeak().getSdwLeaderListKey()` — 同上 - -同类方法 `getBgDeptLdUserIdList()` 行 37-41 做了守卫判断，但上述 3 处遗漏。 - -**`XiSpeakFlow.java` 行 310：** - -```java -public int getImplDeptIsEnd(DelegateExecution execution) { - return getDeptApproveDetail(execution).getIsEnd(); -} -``` - -`getDeptApproveDetail()` 可能返回 null（当 businessKey 为空、deptVar 为 null、entity 不存在时），直接调 `.getIsEnd()` 必抛 NPE。 - -### 2.3 `InspectImproveFlow` / `InspectCloseoutFlow` 所有公开方法配置 NPE - -```java -public List getMeasureResLeaderList(Object jsonData) { - InspectImproveConfig.InspectImproveProperties props = inspectImproveConfig.getInspectImprove(); - return getListFromData(jsonData, props.getMeasureResLeaderKey(), "..."); -} -``` - -`getInspectImprove()` 无 null 守卫。如果 yml 中 `inspect-improve` 或 `inspect-closeout` 配置节缺失，所有公开方法调用时接连抛出 NPE。 - ---- - -## 三、P1 高危问题 - -### 3.1 JSON 解析方法大面织重复（~180 行） - -同一个 "JSONObject / JSONString / POJO 三种类型兼容解析" 逻辑在以下 7 个方法中独立实现： - -| 类 | 方法 | 返回类型 | -|----|------|----------| -| `XiSpeakFlow` | `getCodeValueFromData` | `Integer` | -| `XiSpeakFlow` | `getListCodeValueFromData` | `List` | -| `XiSpeakFlow` | `getImplDeptNums` | `Integer` (变体) | -| `InspectImproveFlow` | `getStringFromData` | `String` | -| `InspectImproveFlow` | `getListFromData` | `List` | -| `InspectCloseoutFlow` | `getStringFromData` | `String` | -| `InspectCloseoutFlow` | `getListFromData` | `List` | - -**建议**：抽取为 `FlowJsonParser` 工具类，提供 `getString(jsonData, key)` / `getInteger(jsonData, key, default)` / `getStringList(jsonData, key)` 三个通用方法。 - -### 3.2 2 级父 Execution 攀爬逻辑三重复制（~135 行） - -三个 Listener 中有逐行相同的 45 行核心逻辑，仅变量名不同： - -| Listener | 存储变量名 | -|----------|-----------| -| `AfterImplDeptLeaderApproveListener` | 硬编码 `"tem_impl_leader"` | -| `AfterImplWorkerTemStoreListener` | 硬编码 `"tem_impl_worker"` | -| `AfterBgLeaderApproveListener` | 配置 `props.getTemBgLeaderKey()` | - -**建议**：提取抽象模板方法，参数化变量名和日志前缀。 - -### 3.3 `getListSize()` 重复定义（3 处） - -`XiSpeakFlow` 行 340、`InspectImproveFlow` 行 155、`InspectCloseoutFlow` 行 123 都有语义完全相同的实现。 - -**建议**：移入共用工具类。 - -### 3.4 依赖注入混乱（3 个 Listener） - -| Listener | 注入方式 | 问题 | -|----------|---------|------| -| `AfterSDWApproveHqListener` | `@RequiredArgsConstructor`(2 final) **+** `@Autowired` 字段注入 `RuntimeService` | 混合注入，风格撕裂 | -| `AfterImplDeptLeaderApproveListener` | `@RequiredArgsConstructor` 零 final + `static { SpringContextUtils.getBean(...) }` | 注解虚设，static 块获取 Bean 有容器未就绪风险 | -| `AfterImplWorkerTemStoreListener` | 同上 | 同上 | - -**建议**：统一为 `@RequiredArgsConstructor(onConstructor_ = @Autowired)` + private final 字段。 - -### 3.5 事务注解缺失 - -`AfterBgWorkerFinalApproveListener` 执行 `bgXiSpeakService.updateById(entity)` 却**没有** `@Transactional`。 - -虽然 MyBatis-Plus 的 `updateById` 自身在一条 SQL 中完成，但如果后续有人在此方法中增加第二个 DB 操作，不会感知到缺少事务边界。 - -### 3.6 悲观锁 vs 无锁策略不一致 - -| Listener | 读方法 | 锁 | -|----------|--------|----| -| `AfterImplWorkerApproveListener` | `getByIdForUpdate` | 悲观锁 (SELECT FOR UPDATE) | -| `AfterImplDeptLeaderStoreJsonListener` | `getById` | 无锁 | -| xispeakfb `AfterImplDeptLeaderApproveListener` | `getById` | 无锁 | - -多实例并行会签场景下，无锁的 `getById` →修改→ `updateById` 存在**丢失更新**风险。 - ---- - -## 四、P2 中危问题 - -### 4.1 `parseDeptId` 两个版本功能不对等 - -- **xispeak 版** (`AfterImplDeptLeaderStoreJsonListener` 行 115-137)：处理 null / Collection / 普通字符串 / `[1001,1002]` 数组字符串 -- **xispeakfb 版** (`AfterImplDeptLeaderApproveListener` 行 115-123)：仅处理 Collection / 普通字符串，缺失数组字符串兼容 - -如果 xispeakfb 流程中传入 `[deptA, deptB]` 格式的变量值（这在 xispeak 流程中很常见），解析结果会包含方括号导致后续匹配失败。 - -### 4.2 流程变量 fallback 模式重复（4 处） - -同一 "先 `getVariableLocal` 再 `getVariable`" 的 4 行模式出现在 4 个不同位置，无统一封装。 - -### 4.3 `AfterSDWApproveHqListener` 日志硬编码字段名 - -行 80 的日志 `"解析 JSON 字段 pending_depts_id 失败"` 硬编码了特定字段名，与运行时通过 `props.getImplDeptKey()` 读取的实际字段名可能不一致，降低排查效率。 - -### 4.4 StringUtils 库引用混乱 - -| 类 | 使用的 StringUtils | -|----|--------------------| -| `XiSpeakFlow` | `org.apache.shiro.util.StringUtils`、`org.apache.commons.lang.StringUtils`、`org.apache.commons.lang3.StringUtils` — 三个库混用 | -| `XiSpeakFeedbackFlow` | `org.apache.commons.lang3.StringUtils` 统一 | -| `InspectImproveFlow` | `org.apache.commons.lang.StringUtils` (lang) | -| `InspectCloseoutFlow` | `org.apache.commons.lang.StringUtils` (lang) | -| 各 Listener | lang 和 lang3 混用 | - -同一类中三种 `StringUtils` 混用增加混淆。Apache Commons Lang (`lang`) 是旧版，`lang3` 是新版，`shiro` 是第三方。 - ---- - -## 五、P3 低危问题 - -### 5.1 两个新的 Listener 含 TODO 未实现 - -- `AfterInspectImproveCompleteListener` 行 44：只输出日志，未更新业务表 -- `AfterCloseoutApprovedListener` 行 35：同上 - -### 5.2 大量未使用的 Import - -约 7 个 Listener 包含从模板复刻过来的未使用 import（如 `LambdaQueryWrapper`、`FlowNodeExpression`、`WorkFlowGlobals`、`TaskTask`、`ITaskTaskService`），推测是从其他文件复制后未清理。 - -### 5.3 缺少 `@Override` - -xispeakfb `AfterImplDeptLeaderApproveListener` 的 `notify()` 方法缺少 `@Override`，失去编译期接口契约校验。 - -### 5.4 硬编码变量名 vs 配置化 - -`AfterImplDeptLeaderApproveListener` 和 `AfterImplWorkerTemStoreListener` 分别硬编码 `"tem_impl_leader"` 和 `"tem_impl_worker"`，而 `AfterBgLeaderApproveListener` 正确地通过 Config 读取。行为不一致。 - -### 5.5 `getImplDeptLeader()` 逻辑矛盾 - -```java -// XiSpeakFlow 行 246-252 -public String getImplDeptLeader(DelegateExecution execution) { - DeptApproveDetail detail = getDeptApproveDetail(execution); - if (detail != null && detail.getIsEnd() != null) { - return String.valueOf(detail.getImplWorker()); // isEnd 非 null → 取 implWorker - } - return detail == null ? "" : detail.getImplWorker(); // isEnd 为 null → 也取 implWorker -} -``` - -两个分支返回同一个字段，`isEnd` 判断形同虚设（可能是条件写反）。 - ---- - -## 六、架构演进建议 - -### 6.1 短期（本迭代） - -1. 修复 4 处 P0 致命问题（`StringUtil` 拼写、3 处 NPE） -2. 统一 `AfterSDWApproveHqListener` 注入方式 -3. 统一两处错误注入（static 块 → 构造注入） -4. 补上 `AfterInspectImproveCompleteListener` 和 `AfterCloseoutApprovedListener` 的 TODO - -### 6.2 中期（下个迭代） - -5. 将 `getStringFromData` / `getListFromData` / `getListSize` 提取为共用 `FlowJsonParser` 工具类 -6. 将 2 级父 Execution 攀爬逻辑提取为可复用的模板方法或工具方法 -7. 统一 `parseDeptId` 到完整版 -8. 统一 `StringUtils` 引用为 `org.apache.commons.lang3.StringUtils` -9. 清理未使用的 import - -### 6.3 长期（架构层面） - -10. 考虑引入流程模块 SDK 层（`flow-module-sdk`），包含： - - 基类 `AbstractFlowConfig` / `AbstractFlowExpression` - - 泛型 JSON 解析器 - - 通用 Listener 模板（变量攀爬、审批记录持久化） -11. 统一事务策略文档：哪些 Listener 需要 `@Transactional`，何时用悲观锁 vs 乐观锁 -12. 建立模块创建 CheckList，新模块上线前逐项验证（DI 一致性、NPE 防御、事务标注、无硬编码等） - ---- - -## 七、CheckList：新流程模块自查项 - -| # | 检查项 | 说明 | -|---|--------|------| -| 1 | Config 注入方式 | `@Component` + `@ConfigurationProperties(prefix = "flow-biz")` | -| 2 | Config 内嵌类 | 属性名与 yml key 中划线自动映射驼峰 | -| 3 | Flow 注入方式 | `@RequiredArgsConstructor(onConstructor_ = @Autowired)` + private final | -| 4 | Flow Bean 命名 | `@Component("xxxFlow")`，避免与其它模块冲突 | -| 5 | 所有公开方法守卫 null | Flow 方法中检查 `getXxx()` 返回 null | -| 6 | 是否复用 `getStringFromData` / `getListFromData` | 优先使用共用工具类，不复写 | -| 7 | Listener 注入方式 | 统一构造注入，禁止 static 块和字段注入 | -| 8 | Listener 类型选择 | 需在任务创建前初始化变量 → ExecutionListener；任务完成回调 → TaskListener | -| 9 | 事务注解 | 有 DB 写操作加 `@Transactional(rollbackFor = Exception.class)` | -| 10 | 锁策略 | 并发写同一行 → `getByIdForUpdate`；无并发 → `getById` | -| 11 | 异常处理策略 | 需阻断流程 → rethrow；可容忍 → catch + log + 返回默认值 | -| 12 | `StringUtils` | 统一使用 `org.apache.commons.lang3.StringUtils` | -| 13 | 无硬编码变量名 | 变量名统一从 Config 读取 | -| 14 | 无未使用 import | 提交前 IDE 自动优化 imports | -| 15 | `@Override` | 所有 `notify()` 方法加 `@Override` | -| 16 | yml 配置节 | 与 Config 内嵌类属性一一对应 | -| 17 | 无 TODO | 功能完整的 Listener 不应留 TODO | -| 18 | 日志规范 | 异常用 `log.error`、业务用 `log.info`、跳过/降级用 `log.warn` | diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/FLOW-MODULE-GUIDE.md b/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/FLOW-MODULE-GUIDE.md deleted file mode 100644 index c17319b..0000000 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/FLOW-MODULE-GUIDE.md +++ /dev/null @@ -1,139 +0,0 @@ -# 流程模块开发指南 - -本文档说明如何为业务模块创建对应的流程集成包，基于 `org.jeecg.xispeak` 的设计模式。 - -## 目录结构 - -``` -org/jeecg// -├── XxxConfig.java # 配置类，映射 YAML -├── XxxFlow.java # 流程表达式 Bean -└── listener/ - ├── AfterXxxListener.java # TaskListener / ExecutionListener - └── ... -``` - -## 三步创建流程模块 - -### Step 1: 创建 Config 配置类 - -读取 `application-flow.yml` 中 `flow-biz.` 段落。 - -```java -@Data -@Component -@ConfigurationProperties(prefix = "flow-biz") -public class XxxConfig { - private XxxProperties xxx; // 对应 yml 中 xxx 节点 - - @Data - public static class XxxProperties { - private String businessKey; // 业务主键变量名 - private String jsonDataKey; // JSON 数据变量名 - private String formUrl; // 业务表单路径 - private String flowCode; // 流程定义编码（可选） - // ... 按需添加字段名配置 - } -} -``` - -**要点：** -- 外层类 `@ConfigurationProperties(prefix = "flow-biz")`，内层属性名对应 YAML 键名 -- Spring 自动做中划线 → 驼峰映射（`business-key` → `businessKey`） -- 将业务字段名配置化，避免硬编码，方便流程设计调整 - -### Step 2: 创建 Flow 表达式 Bean - -供 Flowable 流程表达式 `${xxxFlow.method(args)}` 调用。 - -```java -@Slf4j -@Component("xxxFlow") // Bean 名即流程表达式前缀 -@RequiredArgsConstructor(onConstructor_ = @Autowired) -public class XxxFlow { - - private final XxxConfig xxxConfig; - // 注入需要的 Service - - // 提供流程表达式方法 - public List getApproverList(Object jsonData) { ... } - public int getApproverListLength(Object jsonData) { ... } -} -``` - -**常用方法模式：** -| 方法 | 用途 | 表达式示例 | -|------|------|-----------| -| `getXxxList(jsonData)` | 从 JSON 解析列表 | `${xxxFlow.getApproverList(json_data)}` | -| `getXxxListLength(jsonData)` | 返回列表长度 | `${xxxFlow.getApproverListLength(json_data) > 0}` | -| `getXxx(jsonData)` | 从 JSON 解析单值 | `${xxxFlow.getApplicant(json_data)}` | -| `getListSize(str)` | 逗号分隔字符串计数 | `${xxxFlow.getListSize(someVar)}` | - -**要点：** -- Bean 名要有命名空间意识，不可与其它模块冲突 -- 所有方法需防御 null/空字符串输入 -- Length 类方法用于流程网关条件判断 - -### Step 3: 创建 Listener - -监听流程节点事件，执行业务回调。 - -```java -@Slf4j -@Component("AfterXxxListener") // Bean 名供 Flowable 设计器引用 -@RequiredArgsConstructor(onConstructor_ = @Autowired) -public class AfterXxxListener implements TaskListener { - - private final XxxConfig xxxConfig; - - @Override - public void notify(DelegateTask delegateTask) { - // 1. 读取流程变量 - // 2. 执行业务逻辑 - // 3. 异常时慎重决定是否 rethrow - } -} -``` - -**Listener 类型：** -- `TaskListener` — 用户任务完成/创建时触发 -- `ExecutionListener` — 流程实例/节点生命周期事件 - -**要点：** -- 必须在 `notify` 开头做 null 防御（assignee、变量等可能为空） -- 需要读写业务表时加 `@Transactional(rollbackFor = Exception.class)` -- 异常处理：阻断流程 rethrow，不阻断 catch 后 log - -### Step 4: 添加 YAML 配置 - -在 `application-flow.yml` 的 `flow-biz` 下新增配置节： - -```yaml -flow-biz: - : - business-key: "business_id" - json-data-key: "json_data" - form-url: "path/to/BPMForm" - flow-code: "process_xxx" - # ... 模块专属字段 -``` - -## 已有模块速查 - -| 模块 | 包路径 | YAML 节点 | Flow Bean | 对应业务实体 | -|------|--------|-----------|-----------|-------------| -| 习讲话 | `org.jeecg.xispeak` | `xi-speak` | `xiSpeakFlow` | `BgXiSpeak` | -| 巡视整改 | `org.jeecg.inspectimprove` | `inspect-improve` | `inspectImproveFlow` | `DjInspectImprove` | -| 巡视整改销号 | `org.jeecg.inspectcloseout` | `inspect-closeout` | `inspectCloseoutFlow` | 待定 | - -## 流程表达式调试 - -在 Flowable 流程设计器中，表达式写法为 `${beanName.methodName(args)}`： - -``` -${xiSpeakFlow.getNeedSdwApproval(json_data) == 1} -${inspectImproveFlow.getMeasureResLeaderListLength(json_data) > 0} -${inspectCloseoutFlow.getApproverListLength(json_data) == 0} -``` - -`json_data` 变量由子流程启动监听器（如 `AfterSDWApproveHqListener`）从主流程注入，具体变量名见各模块 YAML 的 `json-data-key`。 diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/Main.java b/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/Main.java deleted file mode 100644 index 28f7a57..0000000 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/Main.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jeecg; - -//TIP 要运行代码，请按 或 -// 点击装订区域中的 图标。 -public class Main { - public static void main(String[] args) { - //TIP 当文本光标位于高亮显示的文本处时按 - // 查看 IntelliJ IDEA 建议如何修正。 - System.out.printf("Hello and welcome!"); - - for (int i = 1; i <= 5; i++) { - //TIP 按 开始调试代码。我们已经设置了一个 断点 - // 但您始终可以通过按 添加更多断点。 - System.out.println("i = " + i); - } - } -} \ No newline at end of file diff --git a/jeecg-boot-module/pom.xml b/jeecg-boot-module/pom.xml index 364b0ad..bb73d50 100644 --- a/jeecg-boot-module/pom.xml +++ b/jeecg-boot-module/pom.xml @@ -18,7 +18,6 @@ jeecg-boot-module-airag - jeecg-module-flow jeecg-module-tools jeecg-module-im diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/Main.java b/jeecg-module-supervision/src/main/java/org/jeecg/Main.java deleted file mode 100644 index 28f7a57..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/Main.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jeecg; - -//TIP 要运行代码，请按 或 -// 点击装订区域中的 图标。 -public class Main { - public static void main(String[] args) { - //TIP 当文本光标位于高亮显示的文本处时按 - // 查看 IntelliJ IDEA 建议如何修正。 - System.out.printf("Hello and welcome!"); - - for (int i = 1; i <= 5; i++) { - //TIP 按 开始调试代码。我们已经设置了一个 断点 - // 但您始终可以通过按 添加更多断点。 - System.out.println("i = " + i); - } - } -} \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-start/pom.xml b/jeecg-module-system/jeecg-system-start/pom.xml index ef6e8ed..b545667 100644 --- a/jeecg-module-system/jeecg-system-start/pom.xml +++ b/jeecg-module-system/jeecg-system-start/pom.xml @@ -33,10 +33,6 @@ jeecg-module-im ${jeecgProjectVersion} - - org.jeecgframework.boot - jeecg-module-flow - org.jeecgframework.boot diff --git a/pom.xml b/pom.xml index ce0e4d7..dfbffae 100644 --- a/pom.xml +++ b/pom.xml @@ -218,11 +218,6 @@ jeecg-system-biz ${jeecgProjectVersion} - - org.jeecgframework.boot - jeecg-module-flow - ${jeecgProjectVersion} - org.jeecgframework.boot