diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserFormDTO.java new file mode 100644 index 0000000000..29ea3fa9b3 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 居民注册信息查询入参DTO + * @Author yinzuomei + * @Date 2020/3/30 10:26 + */ +@Data +public class IcResiUserFormDTO implements Serializable { + private static final long serialVersionUID = 9156247659994638103L; + @NotBlank(message = "徽章id不能为空", groups = {ManageGroup.class}) + private String badgeId; + /** + * 网格Id + */ + @NotBlank(message = "网格id不能为空", groups = {AuditGroup.class}) + private String gridId; + public interface ManageGroup {} + public interface AuditGroup {} +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 37d3bde4d5..5dca820caf 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -17,7 +17,9 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; 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; @@ -26,6 +28,8 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.IcResiUserDTO; +import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.form.IcResiUserFormDTO; import com.epmet.excel.IcResiUserExcel; import com.epmet.service.IcResiUserService; import org.springframework.beans.factory.annotation.Autowired; @@ -91,4 +95,24 @@ public class IcResiUserController { ExcelUtils.exportExcelToTarget(response, null, list, IcResiUserExcel.class); } + /** + * @Author sun + * @Description 党建互联平台--保存居民信息 + **/ + @PostMapping("add") + public Result add(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserFormDTO formDTO) { + icResiUserService.add(formDTO); + return new Result(); + } + + /** + * @Author sun + * @Description 党建互联平台--修改居民信息 + **/ + @PostMapping("edit") + public Result edit(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserFormDTO formDTO) { + icResiUserService.edit(formDTO); + return new Result(); + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 5f66ecb881..507e214ef5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -19,7 +19,9 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcResiUserDTO; +import com.epmet.dto.form.IcResiUserFormDTO; import com.epmet.entity.IcResiUserEntity; import java.util.List; @@ -92,4 +94,16 @@ public interface IcResiUserService extends BaseService { * @date 2021-10-26 */ void delete(String[] ids); + + /** + * @Author sun + * @Description 党建互联平台--保存居民信息 + **/ + void add(IcResiUserFormDTO formDTO); + + /** + * @Author sun + * @Description 党建互联平台--修改居民信息 + **/ + void edit(IcResiUserFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 002d3b248f..3a8c2b195a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -25,6 +25,7 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.IcResiUserDao; import com.epmet.dto.IcResiUserDTO; +import com.epmet.dto.form.IcResiUserFormDTO; import com.epmet.entity.IcResiUserEntity; import com.epmet.redis.IcResiUserRedis; import com.epmet.service.IcResiUserService; @@ -101,4 +102,22 @@ public class IcResiUserServiceImpl extends BaseServiceImpl