From f0350bfea932c1b1bf8c5f134bde952f2a4d4bba Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 14 May 2020 13:08:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=82=E5=B8=B8=E6=8A=9B?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/GovLoginController.java | 15 ++++-- .../com/epmet/service/GovLoginService.java | 10 ++-- .../service/impl/GovLoginServiceImpl.java | 37 +++++++------ .../controller/ResiPartyMemberController.java | 8 ++- .../epmet/service/ResiPartyMemberService.java | 4 +- .../impl/ResiPartyMemberServiceImpl.java | 25 ++++----- .../controller/StaffAgencyController.java | 3 +- .../com/epmet/service/StaffAgencyService.java | 2 +- .../service/impl/StaffAgencyServiceImpl.java | 3 +- .../member/form/ApplyingMemberFormDTO.java | 6 +++ .../member/form/GroupMemberListFormDTO.java | 5 ++ .../controller/GroupInvitationController.java | 9 ++-- .../service/GroupInvitationService.java | 6 +-- .../impl/GroupInvitationServiceImpl.java | 53 ++++++++----------- .../controller/ResiGroupMemberController.java | 19 ++++--- .../service/ResiGroupMemberService.java | 12 ++--- .../impl/ResiGroupMemberServiceImpl.java | 39 +++++++------- .../controller/ResiMineGridController.java | 3 +- .../grid/service/ResiMineGridService.java | 2 +- .../service/impl/ResiMineGridServiceImpl.java | 15 ++++-- 20 files changed, 156 insertions(+), 120 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java index fbc883c70f..477195041b 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java @@ -40,7 +40,8 @@ public class GovLoginController { @PostMapping(value = "/loginwxmp/loginbywxcode") public Result loginByWxCode(@RequestBody GovWxmpFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); - return govLoginService.loginByWxCode(formDTO); + UserTokenResultDTO userTokenResultDTO=govLoginService.loginByWxCode(formDTO); + return new Result().ok(userTokenResultDTO); } /** @@ -53,7 +54,8 @@ public class GovLoginController { @PostMapping(value = "/loginwxmp/sendsmscode") public Result sendSmsCode(@RequestBody SendSmsCodeFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); - return govLoginService.sendSmsCode(formDTO); + govLoginService.sendSmsCode(formDTO); + return new Result(); } /** @@ -66,7 +68,8 @@ public class GovLoginController { @PostMapping(value = "/loginwxmp/getmyorg") public Result> getmyorg(@RequestBody StaffOrgsFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); - return govLoginService.getMyOrg(formDTO); + List staffOrgs=govLoginService.getMyOrg(formDTO); + return new Result>().ok(staffOrgs); } /** @@ -79,7 +82,8 @@ public class GovLoginController { @PostMapping(value = "/loginwxmp/enterorg") public Result enterOrg(@RequestBody GovWxmpEnteOrgFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); - return govLoginService.enterOrg(formDTO); + UserTokenResultDTO userTokenResultDTO=govLoginService.enterOrg(formDTO); + return new Result().ok(userTokenResultDTO); } /** @@ -91,7 +95,8 @@ public class GovLoginController { **/ @PostMapping("/loginwxmp/loginout") public Result loginOut(@LoginUser TokenDto tokenDto) { - return govLoginService.loginOut(tokenDto); + govLoginService.loginOut(tokenDto); + return new Result(); } } diff --git a/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java b/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java index f61e9c8fab..37b78533b5 100644 --- a/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java +++ b/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java @@ -24,7 +24,7 @@ public interface GovLoginService { * @Description 政府端微信小程序登录-发送验证码 * @Date 2020/4/18 10:59 **/ - Result sendSmsCode(SendSmsCodeFormDTO formDTO); + void sendSmsCode(SendSmsCodeFormDTO formDTO); /** * @param formDTO @@ -33,7 +33,7 @@ public interface GovLoginService { * @Description 3、手机验证码获取组织 * @Date 2020/4/18 21:11 **/ - Result> getMyOrg(StaffOrgsFormDTO formDTO); + List getMyOrg(StaffOrgsFormDTO formDTO); /** * @param formDTO @@ -42,7 +42,7 @@ public interface GovLoginService { * @Description 政府端小程序根据wxCode获取上一次登录信息，返回token * @Date 2020/4/20 11:23 **/ - Result loginByWxCode(GovWxmpFormDTO formDTO); + UserTokenResultDTO loginByWxCode(GovWxmpFormDTO formDTO); /** * @param formDTO @@ -51,7 +51,7 @@ public interface GovLoginService { * @Description 4、选择组织，进入首页 * @Date 2020/4/20 13:08 **/ - Result enterOrg(GovWxmpEnteOrgFormDTO formDTO); + UserTokenResultDTO enterOrg(GovWxmpEnteOrgFormDTO formDTO); /** * @return com.epmet.commons.tools.utils.Result @@ -60,5 +60,5 @@ public interface GovLoginService { * @Description 政府端工作人员退出登录 * @Date 2020/4/21 22:08 **/ - Result loginOut(TokenDto tokenDto); + void loginOut(TokenDto tokenDto); } diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java index 7ad0fae480..b7023b0f37 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java @@ -2,6 +2,7 @@ package com.epmet.service.impl; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import com.epmet.common.token.constant.LoginConstant; +import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; @@ -67,28 +68,27 @@ public class GovLoginServiceImpl implements GovLoginService { * @Date 2020/4/18 10:59 **/ @Override - public Result sendSmsCode(SendSmsCodeFormDTO formDTO) { + public void sendSmsCode(SendSmsCodeFormDTO formDTO) { //1、校验手机号是否符合规范 if (!PhoneValidatorUtils.isMobile(formDTO.getMobile())) { logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), EpmetErrorCode.ERROR_PHONE.getCode(), EpmetErrorCode.ERROR_PHONE.getMsg())); - return new Result().error(EpmetErrorCode.ERROR_PHONE.getCode()); + throw new RenException(EpmetErrorCode.ERROR_PHONE.getCode()); } //2、根据手机号校验用户是否存在 Result> customerStaffResult = epmetUserFeignClient.checkCustomerStaff(formDTO.getMobile()); if (!customerStaffResult.success()) { logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg())); - return new Result().error(customerStaffResult.getCode()); + throw new RenException(customerStaffResult.getCode()); } //3、发送短信验证码 Result> smsCodeResult = messageFeignClient.sendSmsCaptcha(formDTO.getMobile()); if (!smsCodeResult.success()) { logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), smsCodeResult.getCode(), smsCodeResult.getMsg())); - return new Result().error(smsCodeResult.getCode()); + throw new RenException(smsCodeResult.getCode()); } //4、保存短信验证码(删除现有短信验证码、将新的短信验证码存入Redis) captchaRedis.saveSmsCode(formDTO, smsCodeResult.getData().get("code")); logger.info(String.format("发送短信验证码成功,手机号[%s]", formDTO.getMobile())); - return new Result(); } /** @@ -99,18 +99,18 @@ public class GovLoginServiceImpl implements GovLoginService { * @Date 2020/4/18 21:11 **/ @Override - public Result> getMyOrg(StaffOrgsFormDTO formDTO) { + public List getMyOrg(StaffOrgsFormDTO formDTO) { //1、根据手机号查询到用户信息 Result> customerStaffResult = epmetUserFeignClient.checkCustomerStaff(formDTO.getMobile()); if (!customerStaffResult.success()) { logger.error(String.format("手机验证码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg())); - return new Result().error(customerStaffResult.getCode()); + throw new RenException(customerStaffResult.getCode()); } //2、验证码是否正确 String rightSmsCode = captchaRedis.getSmsCode(formDTO.getMobile()); if (!formDTO.getSmsCode().equals(rightSmsCode)) { logger.error(String.format("验证码错误code[%s],msg[%s]",EpmetErrorCode.MOBILE_CODE_ERROR.getCode(),EpmetErrorCode.MOBILE_CODE_ERROR.getMsg())); - return new Result>().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode()); + throw new RenException(EpmetErrorCode.MOBILE_CODE_ERROR.getCode()); } //3、查询用户所有的组织信息 List customerIdList = new ArrayList<>(); @@ -120,11 +120,15 @@ public class GovLoginServiceImpl implements GovLoginService { StaffOrgFormDTO staffOrgFormDTO = new StaffOrgFormDTO(); staffOrgFormDTO.setCustomerIdList(customerIdList); Result> result = govOrgFeignClient.getStaffOrgList(staffOrgFormDTO); - return result; + if(result.success()&&null!=result.getData()){ + return result.getData(); + } + logger.error(String .format("手机验证码获取组织,调用%s服务失败,入参手机号%s,验证码%s,返回错误码%s,错误提示信息%s", ServiceConstant.GOV_ORG_SERVER,formDTO.getMobile(),formDTO.getSmsCode(),result.getCode(),result.getMsg())); + return new ArrayList<>(); } @Override - public Result loginByWxCode(GovWxmpFormDTO formDTO) { + public UserTokenResultDTO loginByWxCode(GovWxmpFormDTO formDTO) { //1、解析微信用户 WxMaJscode2SessionResult wxMaJscode2SessionResult = loginService.getWxMaUser(formDTO.getApp(), formDTO.getWxCode()); if(null!=wxMaJscode2SessionResult){ @@ -133,7 +137,7 @@ public class GovLoginServiceImpl implements GovLoginService { Result latestStaffWechat = epmetUserFeignClient.getLatestStaffWechatLoginRecord(wxMaJscode2SessionResult.getOpenid()); if (!latestStaffWechat.success() || null == latestStaffWechat.getData()) { logger.error(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg())); - return new Result().error(EpmetErrorCode.PLEASE_LOGIN.getCode()); + throw new RenException(EpmetErrorCode.PLEASE_LOGIN.getCode()); } StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = latestStaffWechat.getData(); //2、记录staff_wechat @@ -146,7 +150,7 @@ public class GovLoginServiceImpl implements GovLoginService { this.saveLatestGovTokenDto(staffLatestAgencyResultDTO, wxMaJscode2SessionResult, token); UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO(); userTokenResultDTO.setToken(token); - return new Result().ok(userTokenResultDTO); + return userTokenResultDTO; } //保存tokenDto到redis @@ -244,7 +248,7 @@ public class GovLoginServiceImpl implements GovLoginService { } @Override - public Result enterOrg(GovWxmpEnteOrgFormDTO formDTO) { + public UserTokenResultDTO enterOrg(GovWxmpEnteOrgFormDTO formDTO) { //1、需要校验要登录的客户，是否被禁用 CustomerStaffFormDTO customerStaffFormDTO = new CustomerStaffFormDTO(); customerStaffFormDTO.setCustomerId(formDTO.getCustomerId()); @@ -252,7 +256,7 @@ public class GovLoginServiceImpl implements GovLoginService { Result customerStaffDTOResult = epmetUserFeignClient.getCustomerStaffInfo(customerStaffFormDTO); if (!customerStaffDTOResult.success() || null == customerStaffDTOResult.getData()) { logger.error(String.format("获取工作人员信息失败,手机号[%s],客户id:[%s],code[%s],msg[%s]", formDTO.getMobile(), formDTO.getCustomerId(), customerStaffDTOResult.getCode(), customerStaffDTOResult.getMsg())); - return new Result().error(customerStaffDTOResult.getCode()); + throw new RenException(customerStaffDTOResult.getCode()); } CustomerStaffDTO customerStaff = customerStaffDTOResult.getData(); //2、解析微信用户 @@ -267,17 +271,16 @@ public class GovLoginServiceImpl implements GovLoginService { this.saveGovTokenDto(formDTO.getRootAgencyId(), formDTO.getCustomerId(), customerStaff.getUserId(), wxMaJscode2SessionResult, token); UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO(); userTokenResultDTO.setToken(token); - return new Result().ok(userTokenResultDTO); + return userTokenResultDTO; } @Override - public Result loginOut(TokenDto tokenDto) { + public void loginOut(TokenDto tokenDto) { if(null == tokenDto){ logger.error("token解析失败,直接跳转重新登录即可"); throw new RenException("当前用户信息获取失败"); } cpUserDetailRedis.logout(tokenDto.getApp() , tokenDto.getClient() , tokenDto.getUserId()); - return new Result(); } //保存登录日志 diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java index 48d96dff8f..5b7fbdf89f 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java @@ -51,7 +51,9 @@ public class ResiPartyMemberController { @PostMapping("auditing") @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITINGLIST) public Result> auditing(@RequestBody AuditingPartyMemberFormDTO formDTO) { - return resiPartyMemberService.auditing(formDTO); + ValidatorUtils.validateEntity(formDTO); + List list=resiPartyMemberService.auditing(formDTO); + return new Result>().ok(list); } /** @@ -64,7 +66,9 @@ public class ResiPartyMemberController { @PostMapping("audited") @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITHISTORY) public Result> audited(@RequestBody AuditedPartyMemberFormDTO formDTO) { - return resiPartyMemberService.audited(formDTO); + ValidatorUtils.validateEntity(formDTO); + List list=resiPartyMemberService.audited(formDTO); + return new Result>().ok(list); } /** diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java index f0a2bdb58e..3a04d1c64b 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java @@ -37,7 +37,7 @@ public interface ResiPartyMemberService { * @Description 待审核列表 * @Date 2020/4/26 16:04 **/ - Result> auditing(AuditingPartyMemberFormDTO formDTO); + List auditing(AuditingPartyMemberFormDTO formDTO); /** * @return com.epmet.commons.tools.utils.Result> * @param formDTO @@ -45,7 +45,7 @@ public interface ResiPartyMemberService { * @Description 党员认证-审核历史列表（审核历史：只包括自动审核失败和拒绝的审核失败：居民未填写补充信息。） * @Date 2020/4/26 23:32 **/ - Result> audited(AuditedPartyMemberFormDTO formDTO); + List audited(AuditedPartyMemberFormDTO formDTO); /** * diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java index 68482892fb..d2f4ccc899 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.impl; +import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; @@ -39,37 +40,37 @@ public class ResiPartyMemberServiceImpl implements ResiPartyMemberService { private ResiPartymemberFeignClient resiPartymemberFeignClient; @Override - public Result> auditing(AuditingPartyMemberFormDTO formDTO) { - UnderReviewParyMemberFormDTO underReviewParyMemberFormDTO = ConvertUtils.sourceToTarget(formDTO, UnderReviewParyMemberFormDTO.class); + public List auditing(AuditingPartyMemberFormDTO formDTO) { List list = new ArrayList<>(); + UnderReviewParyMemberFormDTO underReviewParyMemberFormDTO = ConvertUtils.sourceToTarget(formDTO, UnderReviewParyMemberFormDTO.class); Result> result = resiPartymemberFeignClient.auditingPartyMember(underReviewParyMemberFormDTO); if (!result.success()) { - logger.error(String.format("调用resi-partymember-server模块失败,错误提示%s", result.getMsg())); + logger.error(String.format("调用%s服务查询单元认证-待审核列表失败,入参网格id[%s],错误码%s,错误提示%s", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId(), result.getCode(), result.getMsg())); throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); } if (null == result.getData() || result.getData().isEmpty()) { - logger.info(String.format("网格id[%s],待审核党员列表查询为空", formDTO.getGridId())); - return new Result>().ok(list); + logger.info(String.format("调用%s服务查询党员认证-待审核列表,入参网格id[%s],待审核党员列表查询为空", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId())); + return list; } list = ConvertUtils.sourceToTarget(result.getData(), AuditingPartyMemberResultDTO.class); - return new Result>().ok(list); + return list; } @Override - public Result> audited(AuditedPartyMemberFormDTO formDTO) { - ReviewedParyMemberFormDTO reviewedParyMemberFormDTO = ConvertUtils.sourceToTarget(formDTO, ReviewedParyMemberFormDTO.class); + public List audited(AuditedPartyMemberFormDTO formDTO) { List list = new ArrayList<>(); + ReviewedParyMemberFormDTO reviewedParyMemberFormDTO = ConvertUtils.sourceToTarget(formDTO, ReviewedParyMemberFormDTO.class); Result> result = resiPartymemberFeignClient.auditedPartyMember(reviewedParyMemberFormDTO); if (!result.success()) { - logger.error(String.format("调用resi-partymember-server模块失败,错误提示%s", result.getMsg())); + logger.error(String.format("调用%s服务查询党员认证-审核历史列表失败,入参网格id[%s],错误码%s,错误提示%s", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId(), result.getCode(), result.getMsg())); throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); } if (null == result.getData() || result.getData().isEmpty()) { - logger.info(String.format("网格id[%s],待审核党员列表查询为空", formDTO.getGridId())); - return new Result>().ok(list); + logger.info(String.format("调用%s服务查询党员认证-审核历史列表为空,入参网格id[%s],待审核党员列表查询为空", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId())); + return list; } list = ConvertUtils.sourceToTarget(result.getData(), AuditedPartyMemberResultDTO.class); - return new Result>().ok(list); + return list; } /** diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java index 692ac17669..329d12ef4b 100644 --- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java +++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java @@ -82,7 +82,8 @@ public class StaffAgencyController { public Result switchGrid(@LoginUser TokenDto tokenDto, @RequestBody SwitchGridFormDTO switchGridFormDTO) { switchGridFormDTO.setStaffId(tokenDto.getUserId()); ValidatorUtils.validateEntity(switchGridFormDTO); - return staffAgencyService.switchGrid(switchGridFormDTO); + staffAgencyService.switchGrid(switchGridFormDTO); + return new Result(); } /** diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffAgencyService.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffAgencyService.java index da353a9f37..d6ee5eeb3c 100644 --- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffAgencyService.java +++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffAgencyService.java @@ -57,7 +57,7 @@ public interface StaffAgencyService { * @Description 切换网格 * @Date 2020/4/23 10:49 **/ - Result switchGrid(SwitchGridFormDTO switchGridFormDTO); + void switchGrid(SwitchGridFormDTO switchGridFormDTO); /** * @Description 得到工作人员最后一次登录的网格 diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java index 2cbda237bb..c150e6baaa 100644 --- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java +++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java @@ -220,7 +220,7 @@ public class StaffAgencyServiceImpl implements StaffAgencyService { @Override - public Result switchGrid(SwitchGridFormDTO switchGridFormDTO) { + public void switchGrid(SwitchGridFormDTO switchGridFormDTO) { //记录网格访问记录 StaffGridVisitedFormDTO staffGridVisitedFormDTO = ConvertUtils.sourceToTarget(switchGridFormDTO, StaffGridVisitedFormDTO.class); Result saveStaffGridVisitedRecord = epmetUserFeignClient.saveStaffGridVisitedRecord(staffGridVisitedFormDTO); @@ -230,7 +230,6 @@ public class StaffAgencyServiceImpl implements StaffAgencyService { /* //查询网格的权限 Set opeKeys = accessService.listOpeKeysByStaffId(switchGridFormDTO.getStaffId(), null, switchGridFormDTO.getGridId()); return new Result>().ok(opeKeys);*/ - return new Result(); } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyingMemberFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyingMemberFormDTO.java index 4ab61b072f..f55ade60b2 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyingMemberFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyingMemberFormDTO.java @@ -25,4 +25,10 @@ public class ApplyingMemberFormDTO implements Serializable { private Integer pageNo; private Integer pageSize=20; + + /** + * 从token中获取的用户ID + */ + @NotBlank(message = "用户id不能为空") + private String userId; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/GroupMemberListFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/GroupMemberListFormDTO.java index e42fdb7c1f..010c24c30d 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/GroupMemberListFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/GroupMemberListFormDTO.java @@ -26,4 +26,9 @@ public class GroupMemberListFormDTO implements Serializable { private Integer pageSize=20; + /** + * 从token中获取的用户ID + */ + @NotBlank(message = "用户id不能为空") + private String userId; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java index 1364dcbba8..cf50b0b4b3 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java @@ -60,7 +60,8 @@ public class GroupInvitationController { @RequestBody CreateGroupInvitationFormDTO formDTO) { formDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO); - return groupInvitationService.createGroupInvitation(formDTO); + CreateGroupInvitationResultDTO createGroupInvitationResultDTO=groupInvitationService.createGroupInvitation(formDTO); + return new Result().ok(createGroupInvitationResultDTO); } /** @@ -75,7 +76,8 @@ public class GroupInvitationController { @RequestBody LinkGroupInfoFormDTO formDTO) { formDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO); - return groupInvitationService.getLinkGroupInfo(formDTO); + LinkGroupInfoResultDTO linkGroupInfoResultDTO=groupInvitationService.getLinkGroupInfo(formDTO); + return new Result().ok(linkGroupInfoResultDTO); } /** @@ -92,6 +94,7 @@ public class GroupInvitationController { formDTO.setUserId(tokenDto.getUserId()); formDTO.setApp(tokenDto.getApp()); ValidatorUtils.validateEntity(formDTO); - return groupInvitationService.accetInvitation(formDTO); + groupInvitationService.accetInvitation(formDTO); + return new Result(); } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java index adc45ff5b2..053c4e036e 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java @@ -106,7 +106,7 @@ public interface GroupInvitationService extends BaseService createGroupInvitation(CreateGroupInvitationFormDTO formDTO); + CreateGroupInvitationResultDTO createGroupInvitation(CreateGroupInvitationFormDTO formDTO); /** * @return com.epmet.commons.tools.utils.Result @@ -115,7 +115,7 @@ public interface GroupInvitationService extends BaseService getLinkGroupInfo(LinkGroupInfoFormDTO formDTO); + LinkGroupInfoResultDTO getLinkGroupInfo(LinkGroupInfoFormDTO formDTO); /** * @return com.epmet.commons.tools.utils.Result @@ -124,5 +124,5 @@ public interface GroupInvitationService extends BaseService createGroupInvitation(CreateGroupInvitationFormDTO formDTO) { + public CreateGroupInvitationResultDTO createGroupInvitation(CreateGroupInvitationFormDTO formDTO) { //1、只有群主可以邀请新成员（这块界面限制死了，只有群主才能看到邀请新成员按钮） //2、审核通过（讨论中）的群才可以分享邀请连接 ResiGroupDTO resiGroupDTO = resiGroupService.get(formDTO.getGroupId()); @@ -181,7 +178,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl().ok(resultDTO); + return resultDTO; } /** @@ -192,13 +189,9 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl getLinkGroupInfo(LinkGroupInfoFormDTO formDTO) { + public LinkGroupInfoResultDTO getLinkGroupInfo(LinkGroupInfoFormDTO formDTO) { //0、校验是否存在该邀请连接（判断是会否被删除连接、是否失效、群状态） - Result validResult = this.checkLinkValid(formDTO.getInvitationId()); - if (!validResult.success()) { - return new Result().error(validResult.getCode(), validResult.getMsg()); - } - GroupInvitationDTO groupInvitationDTO=validResult.getData(); + GroupInvitationDTO groupInvitationDTO=this.checkLinkValid(formDTO.getInvitationId()); LinkGroupInfoResultDTO linkGroupInfoResultDTO = new LinkGroupInfoResultDTO(); //1、查询是否在群内 ResiGroupMemberDTO resiGroupMemberDTO = resiGroupMemberDao.selectGroupMemberInfo(groupInvitationDTO.getResiGroupId(), formDTO.getUserId()); @@ -214,12 +207,12 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl().ok(linkGroupInfoResultDTO); + return linkGroupInfoResultDTO; } /** @@ -240,9 +233,9 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl checkLinkValid(String invitationId) { + private GroupInvitationDTO 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.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg()); + logger.error(String.format("根据链接【%s】查看群邀请信息异常,错误码:%s,错误提示:%s",invitationId,EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg())); + throw new RenException(EpmetErrorCode.LOSE_EFFICACY.getCode()); } if (null != groupInvitationDTO && !groupInvitationDTO.getValidEndTime().after(new Date())) { - return new Result().error(EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg()); + logger.error(String.format("根据链接【%s】查看群邀请信息异常,错误码:%s,错误提示:%s",invitationId,EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg())); + throw new RenException(EpmetErrorCode.LOSE_EFFICACY.getCode()); } - ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupInvitationDTO.getResiGroupId()); + /*ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupInvitationDTO.getResiGroupId()); if (null == resiGroupEntity) { logger.info("组不存在"); //TODO @@ -290,8 +285,8 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl().ok(groupInvitationDTO); + }*/ + return groupInvitationDTO; } /** @@ -302,13 +297,9 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl validResult = this.checkLinkValid(formDTO.getInvitationId()); - if (!validResult.success()) { - return new Result().error(validResult.getCode(), validResult.getMsg()); - } - GroupInvitationDTO groupInvitationDTO=validResult.getData(); + GroupInvitationDTO groupInvitationDTO=this.checkLinkValid(formDTO.getInvitationId()); //2、校验是否已经注册居民 ResiGroupDTO resiGroupDTO = resiGroupService.get(groupInvitationDTO.getResiGroupId()); UserRoleDTO userRoleDTO=new UserRoleDTO(); @@ -319,7 +310,8 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl> getGroupMemberList(@LoginUser TokenDto tokenDto, @RequestBody GroupMemberListFormDTO groupMemberListFormDTO) { + groupMemberListFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(groupMemberListFormDTO); - return resiGroupMemberService.getGroupMemberList(groupMemberListFormDTO); + List list=resiGroupMemberService.getGroupMemberList(groupMemberListFormDTO); + return new Result>().ok(list); } /** @@ -88,9 +91,11 @@ public class ResiGroupMemberController { **/ @PostMapping("getapplyingmember") public Result> getApplyingMember(@LoginUser TokenDto tokenDto, - @RequestBody ApplyingMemberFormDTO applyingMemberFormDTO) { + @RequestBody ApplyingMemberFormDTO applyingMemberFormDTO) { + applyingMemberFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(applyingMemberFormDTO); - return resiGroupMemberService.getApplyingMember(applyingMemberFormDTO); + List list = resiGroupMemberService.getApplyingMember(applyingMemberFormDTO); + return new Result>().ok(list); } /** @@ -107,7 +112,8 @@ public class ResiGroupMemberController { agreeApplyFormDTO.setUserId(tokenDto.getUserId()); agreeApplyFormDTO.setApp(tokenDto.getApp()); ValidatorUtils.validateEntity(agreeApplyFormDTO); - return resiGroupMemberService.agreeApply(agreeApplyFormDTO); + resiGroupMemberService.agreeApply(agreeApplyFormDTO); + return new Result(); } /** @@ -123,7 +129,8 @@ public class ResiGroupMemberController { @RequestBody DisagreeApplyFormDTO disagreeApplyFormDTO) { disagreeApplyFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(disagreeApplyFormDTO); - return resiGroupMemberService.disAgreeApply(disagreeApplyFormDTO); + resiGroupMemberService.disAgreeApply(disagreeApplyFormDTO); + return new Result(); } /** 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 a9cdb93a94..1e57b0c4e2 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 @@ -114,16 +114,16 @@ public interface ResiGroupMemberService extends BaseService> getGroupMemberList(GroupMemberListFormDTO groupMemberListFormDTO); + List getGroupMemberList(GroupMemberListFormDTO groupMemberListFormDTO); /** * @return com.epmet.commons.tools.utils.Result> @@ -132,7 +132,7 @@ public interface ResiGroupMemberService extends BaseService> getApplyingMember(ApplyingMemberFormDTO applyingMemberFormDTO); + List getApplyingMember(ApplyingMemberFormDTO applyingMemberFormDTO); /** * @param agreeApplyFormDTO @@ -141,7 +141,7 @@ public interface ResiGroupMemberService extends BaseService> getGroupMemberList(GroupMemberListFormDTO groupMemberListFormDTO) { + public List getGroupMemberList(GroupMemberListFormDTO groupMemberListFormDTO) { int pageIndex = (groupMemberListFormDTO.getPageNo() - NumConstant.ONE) * groupMemberListFormDTO.getPageSize(); groupMemberListFormDTO.setPageNo(pageIndex); List list = baseDao.selectListGroupMember(groupMemberListFormDTO); @@ -258,9 +259,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl>().ok(list); + return list; } /** @@ -271,7 +274,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl> getApplyingMember(ApplyingMemberFormDTO applyingMemberFormDTO) { + public List getApplyingMember(ApplyingMemberFormDTO applyingMemberFormDTO) { int pageIndex = (applyingMemberFormDTO.getPageNo() - NumConstant.ONE) * applyingMemberFormDTO.getPageSize(); applyingMemberFormDTO.setPageNo(pageIndex); List list = baseDao.selectListApplyingMember(applyingMemberFormDTO); @@ -293,10 +296,12 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl>().ok(list); + return list; } /** @@ -307,17 +312,17 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl getLatestGridInfo(@LoginUser TokenDto tokenDto){ - return resiMineGridService.getLatestGridInfo(tokenDto); + LatestGridInfoResultDTO latestGridInfoResultDTO=resiMineGridService.getLatestGridInfo(tokenDto); + return new Result().ok(latestGridInfoResultDTO); } /** diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/ResiMineGridService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/ResiMineGridService.java index 73a98ad7a4..f4f398306c 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/ResiMineGridService.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/ResiMineGridService.java @@ -20,7 +20,7 @@ public interface ResiMineGridService { * @param tokenDto * @return com.epmet.commons.tools.utils.Result */ - Result getLatestGridInfo(TokenDto tokenDto); + LatestGridInfoResultDTO getLatestGridInfo(TokenDto tokenDto); /** * @return diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java index 2207f5c491..d473119124 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java @@ -2,6 +2,7 @@ package com.epmet.modules.grid.service.impl; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; @@ -41,16 +42,22 @@ public class ResiMineGridServiceImpl implements ResiMineGridService { * @Date 2020/3/24 11:11 **/ @Override - public Result getLatestGridInfo(TokenDto tokenDto) { + public LatestGridInfoResultDTO getLatestGridInfo(TokenDto tokenDto) { + LatestGridInfoResultDTO latestGridInfoResultDTO=new LatestGridInfoResultDTO(); if (null == tokenDto || StringUtils.isBlank(tokenDto.getUserId())) { - logger.error(ModuleConstant.USER_NOT_NULL); + logger.error(String.format("居民端【%s】获取用户最近访问的网格失败:错误提示:%s",tokenDto.getUserId(),ModuleConstant.USER_NOT_NULL)); throw new RenException(ModuleConstant.USER_NOT_NULL); } if(!AppClientConstant.APP_RESI.equals(tokenDto.getApp())){ - logger.error(ModuleConstant.FOR_RESI_CALL); + logger.error(String.format("居民端【%s】获取用户最近访问的网格失败,错误提示:%s",tokenDto.getUserId(),ModuleConstant.FOR_RESI_CALL)); throw new RenException(ModuleConstant.FOR_RESI_CALL); } - return epmetUserFeignClient.getLatestGridInfoByUserId(tokenDto.getUserId()); + Result userResult=epmetUserFeignClient.getLatestGridInfoByUserId(tokenDto.getUserId()); + if(userResult.success()&&null!=userResult.getData()){ + return userResult.getData(); + } + logger.error(String.format("居民端用户【%s】获取用户最近访问网格失败,调用%s服务入参userId:%s,错误码:%s,错误提示:%s", tokenDto.getUserId(),ServiceConstant.EPMET_USER_SERVER,tokenDto.getUserId(),userResult.getCode(),userResult.getMsg())); + return latestGridInfoResultDTO; } /**