From f8ecb0980a937fd67b6d90893da5c0f7ef986ef9 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Fri, 6 Dec 2019 11:10:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doc/branch/dev_1118/db/esua_epdc_user.sql | 1 + .../dto/form/EpdcAppUserRegisterFormDTO.java | 1 - .../esua/epdc/feign/UserFeignClient.java | 12 +++++++++ .../fallback/UserFeignClientFallback.java | 5 ++++ .../epdc/service/impl/AppUserServiceImpl.java | 16 +++++++++++- .../dto/constant/GroupNoticeConstant.java | 8 +++--- .../dto/topic/form/TopicSubmitFormDTO.java | 1 + .../resources/mapper/group/UserGroupDao.xml | 3 ++- .../controller/EpdcAppUserController.java | 14 +++++++++++ .../esua/epdc/dao/UserGridRelationDao.java | 14 ++++++++++- .../epdc/service/UserGridRelationService.java | 11 ++++++++ .../elink/esua/epdc/service/UserService.java | 11 ++++++++ .../impl/UserGridRelationServiceImpl.java | 5 ++++ .../epdc/service/impl/UserServiceImpl.java | 25 +++++++++++++++++++ .../src/main/resources/mapper/UserDao.xml | 2 +- .../resources/mapper/UserGridRelationDao.xml | 13 +++++++++- 16 files changed, 132 insertions(+), 10 deletions(-) diff --git a/esua-epdc/doc/branch/dev_1118/db/esua_epdc_user.sql b/esua-epdc/doc/branch/dev_1118/db/esua_epdc_user.sql index f82958f5a..a5314e05b 100644 --- a/esua-epdc/doc/branch/dev_1118/db/esua_epdc_user.sql +++ b/esua-epdc/doc/branch/dev_1118/db/esua_epdc_user.sql @@ -50,6 +50,7 @@ CREATE TABLE epdc_user_invitation_record( GRID VARCHAR(128) NOT NULL COMMENT '网格' , GRID_ID BIGINT NOT NULL COMMENT '网格ID' , REGISTER_TIME DATETIME NOT NULL COMMENT '注册时间' , + REVISION INT NULL COMMENT '乐观锁' , CREATED_BY VARCHAR(32) NOT NULL COMMENT '创建人' , CREATED_TIME DATETIME NOT NULL COMMENT '创建时间' , UPDATED_BY VARCHAR(32) NOT NULL COMMENT '更新人' , diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppUserRegisterFormDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppUserRegisterFormDTO.java index 937dcd476..6f16750a3 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppUserRegisterFormDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppUserRegisterFormDTO.java @@ -26,7 +26,6 @@ public class EpdcAppUserRegisterFormDTO implements Serializable { /** * 网格ID */ - @NotNull(message = "网格ID不能为空") private Long gridId; /** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 07d58a844..af2dad7c5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -258,6 +258,18 @@ public interface UserFeignClient { @GetMapping("app-user/epdc-app/user/residentDetail/{userId}") Result residentDetail(@PathVariable("userId") String userId); + /** + * + * 获取用户最后一次切换的网格信息 + * + * @params [openId] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/12/6 11:04 + */ + @GetMapping("app-user/epdc-app/user/lastSwitchGrid/{openId}") + Result getUserLastSwitchGrid(@PathVariable("openId") String openId); + /** * 认证用户（用户信息审核） * diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index 2ba46f7c6..8cf5899f4 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -136,6 +136,11 @@ public class UserFeignClientFallback implements UserFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "authenticateResident", formDTO); } + @Override + public Result getUserLastSwitchGrid(String openId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserLastSwitchGrid", openId); + } + @Override public Result> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getWorkUserList", workUserFromDto); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 555ebbc93..91a9930e8 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -639,12 +639,26 @@ public class AppUserServiceImpl implements AppUserService { return authorization; } - @Override public Result getMaV2Token(EpdcAppUserRegisterFormDTO formDto) { WxMaJscode2SessionResult wxMaResult = this.getWxMaUser(formDto.getWxCode()); String openId = wxMaResult.getOpenid(); String unionId = wxMaResult.getUnionid(); + if (null == formDto.getGridId()) { + // 获取用户绑定网格信息 + Result dtoResult = userFeignClient.getUserLastSwitchGrid(openId); + if (!dtoResult.success()) { + return new Result().error(dtoResult.getMsg()); + } + EpdcUserRegisterInfoResultDTO userDto = dtoResult.getData(); + if (userDto.getRegisterState() != NumConstant.TWO) { + EpdcAppAuthorizationDTO resultDto = new EpdcAppAuthorizationDTO(); + resultDto.setUserState(NumConstant.FIVE_STR); + return new Result().ok(resultDto); + } else { + formDto.setGridId(userDto.getGridId()); + } + } // 查询当前微信注册状态 EpdcCheckUserRegisterFromDTO checkFromDto = new EpdcCheckUserRegisterFromDTO(); checkFromDto.setOpenId(openId); diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java index d229b159b..7aae38d97 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java @@ -12,22 +12,22 @@ public interface GroupNoticeConstant { /** * 社群审核未通过 */ - String NOTICE_GROUP_NOT_PASSED = "你创建的社群【审核未通过】"; + String NOTICE_GROUP_NOT_PASSED = "您创建的社群【审核未通过】"; /** * 社群审核通过 */ - String NOTICE_GROUP_PASSED = "你创建的社群【审核通过】"; + String NOTICE_GROUP_PASSED = "您创建的社群【审核通过】"; /** * 社群解散 */ - String NOTICE_GROUP_DISBAND = "你加入的社群已被解散"; + String NOTICE_GROUP_DISBAND = "您加入的社群已被解散"; /** * 删除社群成员 */ - String NOTICE_GROUP_USER_REMOVED_MEMBER = "你已被群主移除社群"; + String NOTICE_GROUP_USER_REMOVED_MEMBER = "您已被群主移除社群"; /** * 邀请入群 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicSubmitFormDTO.java index 9de72516a..602762596 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicSubmitFormDTO.java @@ -35,6 +35,7 @@ public class TopicSubmitFormDTO implements Serializable { * 话题地址 */ @NotBlank(message = "话题地址不能为空") + @Size(min = 1, max = 100, message = "话题地址在100个字以内") private String topicAddress; /** diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/UserGroupDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/UserGroupDao.xml index ebffaae80..fb0c34c86 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/UserGroupDao.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/UserGroupDao.xml @@ -41,10 +41,11 @@ AND STATE = #{state} AND GROUP_ID = #{groupId} ORDER BY + LORD_FLAG DESC, CONVERT(NICKNAME USING gbk) ASC, - CREATED_TIME DESC + CREATED_TIME DESC + SELECT + * + FROM + `epdc_user_grid_relation` + WHERE + USER_ID = #{userId} + AND DEL_FLAG = '0' + ORDER BY + SWITCHED_TIME DESC + LIMIT 1 + \ No newline at end of file