From 6da2a6682f7abdc0a2941c9243557275c025f9b0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 17 Mar 2022 09:08:40 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=A0=B9=E6=8D=AEid=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=88=A0=E9=99=A4=E6=96=B9=E6=B3=95=20=E5=B9=B6?= =?UTF-8?q?=E5=A1=AB=E5=85=85=E5=AD=97=E6=AE=B5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3a27ac45 --- .../mybatis/config/MybatisPlusConfig.java | 6 ----- .../epmet/commons/mybatis/dao/BaseDao.java | 4 ++-- .../interceptor/MybatisPlusSqlInjector.java | 23 ------------------- .../commons/mybatis/mapper/MyBaseMapper.java | 21 ----------------- .../epmetuser/test/UserControllerTest.java | 12 ---------- 5 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/interceptor/MybatisPlusSqlInjector.java delete mode 100644 epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/mapper/MyBaseMapper.java diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/config/MybatisPlusConfig.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/config/MybatisPlusConfig.java index d5537bb17d..8ef978f3c3 100644 --- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/config/MybatisPlusConfig.java +++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/config/MybatisPlusConfig.java @@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.epmet.commons.mybatis.interceptor.DataFilterInterceptor; -import com.epmet.commons.mybatis.interceptor.MybatisPlusSqlInjector; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; @@ -45,10 +44,5 @@ public class MybatisPlusConfig { interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); return interceptor; } - @Bean - @Order(2) - public MybatisPlusSqlInjector mybatisPlusSqlInjector(){ - return new MybatisPlusSqlInjector(); - } } diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/dao/BaseDao.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/dao/BaseDao.java index 30b95eaa4c..f23017b6f7 100644 --- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/dao/BaseDao.java +++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/dao/BaseDao.java @@ -8,7 +8,7 @@ package com.epmet.commons.mybatis.dao; -import com.epmet.commons.mybatis.mapper.MyBaseMapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 基础Dao @@ -16,6 +16,6 @@ import com.epmet.commons.mybatis.mapper.MyBaseMapper; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ -public interface BaseDao extends MyBaseMapper { +public interface BaseDao extends BaseMapper { } diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/interceptor/MybatisPlusSqlInjector.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/interceptor/MybatisPlusSqlInjector.java deleted file mode 100644 index 21cc58edd8..0000000000 --- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/interceptor/MybatisPlusSqlInjector.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.epmet.commons.mybatis.interceptor; - -import com.baomidou.mybatisplus.core.injector.AbstractMethod; -import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector; -import com.baomidou.mybatisplus.extension.injector.methods.LogicDeleteByIdWithFill; - -import java.util.List; - -/** - * desc:mybatisPlus拦截器 - * - * @author: LiuJanJun - * @date: 2022/3/16 6:33 下午 - * @version: 1.0 - */ -public class MybatisPlusSqlInjector extends DefaultSqlInjector { - @Override - public List getMethodList(Class mapperClass) { - final List methods = super.getMethodList(mapperClass); - methods.add(new LogicDeleteByIdWithFill()); - return methods; - } -} diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/mapper/MyBaseMapper.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/mapper/MyBaseMapper.java deleted file mode 100644 index 13d589e918..0000000000 --- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/mapper/MyBaseMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.epmet.commons.mybatis.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * desc:自定义mapper方法 - * - * @author: LiuJanJun - * @date: 2022/3/16 6:42 下午 - * @version: 1.0 - */ -public interface MyBaseMapper extends BaseMapper { - /** - * 根据Id逻辑删除 并 填充其他字段的值 id必填 - * - * @param entity 要删除的实体对象 - * @return 受影响记录数量 - */ - int deleteByIdWithFill(Entity entity); - -} diff --git a/epmet-user/epmet-user-server/src/test/java/com/epmet/epmetuser/test/UserControllerTest.java b/epmet-user/epmet-user-server/src/test/java/com/epmet/epmetuser/test/UserControllerTest.java index a777c0c4da..06d674a4e3 100644 --- a/epmet-user/epmet-user-server/src/test/java/com/epmet/epmetuser/test/UserControllerTest.java +++ b/epmet-user/epmet-user-server/src/test/java/com/epmet/epmetuser/test/UserControllerTest.java @@ -1,9 +1,7 @@ package com.epmet.epmetuser.test; import com.epmet.commons.tools.constant.AppClientConstant; -import com.epmet.dao.CustomerStaffDao; import com.epmet.dto.result.LoginUserDetailsResultDTO; -import com.epmet.entity.CustomerStaffEntity; import com.epmet.service.UserService; import org.junit.Test; import org.junit.runner.RunWith; @@ -18,20 +16,10 @@ public class UserControllerTest { @Autowired private UserService userService; - @Autowired - private CustomerStaffDao customerStaffDao; - @Test public void getLoginUserDetails() { LoginUserDetailsResultDTO loginUserDetails = userService.getLoginUserDetails(AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP, "4aaab913d9f11d90a2cb4dd21b075259"); System.out.println(loginUserDetails); } - @Test - public void del() { - CustomerStaffEntity entity = new CustomerStaffEntity(); - //entity.setId("1476792429129445378"); - entity.setRealName("刘建军3"); - customerStaffDao.deleteByIdWithFill(entity); - } }