From f2a30e8b74b828644970be0b05920a32d6eb514a Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 21 Nov 2024 20:13:19 +0800 Subject: [PATCH] =?UTF-8?q?refactor(extension/crud):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crud/controller/BaseController.java | 8 +++---- .../crud/handler/CrudApiStrategy.java | 4 ++-- .../extension/crud/service/BaseService.java | 2 +- .../CrudValidateGroup.java} | 23 ++++++++----------- .../crud/service/BaseServiceImpl.java | 2 +- .../crud/service/BaseServiceImpl.java | 2 +- .../excel/converter/ExcelListConverter.java | 4 ++-- 7 files changed, 20 insertions(+), 25 deletions(-) rename continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/{util/ValidateGroup.java => validation/CrudValidateGroup.java} (65%) diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/controller/BaseController.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/controller/BaseController.java index 308e9e74..3cdf7607 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/controller/BaseController.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/controller/BaseController.java @@ -33,7 +33,7 @@ import top.continew.starter.extension.crud.model.req.BaseReq; import top.continew.starter.extension.crud.model.resp.BaseIdResp; import top.continew.starter.extension.crud.model.resp.BasePageResp; import top.continew.starter.extension.crud.service.BaseService; -import top.continew.starter.extension.crud.util.ValidateGroup; +import top.continew.starter.extension.crud.validation.CrudValidateGroup; import java.util.List; @@ -44,7 +44,7 @@ import java.util.List; * @param 列表类型 * @param 详情类型 * @param 查询条件 - * @param 创建或修改类型 + * @param 创建或修改参数类型 * @author Charles7c * @since 1.0.0 */ @@ -123,7 +123,7 @@ public abstract class BaseController, L, D, Q, @Operation(summary = "新增数据", description = "新增数据") @ResponseBody @PostMapping - public BaseIdResp add(@Validated(ValidateGroup.Crud.Add.class) @RequestBody C req) { + public BaseIdResp add(@Validated(CrudValidateGroup.Add.class) @RequestBody C req) { return new BaseIdResp<>(baseService.add(req)); } @@ -138,7 +138,7 @@ public abstract class BaseController, L, D, Q, @Parameter(name = "id", description = "ID", example = "1", in = ParameterIn.PATH) @ResponseBody @PutMapping("/{id}") - public void update(@Validated(ValidateGroup.Crud.Update.class) @RequestBody C req, @PathVariable("id") Long id) { + public void update(@Validated(CrudValidateGroup.Update.class) @RequestBody C req, @PathVariable("id") Long id) { baseService.update(req, id); } diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/handler/CrudApiStrategy.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/handler/CrudApiStrategy.java index 5883533c..430e647f 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/handler/CrudApiStrategy.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/handler/CrudApiStrategy.java @@ -60,11 +60,11 @@ public final class CrudApiStrategy { } /** - * 移除一个注解处理器 + * 移除一个处理器 * * @param controllerClass 控制器类 */ - public void removeAnnotationHandler(Class controllerClass) { + public void removeHandler(Class controllerClass) { handlerMap.remove(controllerClass); } } diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/service/BaseService.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/service/BaseService.java index 389f4316..106bb203 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/service/BaseService.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/service/BaseService.java @@ -31,7 +31,7 @@ import java.util.List; * @param 列表类型 * @param 详情类型 * @param 查询条件 - * @param 创建或修改类型 + * @param 创建或修改参数类型 * @author Charles7c * @since 1.0.0 */ diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/util/ValidateGroup.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/validation/CrudValidateGroup.java similarity index 65% rename from continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/util/ValidateGroup.java rename to continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/validation/CrudValidateGroup.java index b54c1109..24885439 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/util/ValidateGroup.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/validation/CrudValidateGroup.java @@ -14,30 +14,25 @@ * limitations under the License. */ -package top.continew.starter.extension.crud.util; +package top.continew.starter.extension.crud.validation; import jakarta.validation.groups.Default; /** - * 分组校验 + * CRUD 分组校验 * * @author Charles7c * @since 1.0.0 */ -public interface ValidateGroup extends Default { +public interface CrudValidateGroup extends Default { /** - * 分组校验-增删改查 + * CRUD 分组校验-新增 */ - interface Crud extends ValidateGroup { - /** - * 分组校验-创建 - */ - interface Add extends Crud {} + interface Add extends CrudValidateGroup {} - /** - * 分组校验-修改 - */ - interface Update extends Crud {} - } + /** + * CRUD 分组校验-修改 + */ + interface Update extends CrudValidateGroup {} } diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/BaseServiceImpl.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/BaseServiceImpl.java index 5609989c..b72af6c3 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/BaseServiceImpl.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/BaseServiceImpl.java @@ -59,7 +59,7 @@ import java.util.Optional; * @param 列表类型 * @param 详情类型 * @param 查询条件 - * @param 创建或修改类型 + * @param 创建或修改参数类型 * @author Charles7c * @since 1.0.0 */ diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/BaseServiceImpl.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/BaseServiceImpl.java index 8b8995bd..fe354377 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/BaseServiceImpl.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/BaseServiceImpl.java @@ -64,7 +64,7 @@ import java.util.*; * @param 列表类型 * @param 详情类型 * @param 查询条件 - * @param 创建或修改类型 + * @param 创建或修改参数类型 * @author Charles7c * @since 1.0.0 */ diff --git a/continew-starter-file/continew-starter-file-excel/src/main/java/top/continew/starter/file/excel/converter/ExcelListConverter.java b/continew-starter-file/continew-starter-file-excel/src/main/java/top/continew/starter/file/excel/converter/ExcelListConverter.java index e1b9ab80..786f00be 100644 --- a/continew-starter-file/continew-starter-file-excel/src/main/java/top/continew/starter/file/excel/converter/ExcelListConverter.java +++ b/continew-starter-file/continew-starter-file-excel/src/main/java/top/continew/starter/file/excel/converter/ExcelListConverter.java @@ -17,7 +17,7 @@ package top.continew.starter.file.excel.converter; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.CharSequenceUtil; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.metadata.GlobalConfiguration; @@ -57,7 +57,7 @@ public class ExcelListConverter implements Converter { ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { String stringValue = cellData.getStringValue(); - return StrUtil.split(stringValue, StringConstants.COMMA); + return CharSequenceUtil.split(stringValue, StringConstants.COMMA); } @Override