From 2f90938258e9aa1f0c1819080f4cf664a36fd02f Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 1 Nov 2022 16:26:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E4=BA=BA=E5=91=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E6=81=A2=E5=A4=8D=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E6=81=A2=E5=A4=8D=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E6=81=A2=E5=A4=8D=E5=B1=85=E6=B0=91=E7=9A=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=88=B0=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E6=AD=BB=E4=BA=A1=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=AD=E5=88=A0=E9=99=A4=E8=AF=A5=E5=B1=85=E6=B0=91=E7=9A=84?= =?UTF-8?q?=E8=BF=81=E5=87=BA=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=B9=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChangeDeathController.java | 15 ++++++ .../com/epmet/service/ChangeDeathService.java | 10 ++++ .../service/impl/ChangeDeathServiceImpl.java | 47 +++++++++++++++++-- 3 files changed, 68 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java index 963d2369d0..92cdab0235 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java @@ -13,6 +13,7 @@ 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.ChangeDeathDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.excel.ChangeDeathExcel; import com.epmet.service.ChangeDeathService; import org.apache.commons.collections4.CollectionUtils; @@ -94,6 +95,20 @@ public class ChangeDeathController { ExcelUtils.exportEpmetExcel(response, null, list, ChangeDeathExcel.class); } + /** + * 恢复死亡人员 + * @param tokenDto + * @param dto + * @return + */ + @PostMapping("recovery") + public Result recovery(@LoginUser TokenDto tokenDto,@RequestBody OnlyIdFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + changeDeathService.recovery(tokenDto,dto); + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeDeathService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeDeathService.java index 7be06b1436..09af4e2bdc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeDeathService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeDeathService.java @@ -2,8 +2,10 @@ package com.epmet.service; 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.commons.tools.utils.Result; import com.epmet.dto.ChangeDeathDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.entity.ChangeDeathEntity; import java.util.List; @@ -76,4 +78,12 @@ public interface ChangeDeathService extends BaseService { * @date 2022-05-05 */ void delete(String[] ids); + + /** + * 恢复迁出人员 + * @return + */ + void recovery(TokenDto tokenDto, OnlyIdFormDTO dto); + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java index 04690ad68a..452fd90f53 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java @@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; @@ -17,18 +20,19 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.constant.IcResiUserConstant; import com.epmet.dao.ChangeDeathDao; +import com.epmet.dao.IcResiUserDao; import com.epmet.dto.ChangeDeathDTO; import com.epmet.dto.ChangeWelfareDTO; import com.epmet.dto.form.IcResiUserTransferFormDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.dto.form.RentTenantDataFormDTO; import com.epmet.dto.result.RentTenantDataResultDTO; import com.epmet.entity.ChangeDeathEntity; +import com.epmet.entity.ChangeRelocationEntity; import com.epmet.entity.IcResiUserEntity; +import com.epmet.entity.IcUserChangeRecordEntity; import com.epmet.redis.ChangeDeathRedis; -import com.epmet.service.ChangeDeathService; -import com.epmet.service.ChangeWelfareService; -import com.epmet.service.IcResiUserService; -import com.epmet.service.IcUserTransferRecordService; +import com.epmet.service.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -65,6 +69,11 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl page(Map params) { params.put("customerId", loginUserUtil.getLoginUserCustomerId()); @@ -201,4 +210,34 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl