diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java index e62ed4b7ce..256113a848 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java @@ -108,4 +108,14 @@ public interface Constant { * 版本控制用 */ String VERSION_CONTROL = "/{version}"; + + /** + * 是 + */ + String YES="yes"; + + /** + * 否 + */ + String NO="no"; } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/FieldConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/FieldConstant.java index d99374d1b0..a3bed53c8f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/FieldConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/FieldConstant.java @@ -46,6 +46,9 @@ public interface FieldConstant { String COMMUNITY_ID = "COMMUNITY_ID"; String COMMUNITY_ID_HUMP = "communityId"; + String CUSTOMER_ID = "CUSTOMER_ID"; + String CUSTOMER_ID_HUMP = "customerId"; + String GRID_ID = "GRID_ID"; String GRID_ID_HUMP = "gridId"; diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index c659d19404..f2f209ea6e 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -17,16 +17,7 @@ public enum EpmetErrorCode { MOBILE_CODE_ERROR(8102, "手机验证码错误"), AUTO_CONFIRM_FAILED(8103, "自动认证失败"), MOBILE_GET_CODE_ERROR(8104,"获取手机验证码失败"), - MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"), - - - /** - * 手机号已存在 - */ - MOBILE_EXIST(8201, "该手机号已注册居民，请使用其他手机号注册！"), - PARAMETER_EXCEPTION(8202, "必要参数存在空值或手机号输入不合规，请检查参数赋值情况！！"), - UPDATE_EXCEPTION(8203, "用户居民注册访问记录表更新数据失败！"), - PARTICIPATION_EXCEPTION(8204, "参数异常，请检查所传参数是否合规！"); + MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"); private int value; diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java index 6e0d415251..693524057e 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java @@ -17,12 +17,12 @@ public class MymessageResultDTO implements Serializable { /** * 消息主键 */ - private String messageId; + private String id; /** * 消息标题 */ - private String messageTitle; + private String title; /** * 消息内容 @@ -32,5 +32,5 @@ public class MymessageResultDTO implements Serializable { /** * 发布消息时间 */ - private Date noticeTime; + private Date createdTime; } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/UserMessageConstans.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/UserMessageConstans.java new file mode 100644 index 0000000000..b67f9251df --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/UserMessageConstans.java @@ -0,0 +1,11 @@ +package com.epmet.constant; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/7 14:40 + */ +public interface UserMessageConstans { + String READ = "read"; + String UNREAD = "unread"; +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java index cfe7302a4f..3c9a2ba01a 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java @@ -23,9 +23,10 @@ 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.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.UserMessageDTO; +import com.epmet.dto.form.MymessageFormDTO; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.excel.UserMessageExcel; import com.epmet.service.UserMessageService; @@ -47,11 +48,11 @@ import java.util.Map; @RequestMapping("usermessage") public class UserMessageController { - @Autowired - private UserMessageService userMessageService; + @Autowired + private UserMessageService userMessageService; - @GetMapping("page") - public Result> page(@RequestParam Map params){ + @PostMapping("page") + public Result> page(@RequestBody Map params){ PageData page = userMessageService.page(params); return new Result>().ok(page); } @@ -92,6 +93,28 @@ public class UserMessageController { ExcelUtils.exportExcelToTarget(response, null, list, UserMessageExcel.class); } + /** + * 单条消息标记为已读 + * + * @param messageDTO 参数 + * @return Result + */ + @PostMapping("readmsg") + public Result readMessage(@RequestBody UserMessageDTO messageDTO) { + return userMessageService.readMessage(messageDTO); + } + + /** + * 消息全部已读 + * + * @param messageDTO 参数 + * @return Result + */ + @PostMapping("readall") + public Result readAllMessage(@RequestBody UserMessageDTO messageDTO) { + return userMessageService.readAllMessage(messageDTO); + } + /** * @param formDto * @return com.epmet.commons.tools.utils.Result @@ -104,4 +127,9 @@ public class UserMessageController { ValidatorUtils.validateEntity(formDto); return userMessageService.saveUserMessage(formDto); } -} + + @PostMapping("mymsg") + public Result> getMyMessageList(@RequestBody MymessageFormDTO params){ + return userMessageService.getMyMessageList(params); + } +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/UserMessageDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/UserMessageDao.java index 01c3898318..db8cc78e3c 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/UserMessageDao.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/UserMessageDao.java @@ -18,9 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.MymessageFormDTO; import com.epmet.entity.UserMessageEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 用户消息表 * @@ -29,11 +32,12 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface UserMessageDao extends BaseDao { + /** - * 更新阅读状态为已读 - * - * @param entity 参数 + * 获取消息分页 + * @param messageFromDTO + * @return */ - void updateReadFlag(UserMessageEntity entity); + List selectMyMessageList(MymessageFormDTO messageFromDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java index 1e036405bb..1555f73aed 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java @@ -21,6 +21,7 @@ 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.UserMessageDTO; +import com.epmet.dto.form.MymessageFormDTO; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.entity.UserMessageEntity; @@ -95,13 +96,21 @@ public interface UserMessageService extends BaseService { */ void delete(String[] ids); + /** + * 单条消息标记为已读 + * + * @param messageDTO 参数 + * @return Result + */ + Result readMessage(UserMessageDTO messageDTO); + /** * 全部已读 * * @param messageDTO 参数 * @return Result */ - Result allRead(UserMessageDTO messageDTO); + Result readAllMessage(UserMessageDTO messageDTO); /** * @param formDto @@ -111,4 +120,11 @@ public interface UserMessageService extends BaseService { * @Date 2020/4/7 15:34 **/ Result saveUserMessage(UserMessageFormDTO formDto); -} + + /** + * 获取我的消息列表 + * @param param 参数 + * @return + */ + Result> getMyMessageList(MymessageFormDTO param); +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java index 953595c3bf..8354b9166c 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java @@ -20,12 +20,15 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.UserMessageConstans; import com.epmet.dao.UserMessageDao; import com.epmet.dto.UserMessageDTO; +import com.epmet.dto.form.MymessageFormDTO; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.entity.UserMessageEntity; import com.epmet.redis.UserMessageRedis; @@ -69,15 +72,15 @@ public class UserMessageServiceImpl extends BaseServiceImpl getWrapper(Map params) { String id = (String) params.get(FieldConstant.ID_HUMP); - String communityId = (String) params.get(FieldConstant.COMMUNITY_ID_HUMP); + String customerId = (String) params.get(FieldConstant.CUSTOMER_ID_HUMP); String gridId = (String) params.get(FieldConstant.GRID_ID_HUMP); - String userId = (String) params.get(FieldConstant.USER_ID_HUMP); + String userId = (String) params.get(FieldConstant.USER_ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id) - .eq(StringUtils.isNotBlank(communityId), FieldConstant.COMMUNITY_ID, communityId) - .eq(StringUtils.isNotBlank(gridId), FieldConstant.GRID_ID, gridId) - .eq(StringUtils.isNotBlank(userId), FieldConstant.USER_ID, userId); + .eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID, customerId) + .eq(StringUtils.isNotBlank(gridId), FieldConstant.GRID_ID, gridId) + .eq(StringUtils.isNotBlank(userId), FieldConstant.USER_ID, userId); return wrapper; } @@ -109,10 +112,43 @@ public class UserMessageServiceImpl extends BaseServiceImpl getWrapper(UserMessageDTO messageDTO) { + String id = messageDTO.getId(); + String customerId = messageDTO.getCustomerId(); + String gridId = messageDTO.getGridId(); + String userId = messageDTO.getUserId(); + String readFlag = messageDTO.getReadFlag(); + String deFlag = messageDTO.getDelFlag(); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id) + .eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID, customerId) + .eq(StringUtils.isNotBlank(gridId), FieldConstant.GRID_ID, gridId) + .eq(StringUtils.isNotBlank(userId), FieldConstant.USER_ID, userId) + .eq(StringUtils.isNotBlank(deFlag), FieldConstant.DEL_FLAG, deFlag) + .eq(StringUtils.isNotBlank(readFlag), "read_flag", readFlag); + + return wrapper; + } @Override public Result saveUserMessage(UserMessageFormDTO formDto) { @@ -121,4 +157,12 @@ public class UserMessageServiceImpl extends BaseServiceImpl> getMyMessageList(MymessageFormDTO params) { + int pageIndex = (params.getPageNo() - NumConstant.ONE) * params.getPageSize(); + params.setPageNo(pageIndex); + List myMessageList = baseDao.selectMyMessageList(params); + return new Result>().ok(ConvertUtils.sourceToTarget(myMessageList, UserMessageDTO.class)); + } + +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml index 381f748093..e00cc96051 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml @@ -3,7 +3,7 @@ - + @@ -19,9 +19,35 @@ - - + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 1ab1be15fe..54875bf0ce 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -61,6 +61,12 @@ gov-org-client 2.0.0 + + com.epmet + resi-partymember-client + 2.0.0 + compile + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java index 38d23d2962..29058e3247 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.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; @@ -27,6 +29,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.CustomerStaffGridDTO; import com.epmet.excel.CustomerStaffGridExcel; +import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO; import com.epmet.service.CustomerStaffGridService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -91,4 +94,14 @@ public class CustomerStaffGridController { ExcelUtils.exportExcelToTarget(response, null, list, CustomerStaffGridExcel.class); } + /** + * @param + * @Author sun + * @Description 政府端-热心居民申请人工审核 + **/ + @PostMapping("manageaudit") + public Result manageAudit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedAuditFormDTO formDTO) { + return customerStaffGridService.manageAudit(tokenDTO, formDTO); + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java new file mode 100644 index 0000000000..f1e7ef4c9e --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java @@ -0,0 +1,25 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.fallback.ResiPartymemberFeignClientFallBack; +import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; + +/** + * @Description 政府端工作人员审核 + * @Author sun + */ +@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class) +public interface ResiPartymemberFeignClient { + + /** + * @Author sun + * @Description 政府端-热心居民申请人工审核 + **/ + @PostMapping(value = "resi/partymember/resiwarmheartedapply/manageaudit") + Result manageAudit(ResiWarmheartedAuditFormDTO formDTO); + + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java new file mode 100644 index 0000000000..90ddb00086 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java @@ -0,0 +1,21 @@ +package com.epmet.feign.fallback; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.ResiPartymemberFeignClient; +import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO; +import org.springframework.stereotype.Component; + +/** + * @Description 政府端工作人员审核 + * @Author sun + */ +@Component +public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignClient { + + @Override + public Result manageAudit(ResiWarmheartedAuditFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "manageAudit", formDTO); + } +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java index 9ebc45c530..8ddb524092 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java @@ -19,8 +19,11 @@ 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.CustomerStaffGridDTO; import com.epmet.entity.CustomerStaffGridEntity; +import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO; import java.util.List; import java.util.Map; @@ -92,4 +95,14 @@ public interface CustomerStaffGridService extends BaseService page(Map params) { @@ -65,8 +74,8 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -101,4 +110,25 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO); + @PostMapping(value = "epmetuser/userresiinfo/getuserresiinfo", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO); /** * @param userRoleFormDTO @@ -40,4 +42,14 @@ public interface EpmetUserFeignClient { **/ @PostMapping(value = "epmetuser/userrole/getuserroleinfo", consumes = MediaType.APPLICATION_JSON_VALUE) Result> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO); + + /** + * @param userResiInfoListFormDTO + * @return com.epmet.commons.tools.utils.Result> + * @Author yinzuomei + * @Description 根据userId集合，查询用户注册信息 + * @Date 2020/4/7 22:14 + **/ + @PostMapping(value = "epmetuser/userresiinfo/getuserresiinfolist", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java index cd650df6ff..6519d76517 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java @@ -3,9 +3,10 @@ package com.epmet.modules.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.form.UserRoleFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.modules.feign.EpmetUserFeignClient; import org.springframework.stereotype.Component; @@ -21,7 +22,7 @@ import java.util.List; public class EpmetUserFeignClientFallback implements EpmetUserFeignClient { @Override - public Result getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) { + public Result getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoDTO", userResiInfoFormDTO); } @@ -29,4 +30,9 @@ public class EpmetUserFeignClientFallback implements EpmetUserFeignClient { public Result> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserRoleInfo", userRoleFormDTO); } + + @Override + public Result> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", userResiInfoListFormDTO); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 92fe240414..a37bf1aa7a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -30,6 +30,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserRoleFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.group.dao.ResiGroupDao; @@ -244,7 +245,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl().error(ModuleConstant.GETGROUPSUMMARIZE_FAILED); } //获取组长信息 - Result groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupSummarizeFormDTO.getGroupId()); + Result groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupSummarizeFormDTO.getGroupId()); if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { groupSummarizeResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName()); } else { @@ -260,7 +261,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl getGroupLeaderUserInfo(String groupId) { + private Result getGroupLeaderUserInfo(String groupId) { //群主名称需要调用feign查询 ResiGroupEntity resiGroupEntity = baseDao.selectById(groupId); if (null == resiGroupEntity) { @@ -370,7 +371,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); + Result result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) { logger.info("居民注册信息查询失败"); return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getValue(),EpmetErrorCode.CANNOT_JOIN_GROUP.getName()); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/GroupInvitationDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/GroupInvitationDao.java index c521956b8b..0e3d4ce0f3 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/GroupInvitationDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/GroupInvitationDao.java @@ -19,8 +19,7 @@ package com.epmet.modules.invitation.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.invitation.entity.GroupInvitationEntity; -import com.epmet.resi.group.dto.invitation.form.LinkGroupInfoFormDTO; -import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO; +import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -40,5 +39,5 @@ public interface GroupInvitationDao extends BaseDao { * @Description 根据群邀请连接查询群基本信息 * @Date 2020/3/31 23:22 **/ - LinkGroupInfoResultDTO selectLinkGroupInfo(@Param("groupId") String groupId); + LinkGroupInfoDTO selectLinkGroupInfo(@Param("groupId") String groupId); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java index dbd4e47f6e..3b9d3d1059 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.AppClientConstant; +import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -31,10 +32,12 @@ import com.epmet.constant.ReadFlagConstant; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.feign.MessageFeignClient; import com.epmet.modules.constant.UserMessageConstant; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.group.dao.ResiGroupDao; +import com.epmet.modules.group.entity.ResiGroupEntity; import com.epmet.modules.group.service.ResiGroupService; import com.epmet.modules.invitation.dao.GroupInvitationDao; import com.epmet.modules.invitation.entity.GroupInvitationEntity; @@ -54,10 +57,13 @@ import com.epmet.resi.group.dto.invitation.form.AccetInvitationFormDTO; import com.epmet.resi.group.dto.invitation.form.CreateGroupInvitationFormDTO; import com.epmet.resi.group.dto.invitation.form.LinkGroupInfoFormDTO; import com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO; +import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoDTO; import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO; import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -72,7 +78,7 @@ import java.util.*; */ @Service public class GroupInvitationServiceImpl extends BaseServiceImpl implements GroupInvitationService { - + private Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private ResiGroupMemberDao resiGroupMemberDao; @@ -165,7 +171,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl().error(ModuleConstant.CANNOT_SHARED); } //3、插入一条邀请记录 @@ -195,22 +201,63 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl getLinkGroupInfo(LinkGroupInfoFormDTO formDTO) { //校验是否存在该邀请连接 Result validResult = this.checkLinkValid(formDTO.getInvitationId()); - if(!validResult.success()){ - return new Result().error(validResult.getCode(),validResult.getMsg()); + if (!validResult.success()) { + return new Result().error(validResult.getCode(), validResult.getMsg()); + } + LinkGroupInfoResultDTO linkGroupInfoResultDTO = new LinkGroupInfoResultDTO(); + //1、查询是否在群内 + ResiGroupMemberDTO resiGroupMemberDTO = resiGroupMemberDao.selectGroupMemberInfo(validResult.getData().getResiGroupId(), formDTO.getUserId()); + if (null != resiGroupMemberDTO && !MemberStateConstant.REMOVED.equals(resiGroupMemberDTO.getStatus())) { + linkGroupInfoResultDTO.setInGroup(Constant.YES); + return new Result().ok(linkGroupInfoResultDTO); + } else { + linkGroupInfoResultDTO.setInGroup(Constant.NO); + } + //2、查询组信息 + LinkGroupInfoDTO groupInfo = baseDao.selectLinkGroupInfo(validResult.getData().getResiGroupId()); + //3、获取组长信息 + Result groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupInfo.getGroupId()); + if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { + groupInfo.setLeaderName(groupLeaderUserInfo.getData().getShowName()); + } else { + logger.info("组长注册信息查询失败" + groupLeaderUserInfo.getMsg()); } - LinkGroupInfoResultDTO linkGroupInfoResultDTO = baseDao.selectLinkGroupInfo(validResult.getData().getResiGroupId()); + linkGroupInfoResultDTO.setGroupInfo(groupInfo); return new Result().ok(linkGroupInfoResultDTO); } - private Result checkLinkValid(String invitationId){ + /** + * @param groupId + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 根据组id查询组长信息 + * @Date 2020/3/30 15:07 + **/ + private Result getGroupLeaderUserInfo(String groupId) { + //群主名称需要调用feign查询 + ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupId); + if (null == resiGroupEntity) { + return new Result<>(); + } + ResiGroupMemberDTO groupMemberDTO = resiGroupDao.selectGroupLeader(groupId); + if (null == groupMemberDTO) { + return new Result<>(); + } + UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO(); + resiUserInfoFormDTO.setCustomerId(resiGroupEntity.getCustomerId()); + resiUserInfoFormDTO.setUserId(groupMemberDTO.getCustomerUserId()); + return epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); + } + + private Result checkLinkValid(String invitationId) { //校验是否存在该邀请连接 GroupInvitationDTO groupInvitationDTO = this.get(invitationId); //Date1.after(Date2),当Date1大于Date2时，返回TRUE，当小于等于时，返回false； if (null == groupInvitationDTO) { - return new Result().error(EpmetErrorCode.LOSE_EFFICACY.getValue(),EpmetErrorCode.LOSE_EFFICACY.getName()); + return new Result().error(EpmetErrorCode.LOSE_EFFICACY.getValue(), EpmetErrorCode.LOSE_EFFICACY.getName()); } - if (null != groupInvitationDTO && groupInvitationDTO.getValidEndTime().after(new Date())) { - return new Result().error(EpmetErrorCode.LOSE_EFFICACY.getValue(),EpmetErrorCode.LOSE_EFFICACY.getName()); + if (null != groupInvitationDTO && !groupInvitationDTO.getValidEndTime().after(new Date())) { + return new Result().error(EpmetErrorCode.LOSE_EFFICACY.getValue(), EpmetErrorCode.LOSE_EFFICACY.getName()); } return new Result().ok(groupInvitationDTO); } @@ -226,8 +273,8 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl validResult = this.checkLinkValid(formDTO.getInvitationId()); - if(!validResult.success()){ - return new Result().error(validResult.getCode(),validResult.getMsg()); + if (!validResult.success()) { + return new Result().error(validResult.getCode(), validResult.getMsg()); } //2、校验是否已经注册居民 ResiGroupDTO resiGroupDTO = resiGroupService.get(validResult.getData().getResiGroupId()); @@ -236,65 +283,69 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl userResiInfoDTOResult=epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO); - if(!userResiInfoDTOResult.success()||null==userResiInfoDTOResult.getData()){ - return ; + Result userResiInfoDTOResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO); + if (!userResiInfoDTOResult.success() || null == userResiInfoDTOResult.getData()) { + return; } - UserMessageFormDTO userMessage=new UserMessageFormDTO(); + UserMessageFormDTO userMessage = new UserMessageFormDTO(); userMessage.setApp(AppClientConstant.APP_RESI); userMessage.setCustomerId(resiGroupDTO.getCustomerId()); userMessage.setGridId(resiGroupDTO.getGridId()); - String messageContent=String.format(UserMessageConstant.INVITED_JOIN_GROUP,userResiInfoDTOResult.getData().getShowName(),resiGroupDTO.getGroupName()); + String messageContent = String.format(UserMessageConstant.INVITED_JOIN_GROUP, userResiInfoDTOResult.getData().getShowName(), resiGroupDTO.getGroupName()); userMessage.setMessageContent(messageContent); userMessage.setReadFlag(ReadFlagConstant.UN_READ); userMessage.setTitle(UserMessageConstant.GROUP_TITLE); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java index 0744a4c689..0daad30427 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java @@ -151,4 +151,13 @@ public interface ResiGroupMemberService extends BaseService list = baseDao.selectListGroupMember(groupMemberListFormDTO); if (null != list && list.size() > 0) { + List userIdList=new ArrayList<>(); for (GroupMemberListResultDTO groupMemberListResultDTO : list) { - groupMemberListResultDTO.setUserShowName("测试昵称"); - groupMemberListResultDTO.setHeadPhoto("https://wx.qlogo.cn/mmopen/vi_32/PiajxSqBRaEIXGqhj0JakGnhk0L4x31XuWyQM4OxnriaKD4GuAgr8GdLpwu8jphH0oQPbPy0pepWU5iciaIeQwUJPg/132"); - + userIdList.add(groupMemberListResultDTO.getUserId()); + } + UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO(); + formDTO.setUserIdList(userIdList); + Result> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO); + if(userResiInfoDTOListResult.success()){ + for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){ + for (GroupMemberListResultDTO groupMember : list) { + if(groupMember.getUserId().equals(userResiInfo.getUserId())){ + groupMember.setUserShowName(userResiInfo.getShowName()); + groupMember.setHeadPhoto(userResiInfo.getHeadPhoto()); + break; + } + } + } } } return new Result>().ok(list); @@ -232,10 +248,25 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl list = baseDao.selectListApplyingMember(applyingMemberFormDTO); if (null != list && list.size() > 0) { + List userIdList=new ArrayList<>(); for (ApplyingMemberResultDTO applyingMemberResultDTO : list) { - applyingMemberResultDTO.setApplyUserName("测试昵称"); - applyingMemberResultDTO.setApplyUserHeadPhoto("https://wx.qlogo.cn/mmopen/vi_32/PiajxSqBRaEIXGqhj0JakGnhk0L4x31XuWyQM4OxnriaKD4GuAgr8GdLpwu8jphH0oQPbPy0pepWU5iciaIeQwUJPg/132"); + userIdList.add(applyingMemberResultDTO.getApplyUserId()); + } + UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO(); + formDTO.setUserIdList(userIdList); + Result> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO); + if(userResiInfoDTOListResult.success()){ + for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){ + for (ApplyingMemberResultDTO memberInfo : list) { + if(memberInfo.getApplyUserId().equals(userResiInfo.getUserId())){ + memberInfo.setApplyUserName(userResiInfo.getShowName()); + memberInfo.setApplyUserHeadPhoto(userResiInfo.getHeadPhoto()); + break; + } + } + } } + } return new Result>().ok(list); } @@ -250,35 +281,40 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl userInfo = - epmetUserFeignClient.getUserResiInfoDTO(userParam); + Result userInfo = epmetUserFeignClient.getUserResiInfoDTO(userParam); if(userInfo.success()){ resultDTO.setReleaseUserName(userInfo.getData().getSurname() + userInfo.getData().getName()); @@ -559,4 +558,4 @@ public class ResiTopicServiceImpl extends BaseServiceImpl + @@ -152,6 +153,7 @@ + diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/invitation/GroupInvitationDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/invitation/GroupInvitationDao.xml index b814840946..1e91c7c76e 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/invitation/GroupInvitationDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/invitation/GroupInvitationDao.xml @@ -4,7 +4,7 @@ - SELECT rg.id AS groupId, rg.GROUP_HEAD_PHOTO AS groupHeadPhoto, diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java index 4daeeb6450..a7eb4c5ded 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - * + *

* https://www.renren.io - * + *

* 版权所有，侵权必究！ */ @@ -22,4 +22,6 @@ import com.epmet.commons.tools.exception.ErrorCode; */ public interface ModuleErrorCode extends ErrorCode { + String PARTICIPATION_EXCEPTION = "参数异常,请检查所传参数是否符合规范以及是否存在空值"; + String MOBILE_EXCEPTION = "手机号输入不符合规范，请重新输入"; } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java new file mode 100644 index 0000000000..15426bb538 --- /dev/null +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java @@ -0,0 +1,48 @@ +package com.epmet.modules.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.UserMessageDTO; +import com.epmet.dto.form.MymessageFormDTO; +import com.epmet.modules.feign.fallback.EpmetMessageFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/7 14:55 + */ +@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = EpmetMessageFeignClientFallBack.class) +public interface EpmetMessageFeignClient { + + /** + * 获取消息列表 + * + * @param params 参数 + * @return Result> + */ + @PostMapping("/message/usermessage/mymsg") + Result> getMyMessageList(@RequestBody MymessageFormDTO params); + + /** + * 单条消息已读 + * + * @param messageDTO 参数 + * @return Result + */ + @PostMapping("/message/usermessage/readmsg") + Result readMessage(@RequestBody UserMessageDTO messageDTO); + + /** + * 消息全部已读 + * + * @param messageDTO 参数 + * @return Result + */ + @PostMapping("/message/usermessage/readall") + Result readAllMessage(@RequestBody UserMessageDTO messageDTO); +} diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java index 541d86fb2b..63adf636a3 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java @@ -7,7 +7,6 @@ import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO; import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO; import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; -import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO; import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO; @@ -78,12 +77,4 @@ public interface ResiPartymemberFeignClient { @PostMapping("/resi/partymember/confirm/extra") Result partyMemberInfoExtra(@RequestBody PartymemberInfoDTO partyMemberInfoDTO); - /** - * @Author sun - * @Description 政府端-热心居民申请人工审核 - **/ - @PostMapping(value = "resi/partymember/resiwarmheartedapply/manageaudit") - Result manageAudit(ResiWarmheartedAuditFormDTO formDTO); - - } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallBack.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallBack.java new file mode 100644 index 0000000000..72758c4a8e --- /dev/null +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallBack.java @@ -0,0 +1,34 @@ +package com.epmet.modules.feign.fallback; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.UserMessageDTO; +import com.epmet.dto.form.MymessageFormDTO; +import com.epmet.modules.feign.EpmetMessageFeignClient; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/7 14:58 + */ +@Component +public class EpmetMessageFeignClientFallBack implements EpmetMessageFeignClient { + @Override + public Result> getMyMessageList(MymessageFormDTO params) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "getMyMessageList", params); + } + + @Override + public Result readMessage(UserMessageDTO messageDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "readMessage", messageDTO); + } + + @Override + public Result readAllMessage(UserMessageDTO messageDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "allRead", messageDTO); + } +} diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java index acff6efa3f..7559eb81fb 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java @@ -8,7 +8,6 @@ import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO; import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO; import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; -import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO; import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO; @@ -62,9 +61,4 @@ public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignC public Result partyMemberInfoExtra(PartymemberInfoDTO partyMemberInfoDTO) { return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "partyMemberInfoExtra", partyMemberInfoDTO); } - - @Override - public Result manageAudit(ResiWarmheartedAuditFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "manageAudit", formDTO); - } } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java index fa626f84ba..d0c75c990c 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java @@ -4,8 +4,8 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.UserMessageDTO; import com.epmet.dto.form.MymessageFormDTO; -import com.epmet.dto.result.MymessageResultDTO; import com.epmet.modules.message.service.UserMessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,12 +31,12 @@ public class UserMessageController { * @Date 2020/3/29 20:53 **/ @PostMapping("getmymessage") - public Result> getMyMessage(@LoginUser TokenDto tokenDto, - @RequestBody MymessageFormDTO mymessageFormDTO) { + public Result> getMyMessage(@LoginUser TokenDto tokenDto, + @RequestBody MymessageFormDTO mymessageFormDTO) { mymessageFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(mymessageFormDTO); //逻辑待实现 - return new Result(); + return userMessageService.getMessageList(tokenDto, mymessageFormDTO); } /** @@ -51,7 +51,7 @@ public class UserMessageController { public Result readMessage(@LoginUser TokenDto tokenDto, @RequestParam("messageId") String messageId) { //逻辑待实现 - return new Result(); + return userMessageService.readMessage(messageId); } /** @@ -62,8 +62,8 @@ public class UserMessageController { * @Date 2020/3/29 21:06 **/ @PostMapping("readallmsg") - public Result readAllMessage(@LoginUser TokenDto tokenDto) { + public Result readAllMessage(@LoginUser TokenDto tokenDto, @RequestBody UserMessageDTO userMessageDTO) { //逻辑待实现 - return new Result(); + return userMessageService.readAllMessage(tokenDto, userMessageDTO); } } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/UserMessageService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/UserMessageService.java index 165d9f3650..af96e93389 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/UserMessageService.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/UserMessageService.java @@ -1,9 +1,42 @@ package com.epmet.modules.message.service; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.UserMessageDTO; +import com.epmet.dto.form.MymessageFormDTO; + +import java.util.List; + /** * @Description 我的消息 * @Author yinzuomei * @Date 2020/3/29 20:50 */ public interface UserMessageService { + + /** + * 获取消息列表 + * + * @param tokenDto token + * @param messageFromDTO 参数 + * @return Result> + */ + Result> getMessageList(TokenDto tokenDto, MymessageFormDTO messageFromDTO); + + /** + * 单条消息标记为已读 + * + * @param messageId 参数 + * @return Result + */ + Result readMessage(String messageId); + + /** + * 消息全部已读 + * + * @param tokenDto token + * @param messageDTO 参数 + * @return Result + */ + Result readAllMessage(TokenDto tokenDto, UserMessageDTO messageDTO); } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/impl/UserMessageServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/impl/UserMessageServiceImpl.java index dee56e413e..4743602217 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/impl/UserMessageServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/impl/UserMessageServiceImpl.java @@ -1,8 +1,16 @@ package com.epmet.modules.message.service.impl; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.UserMessageDTO; +import com.epmet.dto.form.MymessageFormDTO; +import com.epmet.modules.feign.EpmetMessageFeignClient; import com.epmet.modules.message.service.UserMessageService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description 我的消息 * @Author yinzuomei @@ -10,4 +18,27 @@ import org.springframework.stereotype.Service; */ @Service public class UserMessageServiceImpl implements UserMessageService { + @Autowired + private EpmetMessageFeignClient messageFeignClient; + + @Override + public Result> getMessageList(TokenDto tokenDto, MymessageFormDTO messageFromDTO) { + messageFromDTO.setUserId(tokenDto.getUserId()); + Result> result = messageFeignClient.getMyMessageList(messageFromDTO); + return result; + } + + @Override + public Result readMessage(String messageId) { + UserMessageDTO messageDTO = new UserMessageDTO(); + messageDTO.setId(messageId); + return messageFeignClient.readMessage(messageDTO); + } + + @Override + public Result readAllMessage(TokenDto tokenDto, UserMessageDTO messageDTO) { + messageDTO.setUserId(tokenDto.getUserId()); + messageDTO.setDelFlag("0"); + return messageFeignClient.readAllMessage(messageDTO); + } } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java index 98ac4d9249..1def10010d 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java @@ -1,6 +1,5 @@ package com.epmet.modules.resiregister.service.impl; -import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; @@ -8,6 +7,7 @@ import com.epmet.dto.form.ResiInfoSubmitFormDTO; import com.epmet.dto.form.ResiRegisterFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; import com.epmet.dto.result.ResiRegisterResultDTO; +import com.epmet.modules.exception.ModuleErrorCode; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.resiregister.service.ResiRegisterService; import com.epmet.modules.utils.ModuleConstant; @@ -38,11 +38,11 @@ public class ResiRegisterServiceImpl implements ResiRegisterService { if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { return new Result().error(ModuleConstant.USER_NOT_NULL); } - if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId()) + /*if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId()) || StringUtils.isBlank(formDTO.getGridId()) || StringUtils.isBlank(formDTO.getVisitFrom())) { - return new Result().error(EpmetErrorCode.PARAMETER_EXCEPTION.getName()); - } + return new Result().error(ModuleErrorCode.PARTICIPATION_EXCEPTION); + }*/ formDTO.setUserId(tokenDTO.getUserId()); return epmetUserFeignClient.init(formDTO); } @@ -57,11 +57,11 @@ public class ResiRegisterServiceImpl implements ResiRegisterService { if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { return new Result().error(ModuleConstant.USER_NOT_NULL); } - if (null == resiInfoSubmitFormDTO || StringUtils.isBlank(resiInfoSubmitFormDTO.getCustomerId()) + /*if (null == resiInfoSubmitFormDTO || StringUtils.isBlank(resiInfoSubmitFormDTO.getCustomerId()) || StringUtils.isBlank(resiInfoSubmitFormDTO.getGridId()) || StringUtils.isBlank(resiInfoSubmitFormDTO.getResiVisitId())) { return new Result().error(EpmetErrorCode.PARAMETER_EXCEPTION.getName()); - } + }*/ UserResiInfoDTO userResiInfoDTO = resiInfoSubmitFormDTO.getResiInfo(); userResiInfoDTO.setUserId(tokenDTO.getUserId()); userResiInfoDTO.setApp(tokenDTO.getApp()); @@ -81,10 +81,13 @@ public class ResiRegisterServiceImpl implements ResiRegisterService { if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { return new Result().error(ModuleConstant.USER_NOT_NULL); } - if (null == formDTO || StringUtils.isBlank(formDTO.getMobile()) + /*if (null == formDTO || StringUtils.isBlank(formDTO.getMobile()) || StringUtils.isBlank(formDTO.getResiVisitId()) || !validateMobile(formDTO.getMobile())) { return new Result().error(EpmetErrorCode.PARAMETER_EXCEPTION.getName()); + }*/ + if (!validateMobile(formDTO.getMobile())) { + return new Result().error(ModuleErrorCode.MOBILE_EXCEPTION); } formDTO.setUserId(tokenDTO.getUserId()); return epmetUserFeignClient.getVerificationCode(formDTO); diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java index c5896ce965..c3150d0879 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java @@ -4,7 +4,6 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.modules.warmhearted.service.ResiWarmheartedService; -import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO; import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO; @@ -45,15 +44,4 @@ public class ResiWarmheartedController { return resiWarmheartedService.submit(tokenDTO, formDTO); } - /** - * @param - * @Author sun - * @Description 政府端-热心居民申请人工审核 - **/ - @PostMapping("manageaudit") - public Result manageAudit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedAuditFormDTO formDTO) { - return resiWarmheartedService.manageAudit(tokenDTO, formDTO); - } - - } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedService.java index a222f93e65..12924304d3 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedService.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedService.java @@ -2,7 +2,6 @@ package com.epmet.modules.warmhearted.service; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; -import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO; import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO; @@ -32,13 +31,4 @@ public interface ResiWarmheartedService { */ Result submit(TokenDto tokenDTO, ResiWarmheartedSubmitFormDTO formDTO); - /** - * 政府端-热心居民申请人工审核 - * - * @param - * @return void - * @author sun - */ - Result manageAudit(TokenDto tokenDTO, ResiWarmheartedAuditFormDTO formDTO); - } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java index 3d51c81005..0448f99547 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java @@ -1,13 +1,11 @@ package com.epmet.modules.warmhearted.service.impl; -import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.modules.feign.ResiPartymemberFeignClient; import com.epmet.modules.utils.ModuleConstant; import com.epmet.modules.warmhearted.service.ResiWarmheartedService; -import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO; import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO; @@ -36,11 +34,11 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService { if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { return new Result().error(ModuleConstant.USER_NOT_NULL); } - if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId()) + /* if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId()) || StringUtils.isBlank(formDTO.getGridId()) || StringUtils.isBlank(formDTO.getVisitFrom())) { - return new Result().error(EpmetErrorCode.PARAMETER_EXCEPTION.getName()); - } + return new Result().error(EpmetErrorCode.PARTICIPATION_EXCEPTION.getName()); + }*/ formDTO.setUserId(tokenDTO.getUserId()); return resiPartymemberFeignClient.init(formDTO); } @@ -55,34 +53,14 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService { if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { return new Result().error(ModuleConstant.USER_NOT_NULL); } - if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId()) + /*if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId()) || StringUtils.isBlank(formDTO.getGridId()) || StringUtils.isBlank(formDTO.getResiWarmVisitId()) || StringUtils.isBlank(formDTO.getReason())) { - return new Result().error(EpmetErrorCode.PARAMETER_EXCEPTION.getName()); - } - formDTO.setUserId(tokenDTO.getUserId()); - return resiPartymemberFeignClient.submit(formDTO); - } - - /** - * @param - * @Author sun - * @Description 政府端-热心居民申请人工审核 - **/ - @Override - public Result manageAudit(TokenDto tokenDTO, ResiWarmheartedAuditFormDTO formDTO) { - if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { - return new Result().error(ModuleConstant.USER_NOT_NULL); - } - if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId()) - || StringUtils.isBlank(formDTO.getResiWarmApplyId()) - || StringUtils.isBlank(formDTO.getAuditStatus()) - || (!NumConstant.ZERO_STR.equals(formDTO.getAuditStatus())&&!NumConstant.ONE_STR.equals(formDTO.getAuditStatus()))) { return new Result().error(EpmetErrorCode.PARTICIPATION_EXCEPTION.getName()); - } + }*/ formDTO.setUserId(tokenDTO.getUserId()); - return resiPartymemberFeignClient.manageAudit(formDTO); + return resiPartymemberFeignClient.submit(formDTO); } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index 69c93422a7..30cb07eb4b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -23,8 +24,8 @@ public interface EpmetUserFeignClient { * @param userResiInfoFormDTO 参数 * @return Result */ - @PostMapping("/epmetuser/userresiinfo/getUserResiInfoDTO") - Result getUserResiInfoDTO(@RequestBody UserResiInfoFormDTO userResiInfoFormDTO); + @PostMapping("/epmetuser/userresiinfo/getuserresiinfo") + Result getUserResiInfoDTO(@RequestBody UserResiInfoFormDTO userResiInfoFormDTO); /** * 党员认证时，如果没有注册居民，则注册居民信息 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java index 257bbb295e..93e9d3cf20 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.feign.EpmetUserFeignClient; import org.springframework.stereotype.Component; @@ -17,7 +18,7 @@ import org.springframework.stereotype.Component; @Component public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient { @Override - public Result getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) { + public Result getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoDTO", userResiInfoFormDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 9ba74dda60..c52a1baae0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -8,6 +8,7 @@ import com.epmet.constant.PartyMemberConstant; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.feign.EpmetMessageFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.partymember.entity.*; @@ -78,15 +79,17 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO(); userResiInfoFormDTO.setCustomerId(fromDto.getCustomerId()); userResiInfoFormDTO.setUserId(fromDto.getUserId()); - UserResiInfoDTO userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO).getData(); - PartymemberInfoDTO partyMemberInfo = ConvertUtils.sourceToTarget(userResiInfoResult, - PartymemberInfoDTO.class); - partyMemberInfo.setMobile(userResiInfoResult.getRegMobile()); - partyMemberInfo.setEstate(userResiInfoResult.getDistrict()); - partyMemberInfo.setBuilding(userResiInfoResult.getBuildingAddress()); - result.setPartyMemberInfo(partyMemberInfo); - } + UserResiInfoResultDTO userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO).getData(); + if (null != userResiInfoResult) { + PartymemberInfoDTO partyMemberInfo = ConvertUtils.sourceToTarget(userResiInfoResult, + PartymemberInfoDTO.class); + partyMemberInfo.setMobile(userResiInfoResult.getRegMobile()); + partyMemberInfo.setEstate(userResiInfoResult.getDistrict()); + partyMemberInfo.setBuilding(userResiInfoResult.getBuildingAddress()); + result.setPartyMemberInfo(partyMemberInfo); + } + } // 将访问行为存入热心居民申请行为记录表 String visitId = saveOrUpdateVisit(null, fromDto, PartyMemberConstant.OPERATE_INITIALIZE); @@ -228,7 +231,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO(); userResiInfoFormDTO.setCustomerId(partyMemberInfoDTO.getCustomerId()); userResiInfoFormDTO.setUserId(partyMemberInfoDTO.getUserId()); - Result userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO); + Result userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO); if (null == userResiInfoResult.getData()) { UserResiInfoDTO userResiInfoDTO = ConvertUtils.sourceToTarget(partyMemberInfoDTO, UserResiInfoDTO.class); userResiInfoDTO.setRegMobile(partyMemberInfoDTO.getMobile()); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java index d9ee850900..a5765fa744 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java @@ -163,7 +163,6 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl userIdList; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VerificationCodeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VerificationCodeFormDTO.java index a52b0e01ea..7fcc758bc9 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VerificationCodeFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VerificationCodeFormDTO.java @@ -18,16 +18,19 @@ public class VerificationCodeFormDTO implements Serializable { /** * 手机号(注册手机号) */ + @NotBlank(message = "手机号不能为空") private String mobile; /** * 居民注册行为记录表Id resi_visit.id */ + @NotBlank(message = "注册行为表ID不能为空") private String resiVisitId; /** * 用户ID */ + @NotBlank(message = "用户ID不能为空") private String userId; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java new file mode 100644 index 0000000000..abb0fbe90a --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java @@ -0,0 +1,65 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 用户注册信息返参DTO + * @Author yinzuomei + * @Date 2020/4/7 18:45 + */ +@Data +public class UserResiInfoResultDTO implements Serializable { + + /** + * 唯一标识 + */ + private String id; + + /** + * 用户Id(主键) user.id + */ + private String userId; + + /** + * 手机号(注册手机号) + */ + private String regMobile; + + /** + * 姓氏 + */ + private String surname; + + /** + * 名称 + */ + private String name; + + /** + * 街道 + */ + private String street; + + /** + * 小区名称 + */ + private String district; + + /** + * 楼栋单元 + */ + private String buildingAddress; + + /** + * 用户显示名称 + */ + private String showName; + + /** + * 用户头像 + */ + private String headPhoto; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java index 4d754a4798..2f48d93d79 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java @@ -10,6 +10,7 @@ package com.epmet.constant; /** * 常量 + * * @author sun * @since 1.0.0 */ @@ -33,6 +34,9 @@ public interface UserResiRegisterConstant { /** * 最后一次操作行为-提交失败 */ - String FAILD="faild"; + String FAILD = "faild"; + String MOBILE_EXIST = "该手机号已注册居民，请使用其他手机号注册"; + + String UPDATE_EXCEPTION = "用户居民注册访问记录表更新数据失败"; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java index 862d296a49..825cc6e78b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java @@ -27,7 +27,9 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.excel.UserResiInfoExcel; import com.epmet.service.UserResiInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -100,12 +102,24 @@ public class UserResiInfoController { * @Description 查询用户注册信息 * @Date 2020/3/30 10:49 **/ - @PostMapping("getUserResiInfoDTO") - public Result getUserResiInfoDTO(@RequestBody UserResiInfoFormDTO userResiInfoFormDTO) { + @PostMapping("getuserresiinfo") + public Result getUserResiInfoDTO(@RequestBody UserResiInfoFormDTO userResiInfoFormDTO) { ValidatorUtils.validateEntity(userResiInfoFormDTO); return userResiInfoService.getUserResiInfoDTO(userResiInfoFormDTO); } + /** + * @return com.epmet.commons.tools.utils.Result> + * @param userResiInfoListFormDTO + * @Author yinzuomei + * @Description 根据userId集合查询用户注册信息 + * @Date 2020/4/7 18:24 + **/ + @PostMapping("getuserresiinfolist") + public Result> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO){ + return userResiInfoService.getUserResiInfoList(userResiInfoListFormDTO); + } + /** * @param userResiInfoDTO * @Author sun diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java index 45e96e78f6..e14b927f1b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java @@ -20,8 +20,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.entity.UserResiInfoEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -41,7 +43,7 @@ public interface UserResiInfoDao extends BaseDao { * @Description 查询用户注册信息 * @Date 2020/3/30 11:10 **/ - UserResiInfoDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO); + UserResiInfoResultDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO); /** * @Author sun @@ -49,4 +51,12 @@ public interface UserResiInfoDao extends BaseDao { **/ List selectResiInfoByMobile(String regMobile); + /** + * @return java.util.List + * @param userIdList + * @Author yinzuomei + * @Description 根据userId集合查询用户注册信息 + * @Date 2020/4/7 18:26 + **/ + List selectListUserResiInfoDTO(@Param("userIdList") List userIdList); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java index 2ea687b27a..5f0817a62e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java @@ -22,7 +22,9 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.entity.UserResiInfoEntity; import java.util.List; @@ -103,7 +105,7 @@ public interface UserResiInfoService extends BaseService { * @Description 查询用户注册信息 * @Date 2020/3/30 11:07 **/ - Result getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO); + Result getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO); /** * 居民端-居民注册信息提交 @@ -130,4 +132,13 @@ public interface UserResiInfoService extends BaseService { * @author zhaoqifeng */ Result saveResiInfo(UserResiInfoDTO userResiInfoDTO); + + /** + * @return com.epmet.commons.tools.utils.Result> + * @param userResiInfoListFormDTO + * @Author yinzuomei + * @Description 根据userId集合查询用户注册信息 + * @Date 2020/4/7 18:21 + **/ + Result> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index a78af90ba4..986ba1a93c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -37,6 +37,7 @@ import com.epmet.dto.form.EnterGridFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserRoleFormDTO; import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.entity.RegisterRelationEntity; import com.epmet.entity.UserCustomerEntity; @@ -232,7 +233,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) { - UserResiInfoDTO userResiInfoDTO = baseDao.selectUserResiInfoDTO(userResiInfoFormDTO); - if (null != userResiInfoDTO) { - String showName = userResiInfoDTO.getStreet() + "-" + userResiInfoDTO.getSurname() + userResiInfoDTO.getName(); - userResiInfoDTO.setShowName(showName); - } - return new Result().ok(userResiInfoDTO); + public Result getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) { + UserResiInfoResultDTO userResiInfoDTO = baseDao.selectUserResiInfoDTO(userResiInfoFormDTO); + return new Result().ok(userResiInfoDTO); } /** @@ -212,8 +207,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl> + * @Author yinzuomei + * @Description 根据userId集合查询用户注册信息 + * @Date 2020/4/7 18:21 + **/ + @Override + public Result> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO) { + List list=new ArrayList<>(); + if(null==userResiInfoListFormDTO.getUserIdList()){ + return new Result>().ok(list); + } + list= baseDao.selectListUserResiInfoDTO(userResiInfoListFormDTO.getUserIdList()); + return new Result>().ok(list); + } + /** * 判断手机号是否可用-根据手机号查询居民注册信息(user_resi_info)表数据 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java index 1f1af701f9..a24c454e82 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java @@ -151,7 +151,7 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl + +