Skip to content

Commit a7d1e71

Browse files
Charles7cCharles7c
committed
refactor(extension/crud): AbstractBaseController => AbstractCrudController，BaseService => CrudService
1 parent 1d47cc6 commit a7d1e71

8 files changed

Lines changed: 23 additions & 133 deletions

File tree

‎continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/base/BaseMapper.java‎

Lines changed: 0 additions & 112 deletions
This file was deleted.

‎continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/IService.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616

1717
package top.continew.starter.data.mp.service;
1818

19+
import com.baomidou.mybatisplus.extension.repository.IRepository;
20+
1921
/**
2022
* 通用业务接口
2123
*
2224
* @param <T> 实体类型
2325
* @author Charles7c
2426
* @since 1.2.0
2527
*/
26-
public interface IService<T> extends com.baomidou.mybatisplus.extension.service.IService<T> {}
28+
public interface IService<T> extends IRepository<T> {}

‎continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/mp/service/impl/ServiceImpl.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717
package top.continew.starter.data.mp.service.impl;
1818

1919
import cn.hutool.core.util.ClassUtil;
20+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
21+
import com.baomidou.mybatisplus.extension.repository.CrudRepository;
2022
import top.continew.starter.core.util.ReflectUtils;
2123
import top.continew.starter.core.validation.CheckUtils;
22-
import top.continew.starter.data.mp.base.BaseMapper;
2324
import top.continew.starter.data.mp.service.IService;
2425

2526
import java.io.Serializable;
@@ -34,7 +35,7 @@
3435
* @author Charles7c
3536
* @since 1.5.0
3637
*/
37-
public class ServiceImpl<M extends BaseMapper<T>, T> extends com.baomidou.mybatisplus.extension.service.impl.ServiceImpl<M, T> implements IService<T> {
38+
public class ServiceImpl<M extends BaseMapper<T>, T> extends CrudRepository<M, T> implements IService<T> {
3839

3940
private List<Field> entityFields;
4041

‎continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/aop/CrudApiAnnotationInterceptor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.springframework.core.annotation.AnnotatedElementUtils;
2424
import org.springframework.util.ClassUtils;
2525
import top.continew.starter.extension.crud.annotation.CrudApi;
26-
import top.continew.starter.extension.crud.controller.AbstractBaseController;
26+
import top.continew.starter.extension.crud.controller.AbstractCrudController;
2727

2828
import java.lang.reflect.Method;
2929
import java.util.Objects;
@@ -46,8 +46,8 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
4646
// 获取 @CrudApi 注解
4747
CrudApi crudApi = AnnotatedElementUtils.findMergedAnnotation(targetMethod, CrudApi.class);
4848
// 执行处理
49-
AbstractBaseController controller = (AbstractBaseController)invocation.getThis();
50-
controller.preHandle(crudApi, invocation.getArguments(), targetMethod, targetClass);
49+
AbstractCrudController crudController = (AbstractCrudController)invocation.getThis();
50+
crudController.preHandle(crudApi, invocation.getArguments(), targetMethod, targetClass);
5151
return invocation.proceed();
5252
}
5353
}

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/controller/AbstractBaseController.java renamed to continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/controller/AbstractCrudController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@
3333
import top.continew.starter.extension.crud.model.req.IdsReq;
3434
import top.continew.starter.extension.crud.model.resp.IdResp;
3535
import top.continew.starter.extension.crud.model.resp.BasePageResp;
36-
import top.continew.starter.extension.crud.service.BaseService;
36+
import top.continew.starter.extension.crud.service.CrudService;
3737
import top.continew.starter.extension.crud.validation.CrudValidationGroup;
3838

3939
import java.util.List;
4040

4141
/**
42-
* 控制器抽象基类
42+
* CRUD 控制器抽象基类
4343
*
4444
* @param <S> 业务接口
4545
* @param <L> 列表类型
4646
* @param <D> 详情类型
47-
* @param <Q> 查询条件
47+
* @param <Q> 查询条件类型
4848
* @param <C> 创建或修改请求参数类型
4949
* @author Charles7c
5050
* @since 1.0.0
5151
*/
52-
public abstract class AbstractBaseController<S extends BaseService<L, D, Q, C>, L, D, Q, C> implements CrudApiHandler {
52+
public abstract class AbstractCrudController<S extends CrudService<L, D, Q, C>, L, D, Q, C> implements CrudApiHandler {
5353

5454
@Autowired
5555
protected S baseService;

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/service/BaseService.java renamed to continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/service/CrudService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@
2626
import java.util.List;
2727

2828
/**
29-
* 业务接口基类
29+
* CRUD 业务接口
3030
*
3131
* @param <L> 列表类型
3232
* @param <D> 详情类型
33-
* @param <Q> 查询条件
33+
* @param <Q> 查询条件类型
3434
* @param <C> 创建或修改请求参数类型
3535
* @author Charles7c
3636
* @since 1.0.0
3737
*/
38-
public interface BaseService<L, D, Q, C> {
38+
public interface CrudService<L, D, Q, C> {
3939

4040
/**
4141
* 分页查询列表

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/BaseServiceImpl.java renamed to continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,18 @@
5252
import java.util.Optional;
5353

5454
/**
55-
* 业务实现基类
55+
* CRUD 业务实现基类
5656
*
5757
* @param <M> Mapper 接口
5858
* @param <T> 实体类型
5959
* @param <L> 列表类型
6060
* @param <D> 详情类型
61-
* @param <Q> 查询条件
61+
* @param <Q> 查询条件类型
6262
* @param <C> 创建或修改请求参数类型
6363
* @author Charles7c
6464
* @since 1.0.0
6565
*/
66-
public abstract class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseIdDO, L, D, Q, C> extends ServiceImpl<M, T> implements BaseService<L, D, Q, C> {
66+
public abstract class CrudServiceImpl<M extends BaseMapper<T>, T extends BaseIdDO, L, D, Q, C> extends ServiceImpl<M, T> implements CrudService<L, D, Q, C> {
6767

6868
protected final Class<L> listClass = this.currentListClass();
6969
protected final Class<D> detailClass = this.currentDetailClass();

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/BaseServiceImpl.java renamed to continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import cn.hutool.core.util.ReflectUtil;
3030
import cn.hutool.extra.spring.SpringUtil;
3131
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
32+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
3233
import com.baomidou.mybatisplus.core.metadata.IPage;
3334
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3435
import jakarta.servlet.http.HttpServletResponse;
@@ -39,11 +40,9 @@
3940
import top.continew.starter.core.util.ReflectUtils;
4041
import top.continew.starter.core.validation.CheckUtils;
4142
import top.continew.starter.core.validation.ValidationUtils;
42-
import top.continew.starter.data.mp.base.BaseMapper;
4343
import top.continew.starter.data.mp.service.impl.ServiceImpl;
4444
import top.continew.starter.data.mp.util.QueryWrapperHelper;
4545
import top.continew.starter.extension.crud.annotation.DictModel;
46-
import top.continew.starter.extension.crud.annotation.DictModel;
4746
import top.continew.starter.extension.crud.annotation.TreeField;
4847
import top.continew.starter.extension.crud.autoconfigure.CrudProperties;
4948
import top.continew.starter.extension.crud.autoconfigure.CrudTreeProperties;
@@ -58,18 +57,18 @@
5857
import java.util.*;
5958

6059
/**
61-
* 业务实现基类
60+
* CRUD 业务实现基类
6261
*
6362
* @param <M> Mapper 接口
6463
* @param <T> 实体类型
6564
* @param <L> 列表类型
6665
* @param <D> 详情类型
67-
* @param <Q> 查询条件
66+
* @param <Q> 查询条件类型
6867
* @param <C> 创建或修改参数类型
6968
* @author Charles7c
7069
* @since 1.0.0
7170
*/
72-
public abstract class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseIdDO, L, D, Q, C> extends ServiceImpl<M, T> implements BaseService<L, D, Q, C> {
71+
public abstract class CrudServiceImpl<M extends BaseMapper<T>, T extends BaseIdDO, L, D, Q, C> extends ServiceImpl<M, T> implements CrudService<L, D, Q, C> {
7372

7473
private Class<L> listClass;
7574
private Class<D> detailClass;

0 commit comments

Comments
 (0)