From 2133a72c2958bdc70b79cafac326cab7660c62cf Mon Sep 17 00:00:00 2001 From: songgaoshuai <1742057357@qq.com> Date: Tue, 28 Nov 2023 13:15:47 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E8=AF=B7=E5=81=87?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8C=85=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-modules/ruoyi-demo/pom.xml | 11 +---------- .../workflow}/controller/TestLeaveController.java | 10 +++++----- .../java/org/dromara/workflow}/domain/TestLeave.java | 2 +- .../org/dromara/workflow}/domain/bo/TestLeaveBo.java | 4 ++-- .../org/dromara/workflow}/domain/vo/TestLeaveVo.java | 7 ++----- .../dromara/workflow}/mapper/TestLeaveMapper.java | 6 +++--- .../dromara/workflow}/service/ITestLeaveService.java | 8 ++++---- .../workflow}/service/impl/TestLeaveServiceImpl.java | 12 ++++++------ .../resources/mapper/workflow}/TestLeaveMapper.xml | 2 +- 9 files changed, 25 insertions(+), 37 deletions(-) rename ruoyi-modules/{ruoyi-demo/src/main/java/org/dromara/demo => ruoyi-workflow/src/main/java/org/dromara/workflow}/controller/TestLeaveController.java (92%) rename ruoyi-modules/{ruoyi-demo/src/main/java/org/dromara/demo => ruoyi-workflow/src/main/java/org/dromara/workflow}/domain/TestLeave.java (94%) rename ruoyi-modules/{ruoyi-demo/src/main/java/org/dromara/demo => ruoyi-workflow/src/main/java/org/dromara/workflow}/domain/bo/TestLeaveBo.java (92%) rename ruoyi-modules/{ruoyi-demo/src/main/java/org/dromara/demo => ruoyi-workflow/src/main/java/org/dromara/workflow}/domain/vo/TestLeaveVo.java (82%) rename ruoyi-modules/{ruoyi-demo/src/main/java/org/dromara/demo => ruoyi-workflow/src/main/java/org/dromara/workflow}/mapper/TestLeaveMapper.java (61%) rename ruoyi-modules/{ruoyi-demo/src/main/java/org/dromara/demo => ruoyi-workflow/src/main/java/org/dromara/workflow}/service/ITestLeaveService.java (81%) rename ruoyi-modules/{ruoyi-demo/src/main/java/org/dromara/demo => ruoyi-workflow/src/main/java/org/dromara/workflow}/service/impl/TestLeaveServiceImpl.java (92%) rename ruoyi-modules/{ruoyi-demo/src/main/resources/mapper/demo => ruoyi-workflow/src/main/resources/mapper/workflow}/TestLeaveMapper.xml (70%) diff --git a/ruoyi-modules/ruoyi-demo/pom.xml b/ruoyi-modules/ruoyi-demo/pom.xml index cc694f4a9..6e07a45f1 100644 --- a/ruoyi-modules/ruoyi-demo/pom.xml +++ b/ruoyi-modules/ruoyi-demo/pom.xml @@ -63,11 +63,6 @@ ruoyi-common-excel - - org.dromara - ruoyi-common-security - - org.dromara ruoyi-common-web @@ -102,11 +97,6 @@ org.dromara ruoyi-common-websocket - - - org.dromara - ruoyi-workflow - @@ -117,6 +107,7 @@ + diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestLeaveController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java similarity index 92% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestLeaveController.java rename to ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java index 9dbe6ebb7..a65aa6acd 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestLeaveController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java @@ -1,4 +1,4 @@ -package org.dromara.demo.controller; +package org.dromara.workflow.controller; import java.util.List; @@ -6,7 +6,10 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.demo.domain.TestLeave; +import org.dromara.workflow.domain.TestLeave; +import org.dromara.workflow.domain.bo.TestLeaveBo; +import org.dromara.workflow.domain.vo.TestLeaveVo; +import org.dromara.workflow.service.ITestLeaveService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -18,9 +21,6 @@ import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.demo.domain.vo.TestLeaveVo; -import org.dromara.demo.domain.bo.TestLeaveBo; -import org.dromara.demo.service.ITestLeaveService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestLeave.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java similarity index 94% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestLeave.java rename to ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java index a11352f6f..a1e56830e 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestLeave.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java @@ -1,4 +1,4 @@ -package org.dromara.demo.domain; +package org.dromara.workflow.domain; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestLeaveBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java similarity index 92% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestLeaveBo.java rename to ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java index b0e40f8ce..7352523d1 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestLeaveBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java @@ -1,6 +1,6 @@ -package org.dromara.demo.domain.bo; +package org.dromara.workflow.domain.bo; -import org.dromara.demo.domain.TestLeave; +import org.dromara.workflow.domain.TestLeave; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestLeaveVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java similarity index 82% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestLeaveVo.java rename to ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java index 1d510c1ee..83d4a6441 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestLeaveVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java @@ -1,17 +1,14 @@ -package org.dromara.demo.domain.vo; +package org.dromara.workflow.domain.vo; -import org.dromara.demo.domain.TestLeave; +import org.dromara.workflow.domain.TestLeave; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.workflow.domain.vo.ProcessInstanceVo; import java.io.Serial; import java.io.Serializable; -import java.util.Date; /** diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestLeaveMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java similarity index 61% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestLeaveMapper.java rename to ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java index 8275f696f..55b6a8e48 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestLeaveMapper.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java @@ -1,7 +1,7 @@ -package org.dromara.demo.mapper; +package org.dromara.workflow.mapper; -import org.dromara.demo.domain.TestLeave; -import org.dromara.demo.domain.vo.TestLeaveVo; +import org.dromara.workflow.domain.TestLeave; +import org.dromara.workflow.domain.vo.TestLeaveVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestLeaveService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java similarity index 81% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestLeaveService.java rename to ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java index c9993fc25..380979ffb 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestLeaveService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java @@ -1,8 +1,8 @@ -package org.dromara.demo.service; +package org.dromara.workflow.service; -import org.dromara.demo.domain.TestLeave; -import org.dromara.demo.domain.vo.TestLeaveVo; -import org.dromara.demo.domain.bo.TestLeaveBo; +import org.dromara.workflow.domain.TestLeave; +import org.dromara.workflow.domain.vo.TestLeaveVo; +import org.dromara.workflow.domain.bo.TestLeaveBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestLeaveServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestLeaveServiceImpl.java rename to ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java index 057bff8e9..dc2055ada 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestLeaveServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.demo.service.impl; +package org.dromara.workflow.service.impl; import cn.hutool.core.collection.CollUtil; import org.dromara.common.core.utils.MapstructUtils; @@ -13,11 +13,11 @@ import lombok.RequiredArgsConstructor; import org.dromara.workflow.service.IActProcessInstanceService; import org.dromara.workflow.utils.WorkflowUtils; import org.springframework.stereotype.Service; -import org.dromara.demo.domain.bo.TestLeaveBo; -import org.dromara.demo.domain.vo.TestLeaveVo; -import org.dromara.demo.domain.TestLeave; -import org.dromara.demo.mapper.TestLeaveMapper; -import org.dromara.demo.service.ITestLeaveService; +import org.dromara.workflow.domain.bo.TestLeaveBo; +import org.dromara.workflow.domain.vo.TestLeaveVo; +import org.dromara.workflow.domain.TestLeave; +import org.dromara.workflow.mapper.TestLeaveMapper; +import org.dromara.workflow.service.ITestLeaveService; import org.springframework.transaction.annotation.Transactional; import java.util.List; diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestLeaveMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml similarity index 70% rename from ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestLeaveMapper.xml rename to ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml index b5b83a579..e824e3f39 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestLeaveMapper.xml +++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml @@ -2,6 +2,6 @@ - +