Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_abandon_grid

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();
-    }
 
 }

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<T> extends MyBaseMapper<T> {
+public interface BaseDao<T> extends BaseMapper<T> {
 
 }

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/interceptor/MybatisPlusSqlInjector.java

@@ -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<AbstractMethod> getMethodList(Class<?> mapperClass) {
-        final List<AbstractMethod> methods = super.getMethodList(mapperClass);
-        methods.add(new LogicDeleteByIdWithFill());
-        return methods;
-    }
-}

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/mapper/MyBaseMapper.java

@@ -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<Entity>  extends BaseMapper<Entity> {
-    /**
-     * 根据Id逻辑删除 并 填充其他字段的值 id必填
-     *
-     * @param entity 要删除的实体对象
-     * @return 受影响记录数量
-     */
-    int deleteByIdWithFill(Entity entity);
-
-}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/UserPatrolRecordServiceImpl.java

@@ -85,7 +85,7 @@ public class UserPatrolRecordServiceImpl extends BaseServiceImpl<UserPatrolRecor
             log.error("构建要插入的数据为空，param:{}", JSON.toJSONString(midPatrolFormDTO));
             return false;
         }
-        this.insertBatch(insertList, NumConstant.ONE_HUNDRED);
+        this.saveOrUpdateBatch(insertList, NumConstant.ONE_HUNDRED);
         return true;
     }
 
@@ -110,15 +110,9 @@ public class UserPatrolRecordServiceImpl extends BaseServiceImpl<UserPatrolRecor
         }
         data.forEach(o->{
             UserPatrolRecordEntity recordEntity = buildEntity(o);
-            //update
-            int effectRow = baseDao.updateById(recordEntity);
-            if (effectRow == NumConstant.ZERO) {
-                baseDao.insert(recordEntity);
-            }
+            this.saveOrUpdate(recordEntity);
             UserPatrolDetailEntity detailEntity = buildDetailEntity(o);
-            //先删除再新增
-            userPatrolDetailService.deleteByPatrolId(recordEntity.getId());
-            boolean insert = userPatrolDetailService.insert(detailEntity);
+            userPatrolDetailService.saveOrUpdate(detailEntity);
         });
 
         return true;

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);
-    }
 
 }