diff --git a/smart-admin-api-java17-springboot3/sa-base/pom.xml b/smart-admin-api-java17-springboot3/sa-base/pom.xml index 8d2b44d6..a72aca4f 100644 --- a/smart-admin-api-java17-springboot3/sa-base/pom.xml +++ b/smart-admin-api-java17-springboot3/sa-base/pom.xml @@ -103,6 +103,11 @@ lombok + + org.apache.commons + commons-pool2 + + org.apache.commons commons-text 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 6c96e30e..2976097a 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 @@ -40,6 +40,12 @@ import java.util.Optional; @Service public class CodeGeneratorService { + private static final String COLUMN_NULLABLE_IDENTIFY = "NO"; + + private static final String COLUMN_PRIMARY_KEY = "PRI"; + + private static final String COLUMN_AUTO_INCREASE = "auto_increment"; + @Resource private CodeGeneratorDao codeGeneratorDao; @@ -57,7 +63,13 @@ public class CodeGeneratorService { * @return */ public List getTableColumns(String tableName) { - return codeGeneratorDao.selectTableColumn(tableName); + List tableColumns = codeGeneratorDao.selectTableColumn(tableName); + for (TableColumnVO tableColumn : tableColumns) { + tableColumn.setNullableFlag(!COLUMN_NULLABLE_IDENTIFY.equalsIgnoreCase(tableColumn.getIsNullable())); + tableColumn.setPrimaryKeyFlag(COLUMN_PRIMARY_KEY.equalsIgnoreCase(tableColumn.getColumnKey())); + tableColumn.setAutoIncreaseFlag(SmartStringUtil.isNotEmpty(tableColumn.getExtra()) && COLUMN_AUTO_INCREASE.equalsIgnoreCase(tableColumn.getExtra())); + } + return tableColumns; } @@ -144,13 +156,13 @@ 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.isPresent()) { + if (any.isEmpty()) { return ResponseDTO.userErrorParam("表结构中没有假删字段：" + CodeGeneratorConstant.DELETED_FLAG + ",请仔细排查"); } } // 校验表必须有主键 - if(!tableColumns.stream().filter( e -> "PRI".equalsIgnoreCase(e.getColumnKey())).findAny().isPresent()){ + if (tableColumns.stream().noneMatch(e -> COLUMN_PRIMARY_KEY.equalsIgnoreCase(e.getColumnKey()))) { return ResponseDTO.userErrorParam("表必须有主键，请联系后端查看下数据库表结构"); } @@ -199,6 +211,7 @@ public class CodeGeneratorService { /** * 下载代码 + * * @param tableName * @return */ diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java index 17f78438..213553a8 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java @@ -128,16 +128,6 @@ public class DataTracerChangeContentService { return this.getAddDeleteContent(object); } - /** - * 解析批量bean的内容 - * - * @param objectList 对象列表 - * @return 单个内容 - */ - public String getChangeContent(List objectList) { - return this.getObjectListContent(objectList); - } - // ---------------------------- 以下 是 私有private 方法 ---------------------------- /** @@ -170,6 +160,15 @@ public class DataTracerChangeContentService { return "【原数据】:
" + oldContent + "
" + "【新数据】:
" + newContent; } + /** + * 解析批量bean的内容 + * + * @param objectList 对象列表 + * @return 单个内容 + */ + public String getChangeContent(List objectList) { + return this.getObjectListContent(objectList); + } /** * 获取一个对象的内容信息 diff --git a/smart-admin-api-java8-springboot2/pom.xml b/smart-admin-api-java8-springboot2/pom.xml index 210b044a..91a8c38a 100644 --- a/smart-admin-api-java8-springboot2/pom.xml +++ b/smart-admin-api-java8-springboot2/pom.xml @@ -47,8 +47,6 @@ 2.23.1 5.7.22 2.3 - 0.9.1 - 0.9.0 3.1 1.41.0 2.7.0 @@ -225,19 +223,6 @@ hutool-all ${hutool.version} - - - io.jsonwebtoken - jjwt - ${jjwt.version} - - - - com.auth0 - jwks-rsa - ${jwks-rsa.version} - - org.apache.velocity diff --git a/smart-admin-api-java8-springboot2/sa-base/pom.xml b/smart-admin-api-java8-springboot2/sa-base/pom.xml index 1cb1d280..fa760e1f 100644 --- a/smart-admin-api-java8-springboot2/sa-base/pom.xml +++ b/smart-admin-api-java8-springboot2/sa-base/pom.xml @@ -208,16 +208,6 @@ hutool-all - - io.jsonwebtoken - jjwt - - - - com.auth0 - jwks-rsa - - org.apache.velocity velocity-engine-core diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java index c70397b4..8500ca04 100644 --- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java +++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java @@ -40,6 +40,12 @@ import java.util.Optional; @Service public class CodeGeneratorService { + private static final String COLUMN_NULLABLE_IDENTIFY = "NO"; + + private static final String COLUMN_PRIMARY_KEY = "PRI"; + + private static final String COLUMN_AUTO_INCREASE = "auto_increment"; + @Resource private CodeGeneratorDao codeGeneratorDao; @@ -57,7 +63,13 @@ public class CodeGeneratorService { * @return */ public List getTableColumns(String tableName) { - return codeGeneratorDao.selectTableColumn(tableName); + List tableColumns = codeGeneratorDao.selectTableColumn(tableName); + for (TableColumnVO tableColumn : tableColumns) { + tableColumn.setNullableFlag(!COLUMN_NULLABLE_IDENTIFY.equalsIgnoreCase(tableColumn.getIsNullable())); + tableColumn.setPrimaryKeyFlag(COLUMN_PRIMARY_KEY.equalsIgnoreCase(tableColumn.getColumnKey())); + tableColumn.setAutoIncreaseFlag(SmartStringUtil.isNotEmpty(tableColumn.getExtra()) && COLUMN_AUTO_INCREASE.equalsIgnoreCase(tableColumn.getExtra())); + } + return tableColumns; } @@ -150,7 +162,7 @@ public class CodeGeneratorService { } // 校验表必须有主键 - if(!tableColumns.stream().filter( e -> "PRI".equalsIgnoreCase(e.getColumnKey())).findAny().isPresent()){ + if (tableColumns.stream().noneMatch(e -> COLUMN_PRIMARY_KEY.equalsIgnoreCase(e.getColumnKey()))) { return ResponseDTO.userErrorParam("表必须有主键，请联系后端查看下数据库表结构"); } @@ -199,6 +211,7 @@ public class CodeGeneratorService { /** * 下载代码 + * * @param tableName * @return */ diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java index 8157584f..201f7e7f 100644 --- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java +++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java @@ -128,16 +128,6 @@ public class DataTracerChangeContentService { return this.getAddDeleteContent(object); } - /** - * 解析批量bean的内容 - * - * @param objectList 对象列表 - * @return 单个内容 - */ - public String getChangeContent(List objectList) { - return this.getObjectListContent(objectList); - } - // ---------------------------- 以下 是 私有private 方法 ---------------------------- /** @@ -170,6 +160,15 @@ public class DataTracerChangeContentService { return "【原数据】:
" + oldContent + "
" + "【新数据】:
" + newContent; } + /** + * 解析批量bean的内容 + * + * @param objectList 对象列表 + * @return 单个内容 + */ + public String getChangeContent(List objectList) { + return this.getObjectListContent(objectList); + } /** * 获取一个对象的内容信息 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 10852a5e..e8d1c893 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 @@ -36,7 +36,7 @@ }); const props = defineProps({ - value: [Array, String], + value: [Array, String, Number], placeholder: { type: String, default: '请选择字典', diff --git a/smart-admin-web-javascript/src/components/support/dict-select/index.vue b/smart-admin-web-javascript/src/components/support/dict-select/index.vue index 61c388e5..49f88bf4 100644 --- a/smart-admin-web-javascript/src/components/support/dict-select/index.vue +++ b/smart-admin-web-javascript/src/components/support/dict-select/index.vue @@ -33,7 +33,7 @@ const props = defineProps({ dictCode: String, - value: [Array, String], + value: [Array, String, Number], mode: { type: String, default: 'combobox', diff --git a/smart-admin-web-typescript/src/components/support/dict-code-select/index.vue b/smart-admin-web-typescript/src/components/support/dict-code-select/index.vue index 84d976db..94ee9ec4 100644 --- a/smart-admin-web-typescript/src/components/support/dict-code-select/index.vue +++ b/smart-admin-web-typescript/src/components/support/dict-code-select/index.vue @@ -36,7 +36,7 @@ }); const props = defineProps({ - value: [Array, String], + value: [Array, String, Number], placeholder: { type: String, default: '请选择字典', diff --git a/smart-admin-web-typescript/src/components/support/dict-select/index.vue b/smart-admin-web-typescript/src/components/support/dict-select/index.vue index 446c11bb..3a557ed2 100644 --- a/smart-admin-web-typescript/src/components/support/dict-select/index.vue +++ b/smart-admin-web-typescript/src/components/support/dict-select/index.vue @@ -33,7 +33,7 @@ const props = defineProps({ dictCode: String, - value: [Array, String], + value: [Array, String, Number], mode: { type: String, default: 'combobox', diff --git a/smart-admin-web-typescript/src/views/system/role/index.vue b/smart-admin-web-typescript/src/views/system/role/index.vue index 2d91d76d..405df269 100644 --- a/smart-admin-web-typescript/src/views/system/role/index.vue +++ b/smart-admin-web-typescript/src/views/system/role/index.vue @@ -41,6 +41,7 @@