From d56b9aa35ee2502804f487487d7bac02f4edc9b0 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Tue, 20 Aug 2024 22:46:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=9D=E5=AD=98=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=97=B6=E9=87=8D=E6=96=B0=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #IAG7UD --- .../service/impl/GeneratorServiceImpl.java | 7 +++++-- .../controller/tool/GeneratorController.java | 16 ++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java b/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java index 03491145..eaeb1a66 100644 --- a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java +++ b/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java @@ -173,10 +173,13 @@ public class GeneratorServiceImpl implements GeneratorService { @Override @Transactional(rollbackFor = Exception.class) public void saveConfig(GenConfigReq req, String tableName) { - // 保存字段配置 + // 保存字段配置（先删除再保存） fieldConfigMapper.delete(Wrappers.lambdaQuery(FieldConfigDO.class).eq(FieldConfigDO::getTableName, tableName)); List fieldConfigList = req.getFieldConfigs(); - for (FieldConfigDO fieldConfig : fieldConfigList) { + for (int i = 0; i < fieldConfigList.size(); i++) { + FieldConfigDO fieldConfig = fieldConfigList.get(i); + // 重新设置排序 + fieldConfig.setFieldSort(i + 1); if (Boolean.TRUE.equals(fieldConfig.getShowInForm())) { CheckUtils.throwIfNull(fieldConfig.getFormType(), "字段 [{}] 的表单类型不能为空", fieldConfig.getFieldName()); } else { diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/tool/GeneratorController.java b/continew-admin-webapi/src/main/java/top/continew/admin/controller/tool/GeneratorController.java index 0d8df903..9586f540 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/controller/tool/GeneratorController.java +++ b/continew-admin-webapi/src/main/java/top/continew/admin/controller/tool/GeneratorController.java @@ -60,6 +60,14 @@ public class GeneratorController { return baseService.pageTable(query, pageQuery); } + @Operation(summary = "查询生成配置信息", description = "查询生成配置信息") + @Parameter(name = "tableName", description = "表名称", required = true, example = "sys_user", in = ParameterIn.PATH) + @SaCheckPermission("tool:generator:list") + @GetMapping("/config/{tableName}") + public GenConfigDO getGenConfig(@PathVariable String tableName) throws SQLException { + return baseService.getGenConfig(tableName); + } + @Operation(summary = "查询字段配置列表", description = "查询字段配置列表") @Parameter(name = "tableName", description = "表名称", required = true, example = "sys_user", in = ParameterIn.PATH) @Parameter(name = "requireSync", description = "是否需要同步", example = "false", in = ParameterIn.QUERY) @@ -70,14 +78,6 @@ public class GeneratorController { return baseService.listFieldConfig(tableName, requireSync); } - @Operation(summary = "查询生成配置信息", description = "查询生成配置信息") - @Parameter(name = "tableName", description = "表名称", required = true, example = "sys_user", in = ParameterIn.PATH) - @SaCheckPermission("tool:generator:list") - @GetMapping("/config/{tableName}") - public GenConfigDO getGenConfig(@PathVariable String tableName) throws SQLException { - return baseService.getGenConfig(tableName); - } - @Operation(summary = "保存配置信息", description = "保存配置信息") @Parameter(name = "tableName", description = "表名称", required = true, example = "sys_user", in = ParameterIn.PATH) @SaCheckPermission("tool:generator:list")