Merge remote-tracking branch 'origin/dev_abandon_grid' into develop

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/config/MybatisPlusConfig.java

@@ -12,6 +12,7 @@ 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;
@@ -44,5 +45,10 @@ 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.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.epmet.commons.mybatis.mapper.MyBaseMapper;
 
 /**
  * 基础Dao
@@ -16,6 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author Mark sunlightcs@gmail.com
  * @since 1.0.0
  */
-public interface BaseDao<T> extends BaseMapper<T> {
+public interface BaseDao<T> extends MyBaseMapper<T> {
 
 }

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

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,21 @@
+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/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java

@@ -127,7 +127,12 @@ public class ScreenCustomerGridServiceImpl extends BaseServiceImpl<ScreenCustome
                 if ("1".equals(grid.getDelFlag()) || grid.getAbandonFlag().compareTo(1) == 0) {
                     LambdaQueryWrapper<ScreenCustomerGridEntity> w = new LambdaQueryWrapper<>();
                     w.eq(ScreenCustomerGridEntity::getGridId, grid.getId());
-                    screenCustomerGridDao.delete(w);
+                    ScreenCustomerGridEntity e = new ScreenCustomerGridEntity();
+                    e.setDataEndTime(NumConstant.ONE_STR);
+                    e.setUpdatedTime(new Date());
+                    screenCustomerGridDao.update(e,w);
+                    // 此delete不更新 updatedTime
+//                    screenCustomerGridDao.delete(w);
                 }
             }
         }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java

@@ -233,6 +233,7 @@ public class GridController {
      * @param formDTO
      * @return
      */
+    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_DELETE)
     @PostMapping("abandon")
     public Result abandonGrid(@RequestBody AbandonGridFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, AddGroup.class);

epmet-user/epmet-user-server/src/test/java/com/epmet/epmetuser/test/UserControllerTest.java

@@ -1,7 +1,9 @@
 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;
@@ -16,10 +18,20 @@ 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);
+    }
 
 }