From e493f282fa4f93e0ded82f361fc12a5b508bf978 Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Wed, 9 Oct 2024 16:46:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=B0=E5=A2=9E):=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=96=87=E4=BB=B6=E7=94=9F=E6=88=90,?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E6=9D=BF=E7=94=9F=E6=88=90=E5=99=A8?= =?UTF-8?q?=E9=83=A8=E5=88=86=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generator/generator/WebGeneratorCode.java | 32 ++++---- .../main/resources/vms/server/serviceImpl.vm | 2 +- .../src/main/resources/vms/web/index.vm | 2 +- .../dao/dto/system/files/FilesAddDto.java | 32 ++++++++ .../bunny/dao/dto/system/files/FilesDto.java | 28 +++++++ .../dao/dto/system/files/FilesUpdateDto.java | 37 +++++++++ .../cn/bunny/dao/entity/system/Files.java | 5 +- .../dao/vo/system/{dept => }/DeptVo.java | 2 +- .../system/{email => }/EmailTemplateVo.java | 2 +- .../vo/system/{menuIcon => }/MenuIconVo.java | 2 +- .../cn/bunny/dao/vo/system/files/FilesVo.java | 30 +++++++ .../services/controller/DeptController.java | 2 +- .../services/controller/FilesController.java | 56 +++++++++++-- .../controller/MenuIconController.java | 2 +- .../cn/bunny/services/mapper/FilesMapper.java | 23 +++++- .../bunny/services/service/DeptService.java | 2 +- .../bunny/services/service/FilesService.java | 39 ++++++++- .../services/service/MenuIconService.java | 2 +- .../service/impl/DeptServiceImpl.java | 4 +- .../service/impl/FilesServiceImpl.java | 81 ++++++++++++++++++- .../service/impl/MenuIconServiceImpl.java | 2 +- .../src/main/resources/mapper/FilesMapper.xml | 53 +++++++++--- 22 files changed, 387 insertions(+), 53 deletions(-) create mode 100644 dao/src/main/java/cn/bunny/dao/dto/system/files/FilesAddDto.java create mode 100644 dao/src/main/java/cn/bunny/dao/dto/system/files/FilesDto.java create mode 100644 dao/src/main/java/cn/bunny/dao/dto/system/files/FilesUpdateDto.java rename dao/src/main/java/cn/bunny/dao/vo/system/{dept => }/DeptVo.java (94%) rename dao/src/main/java/cn/bunny/dao/vo/system/{email => }/EmailTemplateVo.java (94%) rename dao/src/main/java/cn/bunny/dao/vo/system/{menuIcon => }/MenuIconVo.java (92%) create mode 100644 dao/src/main/java/cn/bunny/dao/vo/system/files/FilesVo.java diff --git a/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java b/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java index d4ad44e..ba9d5d2 100644 --- a/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java +++ b/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java @@ -3,11 +3,11 @@ package cn.bunny.common.generator.generator; import cn.bunny.common.generator.entity.BaseField; import cn.bunny.common.generator.entity.BaseResultMap; import cn.bunny.common.generator.utils.GeneratorCodeUtils; -import cn.bunny.dao.dto.system.dept.DeptAddDto; -import cn.bunny.dao.dto.system.dept.DeptDto; -import cn.bunny.dao.dto.system.dept.DeptUpdateDto; -import cn.bunny.dao.entity.system.Dept; -import cn.bunny.dao.vo.system.dept.DeptVo; +import cn.bunny.dao.dto.system.files.FilesAddDto; +import cn.bunny.dao.dto.system.files.FilesDto; +import cn.bunny.dao.dto.system.files.FilesUpdateDto; +import cn.bunny.dao.entity.system.Files; +import cn.bunny.dao.vo.system.files.FilesVo; import com.baomidou.mybatisplus.annotation.TableName; import com.google.common.base.CaseFormat; import io.swagger.v3.oas.annotations.media.Schema; @@ -36,7 +36,7 @@ import java.util.stream.Stream; @Service public class WebGeneratorCode { // 公共路径 - public static String commonPath = "D:\\Project\\web\\PC\\auth\\auth-web\\src"; + public static String commonPath = "D:\\MyFolder\\auth-admin\\auth-web\\src"; // 生成API请求路径 public static String apiPath = commonPath + "\\api\\v1\\"; // 生成vue路径 @@ -44,18 +44,18 @@ public class WebGeneratorCode { // 生成仓库路径 public static String storePath = commonPath + "\\store\\system\\"; // 后端controller - public static String controllerPath = "D:\\Project\\web\\PC\\auth\\auth-server-java\\service\\src\\main\\java\\cn\\bunny\\services\\controller\\"; - public static String servicePath = "D:\\Project\\web\\PC\\auth\\auth-server-java\\service\\src\\main\\java\\cn\\bunny\\services\\service\\"; - public static String serviceImplPath = "D:\\Project\\web\\PC\\auth\\auth-server-java\\service\\src\\main\\java\\cn\\bunny\\services\\service\\impl\\"; - public static String mapperPath = "D:\\Project\\web\\PC\\auth\\auth-server-java\\service\\src\\main\\java\\cn\\bunny\\services\\mapper\\"; - public static String resourceMapperPath = "D:\\Project\\web\\PC\\auth\\auth-server-java\\service\\src\\main\\resources\\mapper\\"; + public static String controllerPath = "D:\\MyFolder\\auth-admin\\auth-server-java\\service\\src\\main\\java\\cn\\bunny\\services\\controller\\"; + public static String servicePath = "D:\\MyFolder\\auth-admin\\auth-server-java\\service\\src\\main\\java\\cn\\bunny\\services\\service\\"; + public static String serviceImplPath = "D:\\MyFolder\\auth-admin\\auth-server-java\\service\\src\\main\\java\\cn\\bunny\\services\\service\\impl\\"; + public static String mapperPath = "D:\\MyFolder\\auth-admin\\auth-server-java\\service\\src\\main\\java\\cn\\bunny\\services\\mapper\\"; + public static String resourceMapperPath = "D:\\MyFolder\\auth-admin\\auth-server-java\\service\\src\\main\\resources\\mapper\\"; public static void main(String[] args) throws Exception { - Class originalClass = Dept.class; - Class dtoClass = DeptDto.class; - Class addDtoClass = DeptAddDto.class; - Class updateDtoClass = DeptUpdateDto.class; - Class voClass = DeptVo.class; + Class originalClass = Files.class; + Class dtoClass = FilesDto.class; + Class addDtoClass = FilesAddDto.class; + Class updateDtoClass = FilesUpdateDto.class; + Class voClass = FilesVo.class; // 设置velocity资源加载器 Properties prop = new Properties(); diff --git a/common/common-generator/src/main/resources/vms/server/serviceImpl.vm b/common/common-generator/src/main/resources/vms/server/serviceImpl.vm index b42c40c..cf77108 100644 --- a/common/common-generator/src/main/resources/vms/server/serviceImpl.vm +++ b/common/common-generator/src/main/resources/vms/server/serviceImpl.vm @@ -37,7 +37,7 @@ public class ${originalName}ServiceImpl extends ServiceImpl<${originalName}Mappe List<${originalName}Vo> voList = page.getRecords().stream().map(${lowercaseName} -> { ${originalName}Vo ${lowercaseName}Vo = new ${originalName}Vo(); - BeanUtils.copyProperties(${originalName}, ${originalName}Vo); + BeanUtils.copyProperties(${lowercaseName}, ${lowercaseName}Vo); return ${lowercaseName}Vo; }).toList(); diff --git a/common/common-generator/src/main/resources/vms/web/index.vm b/common/common-generator/src/main/resources/vms/web/index.vm index 7407d8d..4bc391a 100644 --- a/common/common-generator/src/main/resources/vms/web/index.vm +++ b/common/common-generator/src/main/resources/vms/web/index.vm @@ -65,7 +65,7 @@