删掉居民

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DelIcResiUserFormDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 删除居民
+ * @Author yinzuomei
+ * @Date 2021/11/2 9:45 上午
+ */
+@Data
+public class DelIcResiUserFormDTO implements Serializable {
+    private static final long serialVersionUID = 2455694966457219261L;
+
+    public interface IdGroup {
+    }
+
+    @NotBlank(message = "icResiUserId不能为空", groups = IdGroup.class)
+    private String icResiUserId;
+    @NotBlank(message = "token获取的customerId不能为空", groups = IdGroup.class)
+    private String customerId;
+    private String formCode="resi_base_info";
+}
+

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -31,16 +31,12 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcResiUserDTO;
-import com.epmet.dto.form.CustomerFormQueryDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.IcResiDetailFormDTO;
-import com.epmet.dto.form.IcResiUserFormDTO;
-import com.epmet.dto.form.IcResiUserPageFormDTO;
 import com.epmet.dto.result.CustomerFormResultDTO;
 import com.epmet.dto.result.FormGroupDTO;
 import com.epmet.dto.result.FormItem;
@@ -108,11 +104,11 @@ public class IcResiUserController {
         return new Result();
     }
 
-    @DeleteMapping
+    @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@LoginUser TokenDto tokenDto,@RequestBody DelIcResiUserFormDTO formDTO){
-        //效验数据
+        formDTO.setCustomerId(tokenDto.getCustomerId());
-        AssertUtils.isArrayEmpty(ids, "id");
+        ValidatorUtils.validateEntity(formDTO,DelIcResiUserFormDTO.IdGroup.class);
-        icResiUserService.delete(ids);
+        icResiUserService.delete(formDTO);
         return new Result();
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -77,4 +77,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                                     @Param("icResiUserId") String icResiUserId,
                                                     @Param("subTableName") String subTableName);
 
+    int updateToDel(String icResiUserId);
+
+    int updateSubTableToDel(@Param("subTalbeName") String subTalbeName, @Param("icResiUserId")String icResiUserId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcResiUserDTO;
+import com.epmet.dto.form.DelIcResiUserFormDTO;
 import com.epmet.dto.form.IcResiDetailFormDTO;
 import com.epmet.dto.form.IcResiUserFormDTO;
 import com.epmet.dto.form.IcResiUserPageFormDTO;
@@ -89,14 +90,13 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
     void update(IcResiUserDTO dto);
 
     /**
-     * 批量删除
+     * 单个删除
      *
-     * @param ids
      * @return void
      * @author generator
      * @date 2021-10-26
      */
-    void delete(String[] ids);
+    void delete(DelIcResiUserFormDTO formDTO);
 
     /**
      * @Author sun

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -127,9 +127,15 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
+    public void delete(DelIcResiUserFormDTO formDTO) {
-        // 逻辑删除（@TableLogic 注解）
+        baseDao.updateToDel(formDTO.getIcResiUserId());
-        baseDao.deleteBatchIds(Arrays.asList(ids));
+        CustomerFormQueryDTO queryDTO = ConvertUtils.sourceToTarget(formDTO, CustomerFormQueryDTO.class);
+        Result<Set<String>> subTableRes = operCustomizeOpenFeignClient.queryIcResiSubTables(queryDTO);
+        if (subTableRes.success() && !CollectionUtils.isEmpty(subTableRes.getData())) {
+            for (String subTalbeName : subTableRes.getData()) {
+                baseDao.updateSubTableToDel(subTalbeName, formDTO.getIcResiUserId());
+            }
+        }
     }
 
     /**

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -97,5 +97,11 @@
         order by ic_resi_user.CREATED_TIME desc
     </select>
 
+    <update id="updateToDel" parameterType="java.lang.String">
+        update ic_resi_user set del_flag='1' where id=#{icResiUserId}
+    </update>
 
+    <update id="updateSubTableToDel" parameterType="map">
+        update ${subTalbeName} set del_flag='1' where IC_RESI_USER=#{icResiUserId}
+    </update>
 </mapper>