From 91ceda487b49ba8e2643ac99448e638d771090a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E6=9C=9D?= <13694051+wangxizhao123@user.noreply.gitee.com> Date: Fri, 10 May 2024 14:43:05 +0800 Subject: [PATCH] =?UTF-8?q?fase()=E8=A7=84=E8=8C=83=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/constant/ServiceNameConstants.java | 2 +- .../com/muyu/file/MuYuFileApplication.java | 2 +- .../com/muyu/file/config/MinioConfig.java | 18 +- .../com/muyu/file/config/ResourcesConfig.java | 4 +- .../file/controller/SysFileController.java | 4 +- .../service/FastDfsSysFileServiceImpl.java | 4 +- .../muyu/file/service/ISysFileService.java | 4 +- .../file/service/LocalSysFileServiceImpl.java | 4 +- .../file/service/MinioSysFileServiceImpl.java | 4 +- .../com/muyu/file/utils/FileUploadUtils.java | 20 +- muyu-modules/muyu-gen/pom.xml | 2 +- .../java/com/muyu/gen/MuYuGenApplication.java | 2 +- .../java/com/muyu/gen/config/GenConfig.java | 16 +- .../muyu/gen/controller/GenController.java | 28 +- .../java/com/muyu/gen/domain/GenTable.java | 110 +- .../com/muyu/gen/domain/GenTableColumn.java | 112 +- .../muyu/gen/mapper/GenTableColumnMapper.java | 18 +- .../com/muyu/gen/mapper/GenTableMapper.java | 26 +- .../service/GenTableColumnServiceImpl.java | 12 +- .../muyu/gen/service/GenTableServiceImpl.java | 48 +- .../gen/service/IGenTableColumnService.java | 12 +- .../muyu/gen/service/IGenTableService.java | 38 +- .../main/java/com/muyu/gen/util/GenUtils.java | 28 +- .../muyu/gen/util/VelocityInitializer.java | 2 +- .../java/com/muyu/gen/util/VelocityUtils.java | 41 +- .../muyu-gen/src/main/resources/logback.xml | 70 +- .../mapper/generator/GenTableColumnMapper.xml | 12 +- .../mapper/generator/GenTableMapper.xml | 3 +- .../main/resources/vm/java/controller.java.vm | 51 +- .../src/main/resources/vm/java/domain.java.vm | 120 +- .../src/main/resources/vm/java/mapper.java.vm | 68 +- .../main/resources/vm/java/service.java.vm | 18 +- .../resources/vm/java/serviceImpl.java.vm | 168 ++- .../main/resources/vm/java/sub-domain.java.vm | 98 +- .../src/main/resources/vm/js/api.js.vm | 46 +- .../main/resources/vm/vue/index-tree.vue.vm | 970 +++++++------ .../src/main/resources/vm/vue/index.vue.vm | 1228 +++++++++-------- .../resources/vm/vue/v3/index-tree.vue.vm | 914 ++++++------ .../src/main/resources/vm/vue/v3/index.vue.vm | 1195 +++++++++------- .../src/main/resources/vm/xml/mapper.xml.vm | 225 +-- .../muyu-goods-edition-clinet/pom.xml | 18 +- .../efition/clinet}/config/AccessConfig.java | 2 +- .../clinet/config/AccessConfigRunner.java | 24 + ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/logback.xml | 74 + .../edition/constant/ConfigCodeConstants.java | 9 +- .../constant/RuleOperationConstants.java | 7 +- .../java/com/muyu/edition/domain/Anduser.java | 11 +- .../java/com/muyu/edition/domain/Config.java | 77 +- .../java/com/muyu/edition/domain/Cope.java | 4 +- .../java/com/muyu/edition/domain/Edition.java | 59 +- .../com/muyu/edition/domain/RuleEngine.java | 112 +- .../edition/domain/resp/EngineConfigResp.java | 12 +- .../src/main/resources/logback.xml | 74 + .../remote/RemoteDataManagerService.java | 21 + .../remote/factory/DataMangFacrory.java | 21 + ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/logback.xml | 74 + .../edition/MuYuGoodsEditionApplication.java | 2 +- .../edition/controller/ConfigController.java | 32 +- .../edition/controller/CopeController.java | 4 +- .../edition/controller/EditionController.java | 26 +- .../controller/RuleEngineController.java | 37 +- .../edition/dymamicLoad/DynamicLoader.java | 1 - .../dymamicLoad/MemoryJavaFileManager.java | 73 +- .../com/muyu/edition/mapper/ConfigMapper.java | 3 +- .../muyu/edition/mapper/EditionMapper.java | 3 +- .../muyu/edition/mapper/RuleEngineMapper.java | 3 +- .../edition/scope/DataModelContextHolder.java | 3 +- .../edition/scope/DataSetContextHolder.java | 3 +- .../edition/scope/RecordContextHolder.java | 3 +- .../muyu/edition/scope/TaskContextHolder.java | 3 +- .../muyu/edition/service/IConfigService.java | 5 +- .../muyu/edition/service/IEditionService.java | 4 +- .../edition/service/IRuleEngineService.java | 5 +- .../service/impl/ConfigServiceImpl.java | 27 +- .../edition/service/impl/CopeServiceImpl.java | 10 +- .../service/impl/EditionServiceImpl.java | 21 +- .../service/impl/RuleEngineServiceImpl.java | 38 +- .../src/main/resources/logback.xml | 74 + .../resources/mapper/goods/ConfigMapper.xml | 74 + .../resources/mapper/goods/CopeMapper.xml | 11 + .../resources/mapper/goods/EditionMapper.xml | 85 ++ .../mapper/goods/RuleEngineMapper.xml | 115 ++ muyu-modules/muyu-goods-edition/pom.xml | 4 +- .../muyu-goods-test-clinet/pom.xml | 27 - .../cllent/config/AccessConfigRunner.java | 15 - .../muyu-goods-test-common/pom.xml | 27 - .../muyu-goods-test-remote/pom.xml | 26 - .../test/remote/RemoteDataManagerService.java | 4 - .../test/remote/factory/DataMangFacrory.java | 17 - .../muyu-goods-test-server/pom.xml | 28 - .../muyu/test/config/BloomFilterConfig.java | 24 - muyu-modules/muyu-goods-tests/pom.xml | 28 - muyu-modules/muyu-goods-unit/pom.xml | 4 +- muyu-modules/muyu-goods-users/pom.xml | 4 +- muyu-modules/muyu-goods/pom.xml | 4 +- .../muyu-goods/src/main/java/stream.java | 25 +- .../muyu-goods/src/main/java/yes.java | 1 - .../resources/mapper/goods/ConfigMapper.xml | 31 +- .../resources/mapper/goods/EditionMapper.xml | 44 +- .../mapper/goods/RuleEngineMapper.xml | 49 +- .../java/com/muyu/job/MuYuJobApplication.java | 2 +- .../muyu/job/controller/SysJobController.java | 18 +- .../job/controller/SysJobLogController.java | 12 +- .../main/java/com/muyu/job/domain/SysJob.java | 36 +- .../java/com/muyu/job/domain/SysJobLog.java | 38 +- .../com/muyu/job/mapper/SysJobLogMapper.java | 19 +- .../com/muyu/job/mapper/SysJobMapper.java | 20 +- .../muyu/job/service/ISysJobLogService.java | 16 +- .../com/muyu/job/service/ISysJobService.java | 33 +- .../job/service/SysJobLogServiceImpl.java | 15 +- .../muyu/job/service/SysJobServiceImpl.java | 30 +- .../main/java/com/muyu/job/task/MyTask.java | 6 +- .../com/muyu/job/util/AbstractQuartzJob.java | 9 +- .../java/com/muyu/job/util/CronUtils.java | 9 +- .../java/com/muyu/job/util/JobInvokeUtil.java | 24 +- .../QuartzDisallowConcurrentExecution.java | 2 +- .../com/muyu/job/util/QuartzJobExecution.java | 2 +- .../java/com/muyu/job/util/ScheduleUtils.java | 14 +- .../muyu/system/MuYuSystemApplication.java | 2 +- .../system/controller/AccreditController.java | 92 +- .../controller/AssetModelController.java | 49 +- .../controller/DataAccessController.java | 57 +- .../system/controller/DictController.java | 45 +- .../controller/SysConfigController.java | 18 +- .../system/controller/SysDeptController.java | 14 +- .../controller/SysDictDataController.java | 16 +- .../controller/SysDictTypeController.java | 18 +- .../controller/SysLogininforController.java | 14 +- .../system/controller/SysMenuController.java | 18 +- .../controller/SysNoticeController.java | 12 +- .../controller/SysOperlogController.java | 12 +- .../system/controller/SysPostController.java | 16 +- .../controller/SysProfileController.java | 16 +- .../system/controller/SysRoleController.java | 32 +- .../system/controller/SysUserController.java | 40 +- .../controller/SysUserOnlineController.java | 6 +- .../com/muyu/system/domain/AssetModel.java | 149 +- .../com/muyu/system/domain/DataAccess.java | 207 +-- .../java/com/muyu/system/domain/DictData.java | 2 +- .../java/com/muyu/system/domain/Library.java | 1 - .../com/muyu/system/domain/SysConfig.java | 24 +- .../java/com/muyu/system/domain/SysMenu.java | 66 +- .../com/muyu/system/domain/SysNotice.java | 22 +- .../java/com/muyu/system/domain/SysPost.java | 26 +- .../com/muyu/system/domain/SysRoleDept.java | 10 +- .../com/muyu/system/domain/SysRoleMenu.java | 10 +- .../com/muyu/system/domain/SysUserOnline.java | 28 +- .../com/muyu/system/domain/SysUserPost.java | 10 +- .../com/muyu/system/domain/SysUserRole.java | 10 +- .../com/muyu/system/domain/TableList.java | 6 +- .../muyu/system/domain/table/ToTalNum.java | 2 +- .../com/muyu/system/domain/vo/DeptVO.java | 1 - .../com/muyu/system/domain/vo/MetaVo.java | 26 +- .../com/muyu/system/domain/vo/RouterVo.java | 36 +- .../com/muyu/system/domain/vo/SysUserVo.java | 6 - .../com/muyu/system/domain/vo/TableVo.java | 40 +- .../com/muyu/system/domain/vo/TreeSelect.java | 18 +- .../muyu/system/mapper/AccreditMapper.java | 12 +- .../muyu/system/mapper/AssetModelMapper.java | 6 +- .../muyu/system/mapper/DataAccessMapper.java | 14 +- .../com/muyu/system/mapper/DictMapper.java | 1 - .../com/muyu/system/mapper/SysDeptMapper.java | 38 +- .../muyu/system/mapper/SysDictDataMapper.java | 32 +- .../muyu/system/mapper/SysDictTypeMapper.java | 26 +- .../system/mapper/SysLogininforMapper.java | 10 +- .../com/muyu/system/mapper/SysMenuMapper.java | 40 +- .../muyu/system/mapper/SysNoticeMapper.java | 18 +- .../muyu/system/mapper/SysOperLogMapper.java | 13 +- .../com/muyu/system/mapper/SysPostMapper.java | 32 +- .../muyu/system/mapper/SysRoleDeptMapper.java | 12 +- .../com/muyu/system/mapper/SysRoleMapper.java | 35 +- .../muyu/system/mapper/SysRoleMenuMapper.java | 12 +- .../com/muyu/system/mapper/SysUserMapper.java | 42 +- .../muyu/system/mapper/SysUserPostMapper.java | 12 +- .../muyu/system/mapper/SysUserRoleMapper.java | 18 +- .../muyu/system/service/AccreditService.java | 12 +- .../system/service/IAssetModelService.java | 6 +- .../system/service/IDataAccessService.java | 6 +- .../muyu/system/service/SysConfigService.java | 14 +- .../muyu/system/service/SysDeptService.java | 43 +- .../system/service/SysDictDataService.java | 17 +- .../system/service/SysDictTypeService.java | 31 +- .../system/service/SysLogininforService.java | 10 +- .../muyu/system/service/SysMenuService.java | 48 +- .../muyu/system/service/SysNoticeService.java | 18 +- .../system/service/SysOperLogService.java | 14 +- .../system/service/SysPermissionService.java | 6 +- .../muyu/system/service/SysPostService.java | 32 +- .../muyu/system/service/SysRoleService.java | 57 +- .../system/service/SysUserOnlineService.java | 13 +- .../muyu/system/service/SysUserService.java | 69 +- .../service/impl/AccreditServiceImpl.java | 117 +- .../service/impl/AssetModelServiceImpl.java | 34 +- .../service/impl/DataAccessServiceImpl.java | 77 +- .../system/service/impl/DictServiceImpl.java | 5 +- .../service/impl/SysConfigServiceImpl.java | 26 +- .../service/impl/SysDeptServiceImpl.java | 53 +- .../service/impl/SysDictDataServiceImpl.java | 17 +- .../service/impl/SysDictTypeServiceImpl.java | 33 +- .../impl/SysLogininforServiceImpl.java | 10 +- .../service/impl/SysMenuServiceImpl.java | 81 +- .../service/impl/SysNoticeServiceImpl.java | 18 +- .../service/impl/SysOperLogServiceImpl.java | 14 +- .../impl/SysPermissionServiceImpl.java | 7 +- .../service/impl/SysPostServiceImpl.java | 32 +- .../service/impl/SysRoleServiceImpl.java | 61 +- .../impl/SysUserOnlineServiceImpl.java | 13 +- .../service/impl/SysUserServiceImpl.java | 77 +- .../mapper/system/AccreditMapper.xml | 107 +- .../mapper/system/AssetModelMapper.xml | 60 +- .../mapper/system/DataAccessMapper.xml | 115 +- .../resources/mapper/system/DictMapper.xml | 29 +- .../resources/mapper/system/SysDeptMapper.xml | 6 +- .../mapper/system/SysDictDataMapper.xml | 6 +- .../mapper/system/SysDictTypeMapper.xml | 3 +- .../mapper/system/SysLogininforMapper.xml | 3 +- .../mapper/system/SysOperLogMapper.xml | 3 +- .../resources/mapper/system/SysRoleMapper.xml | 3 +- .../resources/mapper/system/SysUserMapper.xml | 12 +- pom.xml | 1 - 222 files changed, 5596 insertions(+), 5053 deletions(-) rename muyu-modules/{muyu-goods-tests/muyu-goods-test-clinet/src/main/java/com/muyu/edition/test/clinet/cllent => muyu-goods-edition/muyu-goods-edition-clinet/src/main/java/com/muyu/efition/clinet}/config/AccessConfig.java (79%) create mode 100644 muyu-modules/muyu-goods-edition/muyu-goods-edition-clinet/src/main/java/com/muyu/efition/clinet/config/AccessConfigRunner.java create mode 100644 muyu-modules/muyu-goods-edition/muyu-goods-edition-clinet/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 muyu-modules/muyu-goods-edition/muyu-goods-edition-clinet/src/main/resources/logback.xml create mode 100644 muyu-modules/muyu-goods-edition/muyu-goods-edition-common/src/main/resources/logback.xml create mode 100644 muyu-modules/muyu-goods-edition/muyu-goods-edition-remote/src/main/java/com/muyu/goods/edition/remote/RemoteDataManagerService.java create mode 100644 muyu-modules/muyu-goods-edition/muyu-goods-edition-remote/src/main/java/com/muyu/goods/edition/remote/factory/DataMangFacrory.java create mode 100644 muyu-modules/muyu-goods-edition/muyu-goods-edition-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 muyu-modules/muyu-goods-edition/muyu-goods-edition-remote/src/main/resources/logback.xml create mode 100644 muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/resources/logback.xml create mode 100644 muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/resources/mapper/goods/ConfigMapper.xml create mode 100644 muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/resources/mapper/goods/CopeMapper.xml create mode 100644 muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/resources/mapper/goods/EditionMapper.xml create mode 100644 muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/resources/mapper/goods/RuleEngineMapper.xml delete mode 100644 muyu-modules/muyu-goods-tests/muyu-goods-test-clinet/pom.xml delete mode 100644 muyu-modules/muyu-goods-tests/muyu-goods-test-clinet/src/main/java/com/muyu/edition/test/clinet/cllent/config/AccessConfigRunner.java delete mode 100644 muyu-modules/muyu-goods-tests/muyu-goods-test-common/pom.xml delete mode 100644 muyu-modules/muyu-goods-tests/muyu-goods-test-remote/pom.xml delete mode 100644 muyu-modules/muyu-goods-tests/muyu-goods-test-remote/src/main/java/com/muyu/data/test/remote/RemoteDataManagerService.java delete mode 100644 muyu-modules/muyu-goods-tests/muyu-goods-test-remote/src/main/java/com/muyu/data/test/remote/factory/DataMangFacrory.java delete mode 100644 muyu-modules/muyu-goods-tests/muyu-goods-test-server/pom.xml delete mode 100644 muyu-modules/muyu-goods-tests/muyu-goods-test-server/src/main/java/com/muyu/test/config/BloomFilterConfig.java delete mode 100644 muyu-modules/muyu-goods-tests/pom.xml diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java index 369ac94..e196be5 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java @@ -21,5 +21,5 @@ public class ServiceNameConstants { */ public static final String FILE_SERVICE = "muyu-file"; - public static final String TEST_MUYU = "muyu-test"; + public static final String EDITION_MUYU = "muyu-edition"; } diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/MuYuFileApplication.java b/muyu-modules/muyu-file/src/main/java/com/muyu/file/MuYuFileApplication.java index b2e172f..b80c74b 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/MuYuFileApplication.java +++ b/muyu-modules/muyu-file/src/main/java/com/muyu/file/MuYuFileApplication.java @@ -13,7 +13,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @EnableCustomSwagger2 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) public class MuYuFileApplication { - public static void main (String[] args) { + public static void main(String[] args) { SpringApplication.run(MuYuFileApplication.class, args); } } diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/config/MinioConfig.java b/muyu-modules/muyu-file/src/main/java/com/muyu/file/config/MinioConfig.java index af8c1bb..f4224da 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/config/MinioConfig.java +++ b/muyu-modules/muyu-file/src/main/java/com/muyu/file/config/MinioConfig.java @@ -33,40 +33,40 @@ public class MinioConfig { */ private String bucketName; - public String getUrl () { + public String getUrl() { return url; } - public void setUrl (String url) { + public void setUrl(String url) { this.url = url; } - public String getAccessKey () { + public String getAccessKey() { return accessKey; } - public void setAccessKey (String accessKey) { + public void setAccessKey(String accessKey) { this.accessKey = accessKey; } - public String getSecretKey () { + public String getSecretKey() { return secretKey; } - public void setSecretKey (String secretKey) { + public void setSecretKey(String secretKey) { this.secretKey = secretKey; } - public String getBucketName () { + public String getBucketName() { return bucketName; } - public void setBucketName (String bucketName) { + public void setBucketName(String bucketName) { this.bucketName = bucketName; } @Bean - public MinioClient getMinioClient () { + public MinioClient getMinioClient() { return MinioClient.builder().endpoint(url).credentials(accessKey, secretKey).build(); } } diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/config/ResourcesConfig.java b/muyu-modules/muyu-file/src/main/java/com/muyu/file/config/ResourcesConfig.java index 78a8be0..10c5458 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/config/ResourcesConfig.java +++ b/muyu-modules/muyu-file/src/main/java/com/muyu/file/config/ResourcesConfig.java @@ -27,7 +27,7 @@ public class ResourcesConfig implements WebMvcConfigurer { private String localFilePath; @Override - public void addResourceHandlers (ResourceHandlerRegistry registry) { + public void addResourceHandlers(ResourceHandlerRegistry registry) { /** 本地文件上传路径 */ registry.addResourceHandler(localFilePrefix + "/**") .addResourceLocations("file:" + localFilePath + File.separator); @@ -37,7 +37,7 @@ public class ResourcesConfig implements WebMvcConfigurer { * 开启跨域 */ @Override - public void addCorsMappings (CorsRegistry registry) { + public void addCorsMappings(CorsRegistry registry) { // 设置允许跨域的路由 registry.addMapping(localFilePrefix + "/**") // 设置允许跨域请求的域名 diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java b/muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java index 5f5ce31..05857f2 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java +++ b/muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java @@ -2,8 +2,8 @@ package com.muyu.file.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.file.FileUtils; -import com.muyu.file.service.ISysFileService; import com.muyu.common.system.domain.SysFile; +import com.muyu.file.service.ISysFileService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -27,7 +27,7 @@ public class SysFileController { * 文件上传请求 */ @PostMapping("upload") - public Result upload (MultipartFile file) { + public Result upload(MultipartFile file) { try { // 上传并返回访问地址 String url = sysFileService.uploadFile(file); diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java b/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java index 3cc2ee3..f1fe892 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java +++ b/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java @@ -31,13 +31,11 @@ public class FastDfsSysFileServiceImpl implements ISysFileService { * FastDfs文件上传接口 * * @param file 上传的文件 - * * @return 访问地址 - * * @throws Exception */ @Override - public String uploadFile (MultipartFile file) throws Exception { + public String uploadFile(MultipartFile file) throws Exception { InputStream inputStream = file.getInputStream(); StorePath storePath = storageClient.uploadFile(inputStream, file.getSize(), FileTypeUtils.getExtension(file), null); diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/ISysFileService.java b/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/ISysFileService.java index 416c26c..f0a33a8 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/ISysFileService.java +++ b/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/ISysFileService.java @@ -12,10 +12,8 @@ public interface ISysFileService { * 文件上传接口 * * @param file 上传的文件 - * * @return 访问地址 - * * @throws Exception */ - public String uploadFile (MultipartFile file) throws Exception; + public String uploadFile(MultipartFile file) throws Exception; } diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java b/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java index f3ce089..30d95eb 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java +++ b/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java @@ -36,13 +36,11 @@ public class LocalSysFileServiceImpl implements ISysFileService { * 本地文件上传接口 * * @param file 上传的文件 - * * @return 访问地址 - * * @throws Exception */ @Override - public String uploadFile (MultipartFile file) throws Exception { + public String uploadFile(MultipartFile file) throws Exception { String name = FileUploadUtils.upload(localFilePath, file); String url = domain + localFilePrefix + name; return url; diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java b/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java index 9a50de4..b329de2 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java +++ b/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java @@ -28,13 +28,11 @@ public class MinioSysFileServiceImpl implements ISysFileService { * Minio文件上传接口 * * @param file 上传的文件 - * * @return 访问地址 - * * @throws Exception */ @Override - public String uploadFile (MultipartFile file) throws Exception { + public String uploadFile(MultipartFile file) throws Exception { String fileName = FileUploadUtils.extractFilename(file); InputStream inputStream = file.getInputStream(); PutObjectArgs args = PutObjectArgs.builder() diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java b/muyu-modules/muyu-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java index 0a48cbf..b5e862e 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java +++ b/muyu-modules/muyu-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java @@ -38,12 +38,10 @@ public class FileUploadUtils { * * @param baseDir 相对应用的基目录 * @param file 上传的文件 - * * @return 文件名称 - * * @throws IOException */ - public static final String upload (String baseDir, MultipartFile file) throws IOException { + public static final String upload(String baseDir, MultipartFile file) throws IOException { try { return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); } catch (FileException fe) { @@ -59,15 +57,13 @@ public class FileUploadUtils { * @param baseDir 相对应用的基目录 * @param file 上传的文件 * @param allowedExtension 上传文件类型 - * * @return 返回上传成功的文件名 - * * @throws FileSizeLimitExceededException 如果超出最大大小 * @throws FileNameLengthLimitExceededException 文件名太长 * @throws IOException 比如读写文件出错时 * @throws InvalidExtensionException 文件校验异常 */ - public static final String upload (String baseDir, MultipartFile file, String[] allowedExtension) + public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension) throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException, InvalidExtensionException { int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length(); @@ -87,12 +83,12 @@ public class FileUploadUtils { /** * 编码文件名 */ - public static final String extractFilename (MultipartFile file) { + public static final String extractFilename(MultipartFile file) { return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(), FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), FileTypeUtils.getExtension(file)); } - private static final File getAbsoluteFile (String uploadDir, String fileName) throws IOException { + private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException { File desc = new File(uploadDir + File.separator + fileName); if (!desc.exists()) { @@ -103,7 +99,7 @@ public class FileUploadUtils { return desc.isAbsolute() ? desc : desc.getAbsoluteFile(); } - private static final String getPathFileName (String fileName) throws IOException { + private static final String getPathFileName(String fileName) throws IOException { String pathFileName = "/" + fileName; return pathFileName; } @@ -112,11 +108,10 @@ public class FileUploadUtils { * 文件大小校验 * * @param file 上传的文件 - * * @throws FileSizeLimitExceededException 如果超出最大大小 * @throws InvalidExtensionException 文件校验异常 */ - public static final void assertAllowed (MultipartFile file, String[] allowedExtension) + public static final void assertAllowed(MultipartFile file, String[] allowedExtension) throws FileSizeLimitExceededException, InvalidExtensionException { long size = file.getSize(); if (size > DEFAULT_MAX_SIZE) { @@ -149,10 +144,9 @@ public class FileUploadUtils { * * @param extension 上传文件类型 * @param allowedExtension 允许上传文件类型 - * * @return true/false */ - public static final boolean isAllowedExtension (String extension, String[] allowedExtension) { + public static final boolean isAllowedExtension(String extension, String[] allowedExtension) { for (String str : allowedExtension) { if (str.equalsIgnoreCase(extension)) { return true; diff --git a/muyu-modules/muyu-gen/pom.xml b/muyu-modules/muyu-gen/pom.xml index bd2a910..1d4e5a5 100644 --- a/muyu-modules/muyu-gen/pom.xml +++ b/muyu-modules/muyu-gen/pom.xml @@ -17,7 +17,7 @@ - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/MuYuGenApplication.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/MuYuGenApplication.java index a6898bf..bf87521 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/MuYuGenApplication.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/MuYuGenApplication.java @@ -16,7 +16,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableMyFeignClients @SpringBootApplication public class MuYuGenApplication { - public static void main (String[] args) { + public static void main(String[] args) { SpringApplication.run(MuYuGenApplication.class, args); } } diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/config/GenConfig.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/config/GenConfig.java index 65d9824..d389692 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/config/GenConfig.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/config/GenConfig.java @@ -31,35 +31,35 @@ public class GenConfig { */ public static String tablePrefix; - public static String getAuthor () { + public static String getAuthor() { return author; } - public void setAuthor (String author) { + public void setAuthor(String author) { GenConfig.author = author; } - public static String getPackageName () { + public static String getPackageName() { return packageName; } - public void setPackageName (String packageName) { + public void setPackageName(String packageName) { GenConfig.packageName = packageName; } - public static boolean getAutoRemovePre () { + public static boolean getAutoRemovePre() { return autoRemovePre; } - public void setAutoRemovePre (boolean autoRemovePre) { + public void setAutoRemovePre(boolean autoRemovePre) { GenConfig.autoRemovePre = autoRemovePre; } - public static String getTablePrefix () { + public static String getTablePrefix() { return tablePrefix; } - public void setTablePrefix (String tablePrefix) { + public void setTablePrefix(String tablePrefix) { GenConfig.tablePrefix = tablePrefix; } } diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java index 7fe822a..e4b55ef 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java @@ -1,8 +1,8 @@ package com.muyu.gen.controller; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.text.Convert; import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; @@ -41,7 +41,7 @@ public class GenController extends BaseController { */ @RequiresPermissions("tool:gen:list") @GetMapping("/list") - public Result> genList (GenTable genTable) { + public Result> genList(GenTable genTable) { startPage(); List list = genTableService.selectGenTableList(genTable); return getDataTable(list); @@ -52,7 +52,7 @@ public class GenController extends BaseController { */ @RequiresPermissions("tool:gen:query") @GetMapping(value = "/{tableId}") - public Result getInfo (@PathVariable Long tableId) { + public Result getInfo(@PathVariable Long tableId) { GenTable table = genTableService.selectGenTableById(tableId); List tables = genTableService.selectGenTableAll(); List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); @@ -68,7 +68,7 @@ public class GenController extends BaseController { */ @RequiresPermissions("tool:gen:list") @GetMapping("/db/list") - public Result> dataList (GenTable genTable) { + public Result> dataList(GenTable genTable) { startPage(); List list = genTableService.selectDbTableList(genTable); return getDataTable(list); @@ -78,7 +78,7 @@ public class GenController extends BaseController { * 查询数据表字段列表 */ @GetMapping(value = "/column/{tableId}") - public Result> columnList (Long tableId) { + public Result> columnList(Long tableId) { List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); return Result.success( TableDataInfo.builder() @@ -94,7 +94,7 @@ public class GenController extends BaseController { @RequiresPermissions("tool:gen:import") @Log(title = "代码生成", businessType = BusinessType.IMPORT) @PostMapping("/importTable") - public Result importTableSave (String tables) { + public Result importTableSave(String tables) { String[] tableNames = Convert.toStrArray(tables); // 查询表信息 List tableList = genTableService.selectDbTableListByNames(tableNames); @@ -108,7 +108,7 @@ public class GenController extends BaseController { @RequiresPermissions("tool:gen:edit") @Log(title = "代码生成", businessType = BusinessType.UPDATE) @PutMapping - public Result editSave (@Validated @RequestBody GenTable genTable) { + public Result editSave(@Validated @RequestBody GenTable genTable) { genTableService.validateEdit(genTable); genTableService.updateGenTable(genTable); return success(); @@ -120,7 +120,7 @@ public class GenController extends BaseController { @RequiresPermissions("tool:gen:remove") @Log(title = "代码生成", businessType = BusinessType.DELETE) @DeleteMapping("/{tableIds}") - public Result remove (@PathVariable Long[] tableIds) { + public Result remove(@PathVariable Long[] tableIds) { genTableService.deleteGenTableByIds(tableIds); return success(); } @@ -130,7 +130,7 @@ public class GenController extends BaseController { */ @RequiresPermissions("tool:gen:preview") @GetMapping("/preview/{tableId}") - public Result preview (@PathVariable("tableId") Long tableId) throws IOException { + public Result preview(@PathVariable("tableId") Long tableId) throws IOException { Map dataMap = genTableService.previewCode(tableId); return success(dataMap); } @@ -141,7 +141,7 @@ public class GenController extends BaseController { @RequiresPermissions("tool:gen:code") @Log(title = "代码生成", businessType = BusinessType.GENCODE) @GetMapping("/download/{tableName}") - public void download (HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException { + public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException { byte[] data = genTableService.downloadCode(tableName); genCode(response, data); } @@ -152,7 +152,7 @@ public class GenController extends BaseController { @RequiresPermissions("tool:gen:code") @Log(title = "代码生成", businessType = BusinessType.GENCODE) @GetMapping("/genCode/{tableName}") - public Result genCode (@PathVariable("tableName") String tableName) { + public Result genCode(@PathVariable("tableName") String tableName) { genTableService.generatorCode(tableName); return success(); } @@ -163,7 +163,7 @@ public class GenController extends BaseController { @RequiresPermissions("tool:gen:edit") @Log(title = "代码生成", businessType = BusinessType.UPDATE) @GetMapping("/synchDb/{tableName}") - public Result synchDb (@PathVariable("tableName") String tableName) { + public Result synchDb(@PathVariable("tableName") String tableName) { genTableService.synchDb(tableName); return success(); } @@ -174,7 +174,7 @@ public class GenController extends BaseController { @RequiresPermissions("tool:gen:code") @Log(title = "代码生成", businessType = BusinessType.GENCODE) @GetMapping("/batchGenCode") - public void batchGenCode (HttpServletResponse response, String tables) throws IOException { + public void batchGenCode(HttpServletResponse response, String tables) throws IOException { String[] tableNames = Convert.toStrArray(tables); byte[] data = genTableService.downloadCode(tableNames); genCode(response, data); @@ -183,7 +183,7 @@ public class GenController extends BaseController { /** * 生成zip文件 */ - private void genCode (HttpServletResponse response, byte[] data) throws IOException { + private void genCode(HttpServletResponse response, byte[] data) throws IOException { response.reset(); response.setHeader("Content-Disposition", "attachment; filename=\"muyu.zip\""); response.addHeader("Content-Length", String.valueOf(data.length)); diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTable.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTable.java index 690d8d0..6580e72 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTable.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTable.java @@ -15,8 +15,6 @@ import javax.validation.constraints.NotBlank; import java.util.List; - - /** * 业务表 gen_table * @@ -154,19 +152,19 @@ public class GenTable extends BaseEntity { */ private String parentMenuName; - public static boolean isSub (String tplCategory) { + public static boolean isSub(String tplCategory) { return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory); } - public static boolean isTree (String tplCategory) { + public static boolean isTree(String tplCategory) { return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory); } - public static boolean isCrud (String tplCategory) { + public static boolean isCrud(String tplCategory) { return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory); } - public static boolean isSuperColumn (String tplCategory, String javaField) { + public static boolean isSuperColumn(String tplCategory, String javaField) { if (isTree(tplCategory)) { return StringUtils.equalsAnyIgnoreCase(javaField, ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY)); @@ -174,203 +172,203 @@ public class GenTable extends BaseEntity { return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY); } - public Long getTableId () { + public Long getTableId() { return tableId; } - public void setTableId (Long tableId) { + public void setTableId(Long tableId) { this.tableId = tableId; } - public String getTableName () { + public String getTableName() { return tableName; } - public void setTableName (String tableName) { + public void setTableName(String tableName) { this.tableName = tableName; } - public String getTableComment () { + public String getTableComment() { return tableComment; } - public void setTableComment (String tableComment) { + public void setTableComment(String tableComment) { this.tableComment = tableComment; } - public String getSubTableName () { + public String getSubTableName() { return subTableName; } - public void setSubTableName (String subTableName) { + public void setSubTableName(String subTableName) { this.subTableName = subTableName; } - public String getSubTableFkName () { + public String getSubTableFkName() { return subTableFkName; } - public void setSubTableFkName (String subTableFkName) { + public void setSubTableFkName(String subTableFkName) { this.subTableFkName = subTableFkName; } - public String getClassName () { + public String getClassName() { return className; } - public void setClassName (String className) { + public void setClassName(String className) { this.className = className; } - public String getTplCategory () { + public String getTplCategory() { return tplCategory; } - public void setTplCategory (String tplCategory) { + public void setTplCategory(String tplCategory) { this.tplCategory = tplCategory; } - public String getPackageName () { + public String getPackageName() { return packageName; } - public void setPackageName (String packageName) { + public void setPackageName(String packageName) { this.packageName = packageName; } - public String getModuleName () { + public String getModuleName() { return moduleName; } - public void setModuleName (String moduleName) { + public void setModuleName(String moduleName) { this.moduleName = moduleName; } - public String getBusinessName () { + public String getBusinessName() { return businessName; } - public void setBusinessName (String businessName) { + public void setBusinessName(String businessName) { this.businessName = businessName; } - public String getFunctionName () { + public String getFunctionName() { return functionName; } - public void setFunctionName (String functionName) { + public void setFunctionName(String functionName) { this.functionName = functionName; } - public String getFunctionAuthor () { + public String getFunctionAuthor() { return functionAuthor; } - public void setFunctionAuthor (String functionAuthor) { + public void setFunctionAuthor(String functionAuthor) { this.functionAuthor = functionAuthor; } - public String getGenType () { + public String getGenType() { return genType; } - public void setGenType (String genType) { + public void setGenType(String genType) { this.genType = genType; } - public String getGenPath () { + public String getGenPath() { return genPath; } - public void setGenPath (String genPath) { + public void setGenPath(String genPath) { this.genPath = genPath; } - public GenTableColumn getPkColumn () { + public GenTableColumn getPkColumn() { return pkColumn; } - public void setPkColumn (GenTableColumn pkColumn) { + public void setPkColumn(GenTableColumn pkColumn) { this.pkColumn = pkColumn; } - public GenTable getSubTable () { + public GenTable getSubTable() { return subTable; } - public void setSubTable (GenTable subTable) { + public void setSubTable(GenTable subTable) { this.subTable = subTable; } - public List getColumns () { + public List getColumns() { return columns; } - public void setColumns (List columns) { + public void setColumns(List columns) { this.columns = columns; } - public String getOptions () { + public String getOptions() { return options; } - public void setOptions (String options) { + public void setOptions(String options) { this.options = options; } - public String getTreeCode () { + public String getTreeCode() { return treeCode; } - public void setTreeCode (String treeCode) { + public void setTreeCode(String treeCode) { this.treeCode = treeCode; } - public String getTreeParentCode () { + public String getTreeParentCode() { return treeParentCode; } - public void setTreeParentCode (String treeParentCode) { + public void setTreeParentCode(String treeParentCode) { this.treeParentCode = treeParentCode; } - public String getTreeName () { + public String getTreeName() { return treeName; } - public void setTreeName (String treeName) { + public void setTreeName(String treeName) { this.treeName = treeName; } - public String getParentMenuId () { + public String getParentMenuId() { return parentMenuId; } - public void setParentMenuId (String parentMenuId) { + public void setParentMenuId(String parentMenuId) { this.parentMenuId = parentMenuId; } - public String getParentMenuName () { + public String getParentMenuName() { return parentMenuName; } - public void setParentMenuName (String parentMenuName) { + public void setParentMenuName(String parentMenuName) { this.parentMenuName = parentMenuName; } - public boolean isSub () { + public boolean isSub() { return isSub(this.tplCategory); } - public boolean isTree () { + public boolean isTree() { return isTree(this.tplCategory); } - public boolean isCrud () { + public boolean isCrud() { return isCrud(this.tplCategory); } - public boolean isSuperColumn (String javaField) { + public boolean isSuperColumn(String javaField) { return isSuperColumn(this.tplCategory, javaField); } } diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java index 638b0ab..09a8e6e 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java @@ -114,7 +114,7 @@ public class GenTableColumn extends BaseEntity { */ private Integer sort; - public static boolean isSuperColumn (String javaField) { + public static boolean isSuperColumn(String javaField) { return StringUtils.equalsAnyIgnoreCase(javaField, // BaseEntity "createBy", "createTime", "updateBy", "updateTime", "remark", @@ -122,224 +122,224 @@ public class GenTableColumn extends BaseEntity { "parentName", "parentId", "orderNum", "ancestors"); } - public static boolean isUsableColumn (String javaField) { + public static boolean isUsableColumn(String javaField) { // isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单 return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark"); } - public Long getColumnId () { + public Long getColumnId() { return columnId; } - public void setColumnId (Long columnId) { + public void setColumnId(Long columnId) { this.columnId = columnId; } - public Long getTableId () { + public Long getTableId() { return tableId; } - public void setTableId (Long tableId) { + public void setTableId(Long tableId) { this.tableId = tableId; } - public String getColumnName () { + public String getColumnName() { return columnName; } - public void setColumnName (String columnName) { + public void setColumnName(String columnName) { this.columnName = columnName; } - public String getColumnComment () { + public String getColumnComment() { return columnComment; } - public void setColumnComment (String columnComment) { + public void setColumnComment(String columnComment) { this.columnComment = columnComment; } - public String getColumnType () { + public String getColumnType() { return columnType; } - public void setColumnType (String columnType) { + public void setColumnType(String columnType) { this.columnType = columnType; } - public String getJavaType () { + public String getJavaType() { return javaType; } - public void setJavaType (String javaType) { + public void setJavaType(String javaType) { this.javaType = javaType; } - public String getJavaField () { + public String getJavaField() { return javaField; } - public void setJavaField (String javaField) { + public void setJavaField(String javaField) { this.javaField = javaField; } - public String getCapJavaField () { + public String getCapJavaField() { return StringUtils.capitalize(javaField); } - public String getIsPk () { + public String getIsPk() { return isPk; } - public void setIsPk (String isPk) { + public void setIsPk(String isPk) { this.isPk = isPk; } - public boolean isPk () { + public boolean isPk() { return isPk(this.isPk); } - public boolean isPk (String isPk) { + public boolean isPk(String isPk) { return isPk != null && StringUtils.equals("1", isPk); } - public String getIsIncrement () { + public String getIsIncrement() { return isIncrement; } - public void setIsIncrement (String isIncrement) { + public void setIsIncrement(String isIncrement) { this.isIncrement = isIncrement; } - public boolean isIncrement () { + public boolean isIncrement() { return isIncrement(this.isIncrement); } - public boolean isIncrement (String isIncrement) { + public boolean isIncrement(String isIncrement) { return isIncrement != null && StringUtils.equals("1", isIncrement); } - public String getIsRequired () { + public String getIsRequired() { return isRequired; } - public void setIsRequired (String isRequired) { + public void setIsRequired(String isRequired) { this.isRequired = isRequired; } - public boolean isRequired () { + public boolean isRequired() { return isRequired(this.isRequired); } - public boolean isRequired (String isRequired) { + public boolean isRequired(String isRequired) { return isRequired != null && StringUtils.equals("1", isRequired); } - public String getIsInsert () { + public String getIsInsert() { return isInsert; } - public void setIsInsert (String isInsert) { + public void setIsInsert(String isInsert) { this.isInsert = isInsert; } - public boolean isInsert () { + public boolean isInsert() { return isInsert(this.isInsert); } - public boolean isInsert (String isInsert) { + public boolean isInsert(String isInsert) { return isInsert != null && StringUtils.equals("1", isInsert); } - public String getIsEdit () { + public String getIsEdit() { return isEdit; } - public void setIsEdit (String isEdit) { + public void setIsEdit(String isEdit) { this.isEdit = isEdit; } - public boolean isEdit () { + public boolean isEdit() { return isInsert(this.isEdit); } - public boolean isEdit (String isEdit) { + public boolean isEdit(String isEdit) { return isEdit != null && StringUtils.equals("1", isEdit); } - public String getIsList () { + public String getIsList() { return isList; } - public void setIsList (String isList) { + public void setIsList(String isList) { this.isList = isList; } - public boolean isList () { + public boolean isList() { return isList(this.isList); } - public boolean isList (String isList) { + public boolean isList(String isList) { return isList != null && StringUtils.equals("1", isList); } - public String getIsQuery () { + public String getIsQuery() { return isQuery; } - public void setIsQuery (String isQuery) { + public void setIsQuery(String isQuery) { this.isQuery = isQuery; } - public boolean isQuery () { + public boolean isQuery() { return isQuery(this.isQuery); } - public boolean isQuery (String isQuery) { + public boolean isQuery(String isQuery) { return isQuery != null && StringUtils.equals("1", isQuery); } - public String getQueryType () { + public String getQueryType() { return queryType; } - public void setQueryType (String queryType) { + public void setQueryType(String queryType) { this.queryType = queryType; } - public String getHtmlType () { + public String getHtmlType() { return htmlType; } - public void setHtmlType (String htmlType) { + public void setHtmlType(String htmlType) { this.htmlType = htmlType; } - public String getDictType () { + public String getDictType() { return dictType; } - public void setDictType (String dictType) { + public void setDictType(String dictType) { this.dictType = dictType; } - public Integer getSort () { + public Integer getSort() { return sort; } - public void setSort (Integer sort) { + public void setSort(Integer sort) { this.sort = sort; } - public boolean isSuperColumn () { + public boolean isSuperColumn() { return isSuperColumn(this.javaField); } - public boolean isUsableColumn () { + public boolean isUsableColumn() { return isUsableColumn(javaField); } - public String readConverterExp () { + public String readConverterExp() { String remarks = StringUtils.substringBetween(this.columnComment, "（", "）"); StringBuffer sb = new StringBuffer(); if (StringUtils.isNotEmpty(remarks)) { diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java index 5825d59..c2de1b7 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java @@ -15,53 +15,47 @@ public interface GenTableColumnMapper extends BaseMapper { * 根据表名称查询列信息 * * @param tableName 表名称 - * * @return 列信息 */ - List selectDbTableColumnsByName (String tableName); + List selectDbTableColumnsByName(String tableName); /** * 查询业务字段列表 * * @param tableId 业务字段编号 - * * @return 业务字段集合 */ - List selectGenTableColumnListByTableId (Long tableId); + List selectGenTableColumnListByTableId(Long tableId); /** * 新增业务字段 * * @param genTableColumn 业务字段信息 - * * @return 结果 */ - int insertGenTableColumn (GenTableColumn genTableColumn); + int insertGenTableColumn(GenTableColumn genTableColumn); /** * 修改业务字段 * * @param genTableColumn 业务字段信息 - * * @return 结果 */ - int updateGenTableColumn (GenTableColumn genTableColumn); + int updateGenTableColumn(GenTableColumn genTableColumn); /** * 删除业务字段 * * @param genTableColumns 列数据 - * * @return 结果 */ - int deleteGenTableColumns (List genTableColumns); + int deleteGenTableColumns(List genTableColumns); /** * 批量删除业务字段 * * @param ids 需要删除的数据ID - * * @return 结果 */ - int deleteGenTableColumnByIds (Long[] ids); + int deleteGenTableColumnByIds(Long[] ids); } diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java index 66858cb..f9fc00d 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java @@ -15,78 +15,70 @@ public interface GenTableMapper extends BaseMapper { * 查询业务列表 * * @param genTable 业务信息 - * * @return 业务集合 */ - List selectGenTableList (GenTable genTable); + List selectGenTableList(GenTable genTable); /** * 查询据库列表 * * @param genTable 业务信息 - * * @return 数据库表集合 */ - List selectDbTableList (GenTable genTable); + List selectDbTableList(GenTable genTable); /** * 查询据库列表 * * @param tableNames 表名称组 - * * @return 数据库表集合 */ - List selectDbTableListByNames (String[] tableNames); + List selectDbTableListByNames(String[] tableNames); /** * 查询所有表信息 * * @return 表信息集合 */ - List selectGenTableAll (); + List selectGenTableAll(); /** * 查询表ID业务信息 * * @param id 业务ID - * * @return 业务信息 */ - GenTable selectGenTableById (Long id); + GenTable selectGenTableById(Long id); /** * 查询表名称业务信息 * * @param tableName 表名称 - * * @return 业务信息 */ - GenTable selectGenTableByName (String tableName); + GenTable selectGenTableByName(String tableName); /** * 新增业务 * * @param genTable 业务信息 - * * @return 结果 */ - int insertGenTable (GenTable genTable); + int insertGenTable(GenTable genTable); /** * 修改业务 * * @param genTable 业务信息 - * * @return 结果 */ - int updateGenTable (GenTable genTable); + int updateGenTable(GenTable genTable); /** * 批量删除业务 * * @param ids 需要删除的数据ID - * * @return 结果 */ - int deleteGenTableByIds (Long[] ids); + int deleteGenTableByIds(Long[] ids); } diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java index 895b1ed..3aa473f 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java @@ -22,11 +22,10 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService { * 查询业务字段列表 * * @param tableId 业务字段编号 - * * @return 业务字段集合 */ @Override - public List selectGenTableColumnListByTableId (Long tableId) { + public List selectGenTableColumnListByTableId(Long tableId) { return genTableColumnMapper.selectGenTableColumnListByTableId(tableId); } @@ -34,11 +33,10 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService { * 新增业务字段 * * @param genTableColumn 业务字段信息 - * * @return 结果 */ @Override - public int insertGenTableColumn (GenTableColumn genTableColumn) { + public int insertGenTableColumn(GenTableColumn genTableColumn) { return genTableColumnMapper.insertGenTableColumn(genTableColumn); } @@ -46,11 +44,10 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService { * 修改业务字段 * * @param genTableColumn 业务字段信息 - * * @return 结果 */ @Override - public int updateGenTableColumn (GenTableColumn genTableColumn) { + public int updateGenTableColumn(GenTableColumn genTableColumn) { return genTableColumnMapper.updateGenTableColumn(genTableColumn); } @@ -58,11 +55,10 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService { * 删除业务字段对象 * * @param ids 需要删除的数据ID - * * @return 结果 */ @Override - public int deleteGenTableColumnByIds (String ids) { + public int deleteGenTableColumnByIds(String ids) { return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids)); } } diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java index 6273779..9f426fc 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java @@ -58,10 +58,9 @@ public class GenTableServiceImpl implements IGenTableService { * * @param table 业务表信息 * @param template 模板文件路径 - * * @return 生成地址 */ - public static String getGenPath (GenTable table, String template) { + public static String getGenPath(GenTable table, String template) { String genPath = table.getGenPath(); if (StringUtils.equals(genPath, "/")) { return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table); @@ -73,11 +72,10 @@ public class GenTableServiceImpl implements IGenTableService { * 查询业务信息 * * @param id 业务ID - * * @return 业务信息 */ @Override - public GenTable selectGenTableById (Long id) { + public GenTable selectGenTableById(Long id) { GenTable genTable = genTableMapper.selectGenTableById(id); setTableFromOptions(genTable); return genTable; @@ -87,11 +85,10 @@ public class GenTableServiceImpl implements IGenTableService { * 查询业务列表 * * @param genTable 业务信息 - * * @return 业务集合 */ @Override - public List selectGenTableList (GenTable genTable) { + public List selectGenTableList(GenTable genTable) { return genTableMapper.selectGenTableList(genTable); } @@ -99,11 +96,10 @@ public class GenTableServiceImpl implements IGenTableService { * 查询据库列表 * * @param genTable 业务信息 - * * @return 数据库表集合 */ @Override - public List selectDbTableList (GenTable genTable) { + public List selectDbTableList(GenTable genTable) { return genTableMapper.selectDbTableList(genTable); } @@ -111,11 +107,10 @@ public class GenTableServiceImpl implements IGenTableService { * 查询据库列表 * * @param tableNames 表名称组 - * * @return 数据库表集合 */ @Override - public List selectDbTableListByNames (String[] tableNames) { + public List selectDbTableListByNames(String[] tableNames) { return genTableMapper.selectDbTableListByNames(tableNames); } @@ -125,7 +120,7 @@ public class GenTableServiceImpl implements IGenTableService { * @return 表信息集合 */ @Override - public List selectGenTableAll () { + public List selectGenTableAll() { return genTableMapper.selectGenTableAll(); } @@ -133,12 +128,11 @@ public class GenTableServiceImpl implements IGenTableService { * 修改业务 * * @param genTable 业务信息 - * * @return 结果 */ @Override @Transactional(rollbackFor = Exception.class) - public void updateGenTable (GenTable genTable) { + public void updateGenTable(GenTable genTable) { String options = JSON.toJSONString(genTable.getParams()); genTable.setOptions(options); int row = genTableMapper.updateGenTable(genTable); @@ -153,12 +147,11 @@ public class GenTableServiceImpl implements IGenTableService { * 删除业务对象 * * @param tableIds 需要删除的数据ID - * * @return 结果 */ @Override @Transactional(rollbackFor = Exception.class) - public void deleteGenTableByIds (Long[] tableIds) { + public void deleteGenTableByIds(Long[] tableIds) { genTableMapper.deleteGenTableByIds(tableIds); genTableColumnMapper.deleteGenTableColumnByIds(tableIds); } @@ -170,7 +163,7 @@ public class GenTableServiceImpl implements IGenTableService { */ @Override @Transactional(rollbackFor = Exception.class) - public void importGenTable (List tableList) { + public void importGenTable(List tableList) { String operName = SecurityUtils.getUsername(); try { for (GenTable table : tableList) { @@ -195,11 +188,10 @@ public class GenTableServiceImpl implements IGenTableService { * 预览代码 * * @param tableId 表编号 - * * @return 预览数据列表 */ @Override - public Map previewCode (Long tableId) { + public Map previewCode(Long tableId) { Map dataMap = new LinkedHashMap<>(); // 查询表信息 GenTable table = genTableMapper.selectGenTableById(tableId); @@ -227,11 +219,10 @@ public class GenTableServiceImpl implements IGenTableService { * 生成代码（下载方式） * * @param tableName 表名称 - * * @return 数据 */ @Override - public byte[] downloadCode (String tableName) { + public byte[] downloadCode(String tableName) { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); ZipOutputStream zip = new ZipOutputStream(outputStream); generatorCode(tableName, zip); @@ -245,7 +236,7 @@ public class GenTableServiceImpl implements IGenTableService { * @param tableName 表名称 */ @Override - public void generatorCode (String tableName) { + public void generatorCode(String tableName) { // 查询表信息 GenTable table = genTableMapper.selectGenTableByName(tableName); // 设置主子表信息 @@ -282,7 +273,7 @@ public class GenTableServiceImpl implements IGenTableService { */ @Override @Transactional(rollbackFor = Exception.class) - public void synchDb (String tableName) { + public void synchDb(String tableName) { GenTable table = genTableMapper.selectGenTableByName(tableName); List tableColumns = table.getColumns(); Map tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity())); @@ -326,11 +317,10 @@ public class GenTableServiceImpl implements IGenTableService { * 批量生成代码（下载方式） * * @param tableNames 表数组 - * * @return 数据 */ @Override - public byte[] downloadCode (String[] tableNames) { + public byte[] downloadCode(String[] tableNames) { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); ZipOutputStream zip = new ZipOutputStream(outputStream); for (String tableName : tableNames) { @@ -343,7 +333,7 @@ public class GenTableServiceImpl implements IGenTableService { /** * 查询表信息并生成代码 */ - private void generatorCode (String tableName, ZipOutputStream zip) { + private void generatorCode(String tableName, ZipOutputStream zip) { // 查询表信息 GenTable table = genTableMapper.selectGenTableByName(tableName); // 设置主子表信息 @@ -381,7 +371,7 @@ public class GenTableServiceImpl implements IGenTableService { * @param genTable 业务信息 */ @Override - public void validateEdit (GenTable genTable) { + public void validateEdit(GenTable genTable) { if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) { String options = JSON.toJSONString(genTable.getParams()); JSONObject paramsObj = JSON.parseObject(options); @@ -406,7 +396,7 @@ public class GenTableServiceImpl implements IGenTableService { * * @param table 业务表信息 */ - public void setPkColumn (GenTable table) { + public void setPkColumn(GenTable table) { for (GenTableColumn column : table.getColumns()) { if (column.isPk()) { table.setPkColumn(column); @@ -434,7 +424,7 @@ public class GenTableServiceImpl implements IGenTableService { * * @param table 业务表信息 */ - public void setSubTable (GenTable table) { + public void setSubTable(GenTable table) { String subTableName = table.getSubTableName(); if (StringUtils.isNotEmpty(subTableName)) { table.setSubTable(genTableMapper.selectGenTableByName(subTableName)); @@ -446,7 +436,7 @@ public class GenTableServiceImpl implements IGenTableService { * * @param genTable 设置后的生成对象 */ - public void setTableFromOptions (GenTable genTable) { + public void setTableFromOptions(GenTable genTable) { JSONObject paramsObj = JSON.parseObject(genTable.getOptions()); if (StringUtils.isNotNull(paramsObj)) { String treeCode = paramsObj.getString(GenConstants.TREE_CODE); diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java index b60ea57..219a821 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java @@ -14,35 +14,31 @@ public interface IGenTableColumnService { * 查询业务字段列表 * * @param tableId 业务字段编号 - * * @return 业务字段集合 */ - List selectGenTableColumnListByTableId (Long tableId); + List selectGenTableColumnListByTableId(Long tableId); /** * 新增业务字段 * * @param genTableColumn 业务字段信息 - * * @return 结果 */ - int insertGenTableColumn (GenTableColumn genTableColumn); + int insertGenTableColumn(GenTableColumn genTableColumn); /** * 修改业务字段 * * @param genTableColumn 业务字段信息 - * * @return 结果 */ - int updateGenTableColumn (GenTableColumn genTableColumn); + int updateGenTableColumn(GenTableColumn genTableColumn); /** * 删除业务字段信息 * * @param ids 需要删除的数据ID - * * @return 结果 */ - int deleteGenTableColumnByIds (String ids); + int deleteGenTableColumnByIds(String ids); } diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableService.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableService.java index f34dc37..9e91381 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableService.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableService.java @@ -15,117 +15,107 @@ public interface IGenTableService { * 查询业务列表 * * @param genTable 业务信息 - * * @return 业务集合 */ - List selectGenTableList (GenTable genTable); + List selectGenTableList(GenTable genTable); /** * 查询据库列表 * * @param genTable 业务信息 - * * @return 数据库表集合 */ - List selectDbTableList (GenTable genTable); + List selectDbTableList(GenTable genTable); /** * 查询据库列表 * * @param tableNames 表名称组 - * * @return 数据库表集合 */ - List selectDbTableListByNames (String[] tableNames); + List selectDbTableListByNames(String[] tableNames); /** * 查询所有表信息 * * @return 表信息集合 */ - List selectGenTableAll (); + List selectGenTableAll(); /** * 查询业务信息 * * @param id 业务ID - * * @return 业务信息 */ - GenTable selectGenTableById (Long id); + GenTable selectGenTableById(Long id); /** * 修改业务 * * @param genTable 业务信息 - * * @return 结果 */ - void updateGenTable (GenTable genTable); + void updateGenTable(GenTable genTable); /** * 删除业务信息 * * @param tableIds 需要删除的表数据ID - * * @return 结果 */ - void deleteGenTableByIds (Long[] tableIds); + void deleteGenTableByIds(Long[] tableIds); /** * 导入表结构 * * @param tableList 导入表列表 */ - void importGenTable (List tableList); + void importGenTable(List tableList); /** * 预览代码 * * @param tableId 表编号 - * * @return 预览数据列表 */ - Map previewCode (Long tableId); + Map previewCode(Long tableId); /** * 生成代码（下载方式） * * @param tableName 表名称 - * * @return 数据 */ - byte[] downloadCode (String tableName); + byte[] downloadCode(String tableName); /** * 生成代码（自定义路径） * * @param tableName 表名称 - * * @return 数据 */ - void generatorCode (String tableName); + void generatorCode(String tableName); /** * 同步数据库 * * @param tableName 表名称 */ - void synchDb (String tableName); + void synchDb(String tableName); /** * 批量生成代码（下载方式） * * @param tableNames 表数组 - * * @return 数据 */ - byte[] downloadCode (String[] tableNames); + byte[] downloadCode(String[] tableNames); /** * 修改保存参数校验 * * @param genTable 业务信息 */ - void validateEdit (GenTable genTable); + void validateEdit(GenTable genTable); } diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/GenUtils.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/GenUtils.java index 5aea1f2..c0bce3d 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/GenUtils.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/GenUtils.java @@ -18,7 +18,7 @@ public class GenUtils { /** * 初始化表信息 */ - public static void initTable (GenTable genTable, String operName) { + public static void initTable(GenTable genTable, String operName) { genTable.setClassName(convertClassName(genTable.getTableName())); genTable.setPackageName(GenConfig.getPackageName()); genTable.setModuleName(getModuleName(GenConfig.getPackageName())); @@ -31,7 +31,7 @@ public class GenUtils { /** * 初始化列属性字段 */ - public static void initColumnField (GenTableColumn column, GenTable table) { + public static void initColumnField(GenTableColumn column, GenTable table) { String dataType = getDbType(column.getColumnType()); String columnName = column.getColumnName(); column.setTableId(table.getTableId()); @@ -116,10 +116,9 @@ public class GenUtils { * * @param arr 数组 * @param targetValue 值 - * * @return 是否包含 */ - public static boolean arraysContains (String[] arr, String targetValue) { + public static boolean arraysContains(String[] arr, String targetValue) { return Arrays.asList(arr).contains(targetValue); } @@ -127,10 +126,9 @@ public class GenUtils { * 获取模块名 * * @param packageName 包名 - * * @return 模块名 */ - public static String getModuleName (String packageName) { + public static String getModuleName(String packageName) { int lastIndex = packageName.lastIndexOf("."); int nameLength = packageName.length(); return StringUtils.substring(packageName, lastIndex + 1, nameLength); @@ -140,10 +138,9 @@ public class GenUtils { * 获取业务名 * * @param tableName 表名 - * * @return 业务名 */ - public static String getBusinessName (String tableName) { + public static String getBusinessName(String tableName) { int lastIndex = tableName.lastIndexOf("_"); int nameLength = tableName.length(); return StringUtils.substring(tableName, lastIndex + 1, nameLength); @@ -153,10 +150,9 @@ public class GenUtils { * 表名转换成Java类名 * * @param tableName 表名称 - * * @return 类名 */ - public static String convertClassName (String tableName) { + public static String convertClassName(String tableName) { boolean autoRemovePre = GenConfig.getAutoRemovePre(); String tablePrefix = GenConfig.getTablePrefix(); if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) { @@ -171,10 +167,9 @@ public class GenUtils { * * @param replacementm 替换值 * @param searchList 替换列表 - * * @return */ - public static String replaceFirst (String replacementm, String[] searchList) { + public static String replaceFirst(String replacementm, String[] searchList) { String text = replacementm; for (String searchString : searchList) { if (replacementm.startsWith(searchString)) { @@ -189,10 +184,9 @@ public class GenUtils { * 关键字替换 * * @param text 需要被替换的名字 - * * @return 替换后的名字 */ - public static String replaceText (String text) { + public static String replaceText(String text) { return RegExUtils.replaceAll(text, "(?:表|若依)", ""); } @@ -200,10 +194,9 @@ public class GenUtils { * 获取数据库类型字段 * * @param columnType 列类型 - * * @return 截取后的列类型 */ - public static String getDbType (String columnType) { + public static String getDbType(String columnType) { if (StringUtils.indexOf(columnType, "(") > 0) { return StringUtils.substringBefore(columnType, "("); } else { @@ -215,10 +208,9 @@ public class GenUtils { * 获取字段长度 * * @param columnType 列类型 - * * @return 截取后的列类型 */ - public static Integer getColumnLength (String columnType) { + public static Integer getColumnLength(String columnType) { if (StringUtils.indexOf(columnType, "(") > 0) { String length = StringUtils.substringBetween(columnType, "(", ")"); return Integer.valueOf(length); diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityInitializer.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityInitializer.java index cc171b4..b6be934 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityInitializer.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityInitializer.java @@ -14,7 +14,7 @@ public class VelocityInitializer { /** * 初始化vm方法 */ - public static void initVelocity () { + public static void initVelocity() { Properties p = new Properties(); try { // 加载classpath目录下的vm文件 diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java index 9305ff7..a675c46 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java @@ -40,7 +40,7 @@ public class VelocityUtils { * * @return 模板列表 */ - public static VelocityContext prepareContext (GenTable genTable) { + public static VelocityContext prepareContext(GenTable genTable) { String moduleName = genTable.getModuleName(); String businessName = genTable.getBusinessName(); String packageName = genTable.getPackageName(); @@ -76,14 +76,14 @@ public class VelocityUtils { return velocityContext; } - public static void setMenuVelocityContext (VelocityContext context, GenTable genTable) { + public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) { String options = genTable.getOptions(); JSONObject paramsObj = JSON.parseObject(options); String parentMenuId = getParentMenuId(paramsObj); context.put("parentMenuId", parentMenuId); } - public static void setTreeVelocityContext (VelocityContext context, GenTable genTable) { + public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) { String options = genTable.getOptions(); JSONObject paramsObj = JSON.parseObject(options); String treeCode = getTreecode(paramsObj); @@ -102,7 +102,7 @@ public class VelocityUtils { } } - public static void setSubVelocityContext (VelocityContext context, GenTable genTable) { + public static void setSubVelocityContext(VelocityContext context, GenTable genTable) { GenTable subTable = genTable.getSubTable(); String subTableName = genTable.getSubTableName(); String subTableFkName = genTable.getSubTableFkName(); @@ -124,7 +124,7 @@ public class VelocityUtils { * * @return 模板列表 */ - public static List getTemplateList (String tplCategory) { + public static List getTemplateList(String tplCategory) { List templates = new ArrayList(); templates.add("vm/java/domain.java.vm"); templates.add("vm/java/mapper.java.vm"); @@ -148,7 +148,7 @@ public class VelocityUtils { /** * 获取文件名 */ - public static String getFileName (String template, GenTable genTable) { + public static String getFileName(String template, GenTable genTable) { // 文件名称 String fileName = ""; // 包路径 @@ -195,10 +195,9 @@ public class VelocityUtils { * 获取包前缀 * * @param packageName 包名称 - * * @return 包前缀名称 */ - public static String getPackagePrefix (String packageName) { + public static String getPackagePrefix(String packageName) { int lastIndex = packageName.lastIndexOf("."); return StringUtils.substring(packageName, 0, lastIndex); } @@ -207,10 +206,9 @@ public class VelocityUtils { * 根据列类型获取导入包 * * @param genTable 业务表对象 - * * @return 返回需要导入的包列表 */ - public static HashSet getImportList (GenTable genTable) { + public static HashSet getImportList(GenTable genTable) { List columns = genTable.getColumns(); GenTable subGenTable = genTable.getSubTable(); HashSet importList = new HashSet(); @@ -232,10 +230,9 @@ public class VelocityUtils { * 根据列类型获取字典组 * * @param genTable 业务表对象 - * * @return 返回字典组 */ - public static String getDicts (GenTable genTable) { + public static String getDicts(GenTable genTable) { List columns = genTable.getColumns(); Set dicts = new HashSet(); addDicts(dicts, columns); @@ -252,7 +249,7 @@ public class VelocityUtils { * @param dicts 字典列表 * @param columns 列集合 */ - public static void addDicts (Set dicts, List columns) { + public static void addDicts(Set dicts, List columns) { for (GenTableColumn column : columns) { if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny( column.getHtmlType(), @@ -267,10 +264,9 @@ public class VelocityUtils { * * @param moduleName 模块名称 * @param businessName 业务名称 - * * @return 返回权限前缀 */ - public static String getPermissionPrefix (String moduleName, String businessName) { + public static String getPermissionPrefix(String moduleName, String businessName) { return StringUtils.format("{}:{}", moduleName, businessName); } @@ -278,10 +274,9 @@ public class VelocityUtils { * 获取上级菜单ID字段 * * @param paramsObj 生成其他选项 - * * @return 上级菜单ID字段 */ - public static String getParentMenuId (JSONObject paramsObj) { + public static String getParentMenuId(JSONObject paramsObj) { if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID) && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID))) { return paramsObj.getString(GenConstants.PARENT_MENU_ID); @@ -293,10 +288,9 @@ public class VelocityUtils { * 获取树编码 * * @param paramsObj 生成其他选项 - * * @return 树编码 */ - public static String getTreecode (JSONObject paramsObj) { + public static String getTreecode(JSONObject paramsObj) { if (paramsObj.containsKey(GenConstants.TREE_CODE)) { return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE)); } @@ -307,10 +301,9 @@ public class VelocityUtils { * 获取树父编码 * * @param paramsObj 生成其他选项 - * * @return 树父编码 */ - public static String getTreeParentCode (JSONObject paramsObj) { + public static String getTreeParentCode(JSONObject paramsObj) { if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) { return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE)); } @@ -321,10 +314,9 @@ public class VelocityUtils { * 获取树名称 * * @param paramsObj 生成其他选项 - * * @return 树名称 */ - public static String getTreeName (JSONObject paramsObj) { + public static String getTreeName(JSONObject paramsObj) { if (paramsObj.containsKey(GenConstants.TREE_NAME)) { return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME)); } @@ -335,10 +327,9 @@ public class VelocityUtils { * 获取需要在哪一列上面显示展开按钮 * * @param genTable 业务表对象 - * * @return 展开按钮列序号 */ - public static int getExpandColumn (GenTable genTable) { + public static int getExpandColumn(GenTable genTable) { String options = genTable.getOptions(); JSONObject paramsObj = JSON.parseObject(options); String treeName = paramsObj.getString(GenConstants.TREE_NAME); diff --git a/muyu-modules/muyu-gen/src/main/resources/logback.xml b/muyu-modules/muyu-gen/src/main/resources/logback.xml index 9ce06ea..1060616 100644 --- a/muyu-modules/muyu-gen/src/main/resources/logback.xml +++ b/muyu-modules/muyu-gen/src/main/resources/logback.xml @@ -1,31 +1,31 @@ - - - + + + - - - ${log.pattern} - - + + + ${log.pattern} + + - - ${log.path}/info.log + + ${log.path}/info.log - + - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + INFO @@ -33,16 +33,16 @@ DENY - + - ${log.path}/error.log + ${log.path}/error.log ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 + + 60 ${log.pattern} @@ -50,25 +50,25 @@ ERROR - + ACCEPT - + DENY - - - + + + - - - - - - - + + + + + + + diff --git a/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 12fe83d..00e239b 100644 --- a/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -55,7 +55,8 @@ from gen_table_column - where table_id = #{tableId} order by sort @@ -64,10 +65,10 @@ - + insert into gen_table_column ( table_id, column_name, diff --git a/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml b/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml index 42ab2cf..7b03fef 100644 --- a/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml @@ -249,7 +249,8 @@ order by c.sort - + insert into gen_table ( table_name, table_comment, diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm b/muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm index ed7a33a..4466705 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm +++ b/muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm @@ -3,6 +3,7 @@ package ${packageName}.controller; import java.util.List; import java.io.IOException; import javax.servlet.http.HttpServletResponse; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -33,30 +34,27 @@ import com.muyu.common.core.web.page.TableDataInfo; */ @RestController @RequestMapping("/${businessName}") -public class ${ClassName}Controller extends BaseController -{ +public class ${ClassName}Controller extends BaseController { @Autowired private I${ClassName}Service ${className}Service; - /** - * 查询${functionName}列表 - */ - @RequiresPermissions("${permissionPrefix}:list") - @GetMapping("/list") -#if($table.crud || $table.sub) - public Result list(${ClassName} ${className}) - { +/** + * 查询${functionName}列表 + */ +@RequiresPermissions("${permissionPrefix}:list") +@GetMapping("/list") + #if($table.crud || $table.sub) + public Result list(${ClassName} ${className}) { startPage(); List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); return getDataTable(list); } -#elseif($table.tree) - public Result list(${ClassName} ${className}) - { - List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - return success(list); - } -#end + #elseif($table.tree) + public Result list(${ClassName} ${className}) { + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + return success(list); + } + #end /** * 导出${functionName}列表 @@ -64,10 +62,9 @@ public class ${ClassName}Controller extends BaseController @RequiresPermissions("${permissionPrefix}:export") @Log(title = "${functionName}", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, ${ClassName} ${className}) - { + public void export(HttpServletResponse response, ${ClassName} ${className}) { List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); + ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}. class); util.exportExcel(response, list, "${functionName}数据"); } @@ -76,8 +73,7 @@ public class ${ClassName}Controller extends BaseController */ @RequiresPermissions("${permissionPrefix}:query") @GetMapping(value = "/{${pkColumn.javaField}}") - public Result getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) - { + public Result getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) { return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField})); } @@ -87,8 +83,7 @@ public class ${ClassName}Controller extends BaseController @RequiresPermissions("${permissionPrefix}:add") @Log(title = "${functionName}", businessType = BusinessType.INSERT) @PostMapping - public Result add(@RequestBody ${ClassName} ${className}) - { + public Result add(@RequestBody ${ClassName} ${className}) { return toAjax(${className}Service.insert${ClassName}(${className})); } @@ -98,8 +93,7 @@ public class ${ClassName}Controller extends BaseController @RequiresPermissions("${permissionPrefix}:edit") @Log(title = "${functionName}", businessType = BusinessType.UPDATE) @PutMapping - public Result edit(@RequestBody ${ClassName} ${className}) - { + public Result edit(@RequestBody ${ClassName} ${className}) { return toAjax(${className}Service.update${ClassName}(${className})); } @@ -108,9 +102,8 @@ public class ${ClassName}Controller extends BaseController */ @RequiresPermissions("${permissionPrefix}:remove") @Log(title = "${functionName}", businessType = BusinessType.DELETE) - @DeleteMapping("/{${pkColumn.javaField}s}") - public Result remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) - { + @DeleteMapping("/{${pkColumn.javaField}s}") + public Result remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) { return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s)); } } diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/domain.java.vm b/muyu-modules/muyu-gen/src/main/resources/vm/java/domain.java.vm index 4d0d9a6..6f8d749 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/java/domain.java.vm +++ b/muyu-modules/muyu-gen/src/main/resources/vm/java/domain.java.vm @@ -19,87 +19,87 @@ import com.muyu.common.core.web.domain.TreeEntity; * @date ${datetime} */ #if($table.crud || $table.sub) -#set($Entity="BaseEntity") + #set($Entity="BaseEntity") #elseif($table.tree) -#set($Entity="TreeEntity") + #set($Entity="TreeEntity") #end public class ${ClassName} extends ${Entity} -{ - private static final long serialVersionUID = 1L; + { +private static final long serialVersionUID=1L; #foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField)) + #if(!$table.isSuperColumn($column.javaField)) /** $column.columnComment */ -#if($column.list) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($parentheseIndex != -1) - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") -#elseif($column.javaType == 'Date') - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") -#else - @Excel(name = "${comment}") -#end -#end + #if($column.list) + #set($parentheseIndex=$column.columnComment.indexOf("（")) + #if($parentheseIndex != -1) + #set($comment=$column.columnComment.substring(0, $parentheseIndex)) + #else + #set($comment=$column.columnComment) + #end + #if($parentheseIndex != -1) + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + #elseif($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") + #else + @Excel(name = "${comment}") + #end + #end private $column.javaType $column.javaField; -#end + #end #end #if($table.sub) - /** $table.subTable.functionName信息 */ - private List<${subClassName}> ${subclassName}List; +/** $table.subTable.functionName信息 */ +private List<${subClassName}> ${subclassName}List; #end #foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField)) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end + #if(!$table.isSuperColumn($column.javaField)) + #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) + #set($AttrName=$column.javaField) + #else + #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) + #end public void set${AttrName}($column.javaType $column.javaField) - { - this.$column.javaField = $column.javaField; - } + { + this.$column.javaField = $column.javaField; + } public $column.javaType get${AttrName}() - { - return $column.javaField; - } -#end + { + return $column.javaField; + } + #end #end #if($table.sub) - public List<${subClassName}> get${subClassName}List() - { +public List<${subClassName}> get${subClassName}List() + { return ${subclassName}List; - } + } - public void set${subClassName}List(List<${subClassName}> ${subclassName}List) - { - this.${subclassName}List = ${subclassName}List; - } +public void set${subClassName}List(List<${subClassName}> ${subclassName}List) + { + this.${subclassName}List= ${subclassName}List; + } #end - @Override - public String toString() { +@Override +public String toString(){ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) -#foreach ($column in $columns) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - .append("${column.javaField}", get${AttrName}()) -#end -#if($table.sub) - .append("${subclassName}List", get${subClassName}List()) -#end - .toString(); - } -} + #foreach ($column in $columns) + #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) + #set($AttrName=$column.javaField) + #else + #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) + #end + .append("${column.javaField}",get${AttrName}()) + #end + #if($table.sub) + .append("${subclassName}List",get${subClassName}List()) + #end + .toString(); + } + } diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/mapper.java.vm b/muyu-modules/muyu-gen/src/main/resources/vm/java/mapper.java.vm index 7e7d7c2..6dac139 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/java/mapper.java.vm +++ b/muyu-modules/muyu-gen/src/main/resources/vm/java/mapper.java.vm @@ -1,6 +1,7 @@ package ${packageName}.mapper; import java.util.List; + import ${packageName}.domain.${ClassName}; #if($table.sub) import ${packageName}.domain.${subClassName}; @@ -8,15 +9,14 @@ import ${packageName}.domain.${subClassName}; /** * ${functionName}Mapper接口 - * + * * @author ${author} * @date ${datetime} */ -public interface ${ClassName}Mapper -{ +public interface ${ClassName}Mapper { /** * 查询${functionName} - * + * * @param ${pkColumn.javaField} ${functionName}主键 * @return ${functionName} */ @@ -24,7 +24,7 @@ public interface ${ClassName}Mapper /** * 查询${functionName}列表 - * + * * @param ${className} ${functionName} * @return ${functionName}集合 */ @@ -32,7 +32,7 @@ public interface ${ClassName}Mapper /** * 新增${functionName} - * + * * @param ${className} ${functionName} * @return 结果 */ @@ -40,7 +40,7 @@ public interface ${ClassName}Mapper /** * 修改${functionName} - * + * * @param ${className} ${functionName} * @return 结果 */ @@ -48,7 +48,7 @@ public interface ${ClassName}Mapper /** * 删除${functionName} - * + * * @param ${pkColumn.javaField} ${functionName}主键 * @return 结果 */ @@ -56,36 +56,36 @@ public interface ${ClassName}Mapper /** * 批量删除${functionName} - * + * * @param ${pkColumn.javaField}s 需要删除的数据主键集合 * @return 结果 */ public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); -#if($table.sub) + #if($table.sub) - /** - * 批量删除${subTable.functionName} - * - * @param ${pkColumn.javaField}s 需要删除的数据主键集合 - * @return 结果 - */ - public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); - - /** - * 批量新增${subTable.functionName} - * - * @param ${subclassName}List ${subTable.functionName}列表 - * @return 结果 - */ - public int batch${subClassName}(List<${subClassName}> ${subclassName}List); - + /** + * 批量删除${subTable.functionName} + * + * @param ${pkColumn.javaField}s 需要删除的数据主键集合 + * @return 结果 + */ + public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); - /** - * 通过${functionName}主键删除${subTable.functionName}信息 - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return 结果 - */ - public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField}); -#end + /** + * 批量新增${subTable.functionName} + * + * @param ${subclassName}List ${subTable.functionName}列表 + * @return 结果 + */ + public int batch${subClassName}(List<${subClassName}> ${subclassName}List); + + + /** + * 通过${functionName}主键删除${subTable.functionName}信息 + * + * @param ${pkColumn.javaField} ${functionName}ID + * @return 结果 + */ + public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField}); + #end } diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/service.java.vm b/muyu-modules/muyu-gen/src/main/resources/vm/java/service.java.vm index 264882b..f6df34d 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/java/service.java.vm +++ b/muyu-modules/muyu-gen/src/main/resources/vm/java/service.java.vm @@ -1,19 +1,19 @@ package ${packageName}.service; import java.util.List; + import ${packageName}.domain.${ClassName}; /** * ${functionName}Service接口 - * + * * @author ${author} * @date ${datetime} */ -public interface I${ClassName}Service -{ +public interface I${ClassName}Service { /** * 查询${functionName} - * + * * @param ${pkColumn.javaField} ${functionName}主键 * @return ${functionName} */ @@ -21,7 +21,7 @@ public interface I${ClassName}Service /** * 查询${functionName}列表 - * + * * @param ${className} ${functionName} * @return ${functionName}集合 */ @@ -29,7 +29,7 @@ public interface I${ClassName}Service /** * 新增${functionName} - * + * * @param ${className} ${functionName} * @return 结果 */ @@ -37,7 +37,7 @@ public interface I${ClassName}Service /** * 修改${functionName} - * + * * @param ${className} ${functionName} * @return 结果 */ @@ -45,7 +45,7 @@ public interface I${ClassName}Service /** * 批量删除${functionName} - * + * * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合 * @return 结果 */ @@ -53,7 +53,7 @@ public interface I${ClassName}Service /** * 删除${functionName}信息 - * + * * @param ${pkColumn.javaField} ${functionName}主键 * @return 结果 */ diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/serviceImpl.java.vm b/muyu-modules/muyu-gen/src/main/resources/vm/java/serviceImpl.java.vm index 3904af5..dc7585b 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/java/serviceImpl.java.vm +++ b/muyu-modules/muyu-gen/src/main/resources/vm/java/serviceImpl.java.vm @@ -1,20 +1,21 @@ package ${packageName}.service.impl; import java.util.List; -#foreach ($column in $columns) -#if($column.javaField == 'createTime' || $column.javaField == 'updateTime') -import com.muyu.common.core.utils.DateUtils; -#break -#end -#end + #foreach ($column in $columns) + #if($column.javaField == 'createTime' || $column.javaField == 'updateTime') + import com.muyu.common.core.utils.DateUtils; + #break + #end + #end import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -#if($table.sub) -import java.util.ArrayList; -import com.muyu.common.core.utils.StringUtils; -import org.springframework.transaction.annotation.Transactional; -import ${packageName}.domain.${subClassName}; -#end + #if($table.sub) + import java.util.ArrayList; + + import com.muyu.common.core.utils.StringUtils; + import org.springframework.transaction.annotation.Transactional; + import ${packageName}.domain.${subClassName}; + #end import ${packageName}.mapper.${ClassName}Mapper; import ${packageName}.domain.${ClassName}; import ${packageName}.service.I${ClassName}Service; @@ -26,8 +27,7 @@ import ${packageName}.service.I${ClassName}Service; * @date ${datetime} */ @Service -public class ${ClassName}ServiceImpl implements I${ClassName}Service -{ +public class ${ClassName}ServiceImpl implements I${ClassName}Service { @Autowired private ${ClassName}Mapper ${className}Mapper; @@ -38,8 +38,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service * @return ${functionName} */ @Override - public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) - { + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) { return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); } @@ -50,8 +49,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service * @return ${functionName} */ @Override - public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) - { + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) { return ${className}Mapper.select${ClassName}List(${className}); } @@ -61,24 +59,23 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service * @param ${className} ${functionName} * @return 结果 */ -#if($table.sub) - @Transactional -#end + #if($table.sub) + @Transactional + #end @Override - public int insert${ClassName}(${ClassName} ${className}) - { -#foreach ($column in $columns) -#if($column.javaField == 'createTime') - ${className}.setCreateTime(DateUtils.getNowDate()); -#end -#end -#if($table.sub) - int rows = ${className}Mapper.insert${ClassName}(${className}); - insert${subClassName}(${className}); - return rows; -#else - return ${className}Mapper.insert${ClassName}(${className}); -#end + public int insert${ClassName}(${ClassName} ${className}) { + #foreach ($column in $columns) + #if($column.javaField == 'createTime') + ${className}.setCreateTime(DateUtils.getNowDate()); + #end + #end + #if($table.sub) + int rows = ${className}Mapper.insert${ClassName}(${className}); + insert${subClassName}(${className}); + return rows; + #else + return ${className}Mapper.insert${ClassName}(${className}); + #end } /** @@ -87,21 +84,21 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service * @param ${className} ${functionName} * @return 结果 */ -#if($table.sub) - @Transactional -#end + #if($table.sub) + @Transactional + #end @Override - public int update${ClassName}(${ClassName} ${className}) - { -#foreach ($column in $columns) -#if($column.javaField == 'updateTime') - ${className}.setUpdateTime(DateUtils.getNowDate()); -#end -#end -#if($table.sub) - ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}()); - insert${subClassName}(${className}); -#end + public int update${ClassName}(${ClassName} ${className}) { + #foreach ($column in $columns) + #if($column.javaField == 'updateTime') + ${className}.setUpdateTime(DateUtils.getNowDate()); + #end + #end + #if($table.sub) + ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}()) + ; + insert${subClassName}(${className}); + #end return ${className}Mapper.update${ClassName}(${className}); } @@ -111,15 +108,14 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service * @param ${pkColumn.javaField}s 需要删除的${functionName}主键 * @return 结果 */ -#if($table.sub) - @Transactional -#end + #if($table.sub) + @Transactional + #end @Override - public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) - { -#if($table.sub) - ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s); -#end + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) { + #if($table.sub) + ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s); + #end return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s); } @@ -129,41 +125,37 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service * @param ${pkColumn.javaField} ${functionName}主键 * @return 结果 */ -#if($table.sub) - @Transactional -#end + #if($table.sub) + @Transactional + #end @Override - public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) - { -#if($table.sub) - ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField}); -#end + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) { + #if($table.sub) + ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField}); + #end return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); } -#if($table.sub) + #if($table.sub) - /** - * 新增${subTable.functionName}信息 - * - * @param ${className} ${functionName}对象 - */ - public void insert${subClassName}(${ClassName} ${className}) - { - List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List(); - ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}(); - if (StringUtils.isNotNull(${subclassName}List)) - { - List<${subClassName}> list = new ArrayList<${subClassName}>(); - for (${subClassName} ${subclassName} : ${subclassName}List) - { - ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField}); - list.add(${subclassName}); - } - if (list.size() > 0) - { - ${className}Mapper.batch${subClassName}(list); + /** + * 新增${subTable.functionName}信息 + * + * @param ${className} ${functionName}对象 + */ + public void insert${subClassName}(${ClassName} ${className}) { + List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List(); + ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}(); + if (StringUtils.isNotNull(${subclassName}List)) { + List<${subClassName}> list = new ArrayList<${subClassName}>(); + for (${subClassName} ${subclassName} :${subclassName}List) + { + ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField}); + list.add(${subclassName}); + } + if (list.size() > 0) { + ${className}Mapper.batch${subClassName}(list); + } } } - } -#end + #end } diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/sub-domain.java.vm b/muyu-modules/muyu-gen/src/main/resources/vm/java/sub-domain.java.vm index df72461..041cb60 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/java/sub-domain.java.vm +++ b/muyu-modules/muyu-gen/src/main/resources/vm/java/sub-domain.java.vm @@ -1,8 +1,8 @@ package ${packageName}.domain; -#foreach ($import in $subImportList) -import ${import}; -#end + #foreach ($import in $subImportList) + import ${import}; + #end import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.muyu.common.core.annotation.Excel; @@ -20,62 +20,62 @@ import com.muyu.common.core.web.domain.BaseEntity; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class ${subClassName} extends BaseEntity -{ - private static final long serialVersionUID = 1L; + { +private static final long serialVersionUID=1L; #foreach ($column in $subTable.columns) -#if(!$table.isSuperColumn($column.javaField)) + #if(!$table.isSuperColumn($column.javaField)) /** $column.columnComment */ -#if($column.list) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($parentheseIndex != -1) - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") -#elseif($column.javaType == 'Date') - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") -#else - @Excel(name = "${comment}") -#end -#end + #if($column.list) + #set($parentheseIndex=$column.columnComment.indexOf("（")) + #if($parentheseIndex != -1) + #set($comment=$column.columnComment.substring(0, $parentheseIndex)) + #else + #set($comment=$column.columnComment) + #end + #if($parentheseIndex != -1) + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + #elseif($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") + #else + @Excel(name = "${comment}") + #end + #end private $column.javaType $column.javaField; -#end + #end #end #foreach ($column in $subTable.columns) -#if(!$table.isSuperColumn($column.javaField)) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end + #if(!$table.isSuperColumn($column.javaField)) + #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) + #set($AttrName=$column.javaField) + #else + #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) + #end public void set${AttrName}($column.javaType $column.javaField) - { - this.$column.javaField = $column.javaField; - } + { + this.$column.javaField = $column.javaField; + } public $column.javaType get${AttrName}() - { - return $column.javaField; - } -#end + { + return $column.javaField; + } + #end #end - @Override - public String toString() { +@Override +public String toString(){ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) -#foreach ($column in $subTable.columns) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - .append("${column.javaField}", get${AttrName}()) -#end - .toString(); - } -} + #foreach ($column in $subTable.columns) + #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) + #set($AttrName=$column.javaField) + #else + #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) + #end + .append("${column.javaField}",get${AttrName}()) + #end + .toString(); + } + } diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/js/api.js.vm b/muyu-modules/muyu-gen/src/main/resources/vm/js/api.js.vm index 9295524..346c95e 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/js/api.js.vm +++ b/muyu-modules/muyu-gen/src/main/resources/vm/js/api.js.vm @@ -2,43 +2,43 @@ import request from '@/utils/request' // 查询${functionName}列表 export function list${BusinessName}(query) { - return request({ - url: '/${moduleName}/${businessName}/list', - method: 'get', - params: query - }) + return request({ + url: '/${moduleName}/${businessName}/list', + method: 'get', + params: query + }) } // 查询${functionName}详细 export function get${BusinessName}(${pkColumn.javaField}) { - return request({ - url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, - method: 'get' - }) + return request({ + url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, + method: 'get' + }) } // 新增${functionName} export function add${BusinessName}(data) { - return request({ - url: '/${moduleName}/${businessName}', - method: 'post', - data: data - }) + return request({ + url: '/${moduleName}/${businessName}', + method: 'post', + data: data + }) } // 修改${functionName} export function update${BusinessName}(data) { - return request({ - url: '/${moduleName}/${businessName}', - method: 'put', - data: data - }) + return request({ + url: '/${moduleName}/${businessName}', + method: 'put', + data: data + }) } // 删除${functionName} export function del${BusinessName}(${pkColumn.javaField}) { - return request({ - url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, - method: 'delete' - }) + return request({ + url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, + method: 'delete' + }) } diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/index-tree.vue.vm b/muyu-modules/muyu-gen/src/main/resources/vm/vue/index-tree.vue.vm index a4c64a0..afe39d0 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/vue/index-tree.vue.vm +++ b/muyu-modules/muyu-gen/src/main/resources/vm/vue/index-tree.vue.vm @@ -1,68 +1,68 @@ diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm b/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm index 6296014..8f40940 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm +++ b/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm @@ -1,66 +1,66 @@ diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm b/muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm index 7bbd2fc..d0bde4f 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm +++ b/muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm @@ -1,65 +1,65 @@