From 7ae4e898ad93e9f260d6e451c178527579da1470 Mon Sep 17 00:00:00 2001 From: zhuoda Date: Thu, 19 Jun 2025 20:36:30 +0800 Subject: [PATCH] =?UTF-8?q?v3.23.0=20=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91T?= =?UTF-8?q?S=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=92=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96;=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91log=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=A0=BC=E5=BC=8F;=E3=80=90=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E7=BC=93=E5=AD=98?= =?UTF-8?q?;=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E8=81=8C=E4=BD=8D?= =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- smart-admin-api-java17-springboot3/pom.xml | 8 - .../EnterpriseController.java | 3 +- .../EnterpriseEmployeeManager.java | 2 +- .../{ => service}/EnterpriseService.java | 3 +- .../oa/invoice/service/InvoiceService.java | 2 +- .../domain/entity/PositionEntity.java | 2 +- .../position/domain/form/PositionAddForm.java | 2 +- .../system/position/domain/vo/PositionVO.java | 2 +- .../src/main/resources/dev/log4j2-spring.xml | 20 +- .../src/main/resources/pre/log4j2-spring.xml | 14 +- .../src/main/resources/prod/log4j2-spring.xml | 14 +- .../src/main/resources/test/log4j2-spring.xml | 14 +- .../lab1024/sa/base/config/CacheConfig.java | 9 +- .../codegenerator/domain/vo/TableVO.java | 6 - .../service/CodeGeneratorService.java | 2 +- .../service/CodeGeneratorTemplateService.java | 6 +- .../domain/AddFormVariableService.java | 4 +- .../domain/QueryFormVariableService.java | 4 +- .../domain/UpdateFormVariableService.java | 4 +- .../variable/front/ListVariableService.java | 2 +- .../support/dict/domain/vo/DictDataVO.java | 7 + .../code-generator-template/ts/api.ts.vm | 78 ++++ .../code-generator-template/ts/const.ts.vm | 23 ++ .../code-generator-template/ts/form.vue.vm | 239 ++++++++++++ .../code-generator-template/ts/list.vue.vm | 348 ++++++++++++++++++ .../mapper/support/CodeGeneratorMapper.xml | 2 - .../mapper/support/DictDataMapper.xml | 4 +- .../src/main/resources/pre/sa-base.yaml | 2 +- .../src/main/resources/prod/sa-base.yaml | 3 +- .../src/main/resources/test/sa-base.yaml | 2 +- smart-admin-api-java8-springboot2/pom.xml | 9 +- .../domain/entity/PositionEntity.java | 2 +- .../position/domain/form/PositionAddForm.java | 2 +- .../system/position/domain/vo/PositionVO.java | 2 +- .../src/main/resources/dev/log4j2-spring.xml | 17 +- .../src/main/resources/pre/log4j2-spring.xml | 14 +- .../src/main/resources/prod/log4j2-spring.xml | 14 +- .../src/main/resources/test/log4j2-spring.xml | 14 +- .../lab1024/sa/base/config/CacheConfig.java | 3 +- .../codegenerator/domain/vo/TableVO.java | 6 - .../service/CodeGeneratorTemplateService.java | 5 + .../domain/AddFormVariableService.java | 4 +- .../domain/QueryFormVariableService.java | 4 +- .../domain/UpdateFormVariableService.java | 4 +- .../variable/front/ListVariableService.java | 2 +- .../support/dict/domain/vo/DictDataVO.java | 9 +- .../code-generator-template/ts/api.ts.vm | 78 ++++ .../code-generator-template/ts/const.ts.vm | 23 ++ .../code-generator-template/ts/form.vue.vm | 239 ++++++++++++ .../code-generator-template/ts/list.vue.vm | 348 ++++++++++++++++++ .../mapper/support/CodeGeneratorMapper.xml | 2 - .../mapper/support/DictDataMapper.xml | 4 +- .../support/dict-code-select/index.vue | 28 +- .../components/support/dict-select/index.vue | 14 +- .../src/store/modules/system/dict.js | 26 +- .../notice-form-visible-transfer-employee.vue | 2 +- .../code-generator/code-generator-list.vue | 12 +- .../code-generator/code-generator-util.js | 4 +- ...ode-generator-table-config-form-delete.vue | 1 - ...code-generator-table-config-form-field.vue | 17 +- ...or-table-config-form-insert-and-update.vue | 6 +- .../dict/components/dict-form-modal.vue | 2 +- .../views/system/position/position-form.vue | 6 +- .../views/system/position/position-list.vue | 2 +- smart-admin-web-javascript/vite.config.js | 11 +- smart-admin-web-typescript/src/App.vue | 1 + .../support/dict-code-select/index.vue | 30 +- .../components/support/dict-select/index.vue | 14 +- .../src/store/modules/system/dict.ts | 26 +- ...otice-form-visible-transfer-department.vue | 8 +- .../notice-form-visible-transfer-employee.vue | 1 + .../code-generator/code-generator-list.vue | 12 +- .../code-generator/code-generator-util.ts | 4 +- ...ode-generator-table-config-form-delete.vue | 1 - ...code-generator-table-config-form-field.vue | 17 +- ...or-table-config-form-insert-and-update.vue | 6 +- .../dict/components/dict-form-modal.vue | 2 +- .../views/system/position/position-form.vue | 6 +- .../views/system/position/position-list.vue | 2 +- smart-admin-web-typescript/vite.config.ts | 10 + sql/smart_admin_v3.sql | 133 +++---- sql/sql-update-log/v3.23.0.sql | 54 +++ 83 files changed, 1758 insertions(+), 338 deletions(-) rename smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/{ => controller}/EnterpriseController.java (97%) rename smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/{ => manager}/EnterpriseEmployeeManager.java (90%) rename smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/{ => service}/EnterpriseService.java (98%) create mode 100644 smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/api.ts.vm create mode 100644 smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/const.ts.vm create mode 100644 smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/form.vue.vm create mode 100644 smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/list.vue.vm create mode 100644 smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/ts/api.ts.vm create mode 100644 smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/ts/const.ts.vm create mode 100644 smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/ts/form.vue.vm create mode 100644 smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/ts/list.vue.vm create mode 100644 sql/sql-update-log/v3.23.0.sql diff --git a/README.md b/README.md index a085c6c1..0a590ae9 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ - 前端：JavaScript/TypeScript + Vue3 + Vite5 + Pinia + Ant Design Vue 4.X - 移动端：uniapp (vue3版本) + uni-ui + （同时支持APP、小程序、H5） -- 后端：Java8/17 + SpringBoot2/3 + Sa Token + Mybatis-plus + 多种数据库 +- 后端：Java8/17 + SpringBoot2/3 + Sa Token + Mybatis-plus + 主流数据库/国产数据库 - 官方文档：[https://smartadmin.vip](https://smartadmin.vip) - 电脑在线预览：[https://preview.smartadmin.vip](https://preview.smartadmin.vip) - 移动端在线预览：[https://app.smartadmin.vip](https://app.smartadmin.vip/#/pages/login/login) diff --git a/smart-admin-api-java17-springboot3/pom.xml b/smart-admin-api-java17-springboot3/pom.xml index 335a45ff..086d0ee2 100644 --- a/smart-admin-api-java17-springboot3/pom.xml +++ b/smart-admin-api-java17-springboot3/pom.xml @@ -29,7 +29,6 @@ 1.2.23 1.4.2 20.0 - 1.21 0.9.11 2.15.0 3.12.0 @@ -127,12 +126,6 @@ ${google-guava.version} - - eu.bitwalker - UserAgentUtils - ${user-agent-utils.version} - - org.reflections reflections @@ -198,7 +191,6 @@ hutool-all ${hutool.version} - org.apache.velocity diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/controller/EnterpriseController.java similarity index 97% rename from smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java rename to smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/controller/EnterpriseController.java index d919537b..ab06bd02 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/controller/EnterpriseController.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.oa.enterprise; +package net.lab1024.sa.admin.module.business.oa.enterprise.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; @@ -8,6 +8,7 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.admin.constant.AdminSwaggerTagConst; +import net.lab1024.sa.admin.module.business.oa.enterprise.service.EnterpriseService; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.*; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseExcelVO; diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseEmployeeManager.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/manager/EnterpriseEmployeeManager.java similarity index 90% rename from smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseEmployeeManager.java rename to smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/manager/EnterpriseEmployeeManager.java index f90b21ac..a3c21d84 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseEmployeeManager.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/manager/EnterpriseEmployeeManager.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.oa.enterprise; +package net.lab1024.sa.admin.module.business.oa.enterprise.manager; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseEmployeeDao; diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/service/EnterpriseService.java similarity index 98% rename from smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java rename to smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/service/EnterpriseService.java index 5ea17e6c..37848774 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/service/EnterpriseService.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.oa.enterprise; +package net.lab1024.sa.admin.module.business.oa.enterprise.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; @@ -13,6 +13,7 @@ import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEm import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseExcelVO; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseListVO; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO; +import net.lab1024.sa.admin.module.business.oa.enterprise.manager.EnterpriseEmployeeManager; import net.lab1024.sa.admin.module.system.department.service.DepartmentService; import net.lab1024.sa.base.common.code.UserErrorCode; import net.lab1024.sa.base.common.domain.PageResult; diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/service/InvoiceService.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/service/InvoiceService.java index bfa87e09..dc7eb521 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/service/InvoiceService.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/service/InvoiceService.java @@ -3,7 +3,7 @@ package net.lab1024.sa.admin.module.business.oa.invoice.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import net.lab1024.sa.admin.module.business.oa.enterprise.EnterpriseService; +import net.lab1024.sa.admin.module.business.oa.enterprise.service.EnterpriseService; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO; import net.lab1024.sa.admin.module.business.oa.invoice.dao.InvoiceDao; import net.lab1024.sa.admin.module.business.oa.invoice.domain.*; diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/entity/PositionEntity.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/entity/PositionEntity.java index 0beac2a3..dd511bc6 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/entity/PositionEntity.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/entity/PositionEntity.java @@ -34,7 +34,7 @@ public class PositionEntity { /** * 职级 */ - private String level; + private String positionLevel; /** * 排序 diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionAddForm.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionAddForm.java index 87696b6a..7aa08086 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionAddForm.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionAddForm.java @@ -21,7 +21,7 @@ public class PositionAddForm { private String positionName; @Schema(description = "职级") - private String level; + private String positionLevel; @Schema(description = "排序") @NotNull(message = "排序不能为空") diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/vo/PositionVO.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/vo/PositionVO.java index ee178840..05783acf 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/vo/PositionVO.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/vo/PositionVO.java @@ -23,7 +23,7 @@ public class PositionVO { private String positionName; @Schema(description = "职级") - private String level; + private String positionLevel; @Schema(description = "排序") private Integer sort; diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/dev/log4j2-spring.xml b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/dev/log4j2-spring.xml index 738304c7..cab3506a 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/dev/log4j2-spring.xml +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/dev/log4j2-spring.xml @@ -5,15 +5,13 @@ --> - + - - + @@ -21,7 +19,7 @@ - + @@ -39,7 +37,7 @@ - + @@ -57,7 +55,7 @@ - + @@ -75,7 +73,7 @@ - + @@ -89,7 +87,7 @@ - + @@ -104,11 +102,9 @@ - - diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/pre/log4j2-spring.xml b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/pre/log4j2-spring.xml index d03ceca1..10fcc1c1 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/pre/log4j2-spring.xml +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/pre/log4j2-spring.xml @@ -5,12 +5,12 @@ --> - + - + @@ -18,7 +18,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -86,7 +86,7 @@ - + diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/prod/log4j2-spring.xml b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/prod/log4j2-spring.xml index e0b752ba..822d2763 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/prod/log4j2-spring.xml +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/prod/log4j2-spring.xml @@ -5,12 +5,12 @@ --> - + - + @@ -18,7 +18,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -86,7 +86,7 @@ - + diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/test/log4j2-spring.xml b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/test/log4j2-spring.xml index d03ceca1..10fcc1c1 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/test/log4j2-spring.xml +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/test/log4j2-spring.xml @@ -5,12 +5,12 @@ --> - + - + @@ -18,7 +18,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -86,7 +86,7 @@ - + diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java index c1440361..902d5cf0 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java @@ -1,6 +1,7 @@ package net.lab1024.sa.base.config; import com.alibaba.fastjson.support.spring.GenericFastJsonRedisSerializer; +import jakarta.annotation.Resource; import net.lab1024.sa.base.module.support.cache.CacheService; import net.lab1024.sa.base.module.support.cache.CaffeineCacheServiceImpl; import net.lab1024.sa.base.module.support.cache.RedisCacheServiceImpl; @@ -8,6 +9,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.cache.RedisCacheConfiguration; +import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.serializer.RedisSerializationContext; /** @@ -22,14 +24,17 @@ public class CacheConfig { private static final String REDIS_CACHE = "redis"; private static final String CAFFEINE_CACHE = "caffeine"; + + @Resource + private RedisConnectionFactory factory; + @Bean @ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = REDIS_CACHE) public RedisCacheConfiguration redisCacheConfiguration() { return RedisCacheConfiguration.defaultCacheConfig() .disableCachingNullValues() .computePrefixWith(name -> "cache:" + name + ":") -// .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericFastJsonRedisSerializer())); - ; + .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericFastJsonRedisSerializer())); } @Bean diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableVO.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableVO.java index 8b6d4771..3c027308 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableVO.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableVO.java @@ -25,12 +25,6 @@ public class TableVO { @Schema(description = "表备注") private String tableComment; - @Schema(description = "创建时间") - private LocalDateTime createTime; - - @Schema(description = "更新时间") - private LocalDateTime updateTime; - @Schema(description = "配置时间") private LocalDateTime configTime; diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java index 2976097a..f8918480 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java @@ -156,7 +156,7 @@ public class CodeGeneratorService { List tableColumns = getTableColumns(form.getTableName()); if (null != form.getDeleteInfo() && form.getDeleteInfo().getIsSupportDelete() && !form.getDeleteInfo().getIsPhysicallyDeleted()) { Optional any = tableColumns.stream().filter(e -> e.getColumnName().equals(CodeGeneratorConstant.DELETED_FLAG)).findAny(); - if (any.isEmpty()) { + if (!any.isPresent()) { return ResponseDTO.userErrorParam("表结构中没有假删字段：" + CodeGeneratorConstant.DELETED_FLAG + ",请仔细排查"); } } diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java index 930d73bf..d7675eee 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java @@ -33,7 +33,6 @@ import org.springframework.stereotype.Service; import java.io.File; import java.io.OutputStream; import java.io.StringWriter; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.*; import java.util.stream.Collectors; @@ -75,6 +74,11 @@ public class CodeGeneratorTemplateService { map.put("js/const.js", new ConstVariableService()); map.put("js/list.vue", new ListVariableService()); map.put("js/form.vue", new FormVariableService()); + // ts前端 + map.put("ts/api.ts", new ApiVariableService()); + map.put("ts/const.ts", new ConstVariableService()); + map.put("ts/list.vue", new ListVariableService()); + map.put("ts/form.vue", new FormVariableService()); } public void zipGeneratedFiles(OutputStream outputStream, String tableName, CodeGeneratorConfigEntity codeGeneratorConfigEntity) { diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java index 0df8d332..57847bf1 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java @@ -103,9 +103,9 @@ public class AddFormVariableService extends CodeGenerateBaseVariableService { //字典 if (SmartStringUtil.isNotEmpty(codeField.getDict())) { - finalFieldMap.put("dict", "\n @JsonDeserialize(using = DictValueVoDeserializer.class)"); + finalFieldMap.put("dict", "\n @JsonDeserialize(using = DictDataDeserializer.class)"); packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;"); - packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;"); + packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictDataDeserializer;"); } //文件上传 diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java index 4101d5e0..028275b2 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java @@ -106,9 +106,9 @@ public class QueryFormVariableService extends CodeGenerateBaseVariableService { case DICT: codeField = getCodeFieldByColumnName(field.getColumnNameList().get(0), form); if (SmartStringUtil.isNotEmpty(codeField.getDict())) { - finalFieldMap.put("dict", "\n @JsonDeserialize(using = DictValueVoDeserializer.class)"); + finalFieldMap.put("dict", "\n @JsonDeserialize(using = DictDataDeserializer.class)"); packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;"); - packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;"); + packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictDataDeserializer;"); } finalFieldMap.put("javaType", "String"); default: diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java index a3cfb439..3d1e1689 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java @@ -118,9 +118,9 @@ public class UpdateFormVariableService extends CodeGenerateBaseVariableService { //字典 if (SmartStringUtil.isNotEmpty(codeField.getDict())) { - finalFieldMap.put("dict", "\n @JsonDeserialize(using = DictValueVoDeserializer.class)"); + finalFieldMap.put("dict", "\n @JsonDeserialize(using = DictDataDeserializer.class)"); packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;"); - packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;"); + packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictDataDeserializer;"); } //文件上传 diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java index dc5e6358..4f626a93 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java @@ -46,7 +46,7 @@ public class ListVariableService extends CodeGenerateBaseVariableService { CodeField codeField = getCodeFieldByColumnName(queryField.getColumnNameList().get(0), form); - if (CodeQueryFieldQueryTypeEnum.ENUM.equalsValue(queryField.getQueryTypeEnum())) { + if (CodeQueryFieldQueryTypeEnum.ENUM.equalsValue(queryField.getQueryTypeEnum()) && SmartStringUtil.isNotBlank(codeField.getEnumName())) { String upperUnderscoreEnum = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, codeField.getEnumName()); objectMap.put("frontEnumName", upperUnderscoreEnum); frontImportSet.add("import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';"); diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictDataVO.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictDataVO.java index fe940b1b..1fdd6fb5 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictDataVO.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictDataVO.java @@ -3,6 +3,7 @@ package net.lab1024.sa.base.module.support.dict.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.io.Serializable; import java.time.LocalDateTime; /** @@ -25,6 +26,12 @@ public class DictDataVO implements Serializable { @Schema(description = "字典编码") private String dictCode; + @Schema(description = "字典名字") + private String dictName; + + @Schema(description = "字典禁用状态") + private Integer dictDisabledFlag; + @Schema(description = "字典项值") private String dataValue; diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/api.ts.vm b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/api.ts.vm new file mode 100644 index 00000000..b249d0c2 --- /dev/null +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/api.ts.vm @@ -0,0 +1,78 @@ +/** + * ${basic.description} api 封装 + * + * @Author: ${basic.frontAuthor} + * @Date: ${basic.frontDate} + * @Copyright ${basic.copyright} + */ +import { postRequest, getRequest } from '/@/lib/axios'; + +export const ${name.lowerCamel}Api = { + + /** + * 分页查询 @author ${basic.frontAuthor} + */ + queryPage : (param) => { + return postRequest('/${name.lowerCamel}/queryPage', param); + }, + + /** + * 增加 @author ${basic.frontAuthor} + */ + add: (param) => { + return postRequest('/${name.lowerCamel}/add', param); + }, + + /** + * 修改 @author ${basic.frontAuthor} + */ + update: (param) => { + return postRequest('/${name.lowerCamel}/update', param); + }, +## ------------------ 详情 ------------------ + +#if($deleteInfo.isSupportDetail) + /** + * 获取详情 @author ${basic.frontAuthor} + */ + getDetail: (id) => { + return getRequest(`/${name.lowerCamel}/getDetail/\${id}`); + }, +#end + +## ------------------ 删除 ------------------ +#if($deleteInfo.isSupportDelete) + #if($deleteInfo.deleteEnum == 'Single') + /** + * 删除 @author ${basic.frontAuthor} + */ + delete: (id) => { + return getRequest(`/${name.lowerCamel}/delete/${id}`); + }, + #end + #if($deleteInfo.deleteEnum == 'Batch') + /** + * 批量删除 @author ${basic.frontAuthor} + */ + batchDelete: (idList) => { + return postRequest('/${name.lowerCamel}/batchDelete', idList); + }, + #end + #if($deleteInfo.deleteEnum == 'SingleAndBatch') + /** + * 删除 @author ${basic.frontAuthor} + */ + delete: (id) => { + return getRequest(`/${name.lowerCamel}/delete/${id}`); + }, + + /** + * 批量删除 @author ${basic.frontAuthor} + */ + batchDelete: (idList) => { + return postRequest('/${name.lowerCamel}/batchDelete', idList); + }, + #end +#end + +}; diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/const.ts.vm b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/const.ts.vm new file mode 100644 index 00000000..30ca06a3 --- /dev/null +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/const.ts.vm @@ -0,0 +1,23 @@ +/** + * ${basic.description} 枚举 + * + * @Author: ${basic.frontAuthor} + * @Date: ${basic.frontDate} + * @Copyright ${basic.copyright} + */ + +#foreach ($enum in $enumList) + +/** + * $enum.columnComment + */ +export const $enum.upperUnderscoreEnum = { + +} +#end + +export default { +#foreach ($enum in $enumList) + $enum.upperUnderscoreEnum, +#end +}; \ No newline at end of file diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/form.vue.vm b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/form.vue.vm new file mode 100644 index 00000000..6e21ce79 --- /dev/null +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/form.vue.vm @@ -0,0 +1,239 @@ + + + diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/list.vue.vm b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/list.vue.vm new file mode 100644 index 00000000..11747b09 --- /dev/null +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/list.vue.vm @@ -0,0 +1,348 @@ + + + diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml index f9cab77f..de229357 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml @@ -21,8 +21,6 @@ select `tables`.table_name, `tables`.table_comment, - `tables`.create_time, - `tables`.update_time, t_code_generator_config.update_time configTime from information_schema.tables `tables` left join t_code_generator_config on `tables`.table_name = t_code_generator_config.table_name diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/DictDataMapper.xml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/DictDataMapper.xml index b29468de..83978833 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/DictDataMapper.xml +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/DictDataMapper.xml @@ -12,7 +12,9 @@ select t_dict_data.*, - t_dict.dict_code + t_dict.dict_code, + t_dict.dict_name, + t_dict.disabled_flag dictDisabledFlag from t_dict_data left join t_dict on t_dict_data.dict_id = t_dict.dict_id order by t_dict_data.sort_order desc diff --git a/smart-admin-web-javascript/src/components/support/dict-code-select/index.vue b/smart-admin-web-javascript/src/components/support/dict-code-select/index.vue index 73945036..dbd18d3d 100644 --- a/smart-admin-web-javascript/src/components/support/dict-code-select/index.vue +++ b/smart-admin-web-javascript/src/components/support/dict-code-select/index.vue @@ -28,12 +28,8 @@ - \ No newline at end of file + diff --git a/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue index d5477431..cbd6ec99 100644 --- a/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue +++ b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue @@ -87,7 +87,7 @@