From bdc916a70175d88749e415be2deb9702760014b7 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Thu, 21 Nov 2019 14:20:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=85=9A=E5=91=98=E7=BE=A4=E5=92=8C=E5=85=9A=E5=91=98=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E5=85=9A=E5=91=98=E7=BE=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/feign/GroupFeignClient.java | 32 +++++++++++ .../fallback/GroupFeignClientFallback.java | 21 ++++++++ .../epdc/service/impl/SysDeptServiceImpl.java | 12 +++++ .../com/elink/esua/epdc/async/GroupTask.java | 50 +++++++++++++++++ .../esua/epdc/feign/GroupFeignClient.java | 14 ++++- .../fallback/GroupFeignClientFallback.java | 5 ++ .../epdc/service/impl/AppUserServiceImpl.java | 53 ++++++++++++++++--- .../epdc/service/impl/GroupServiceImpl.java | 1 + .../dto/constant/GroupConstant.java | 21 ++++++++ .../dto/group/form/GroupCreateFormDTO.java | 6 +++ .../dto/group/form/GroupUserFormDTO.java | 5 ++ .../form/GroupUserPartyMemberFormDTO.java | 29 +++++++++- .../modules/feign/UserFeignClient.java | 14 +++++ .../fallback/UserFeignClientFallback.java | 6 +++ .../group/controller/AppGroupController.java | 43 +++++++++++++++ .../controller/AppUserGroupController.java | 2 +- .../modules/group/dao/GroupDao.java | 11 ++++ .../modules/group/service/GroupService.java | 22 ++++++++ .../group/service/impl/GroupServiceImpl.java | 42 +++++++++++++-- .../service/impl/UserGroupServiceImpl.java | 34 ++++++++++++ .../main/resources/mapper/group/GroupDao.xml | 4 ++ 21 files changed, 414 insertions(+), 13 deletions(-) create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/async/GroupTask.java create mode 100644 esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupConstant.java diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java new file mode 100644 index 000000000..a40c7642e --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.feign; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.CompleteDeptDTO; +import com.elink.esua.epdc.feign.fallback.GroupFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.PostMapping; + +/** + * + * 友邻社群模块调用 + * + * @Author：liuchuang + * @Date：2019/11/20 23:41 + */ +@FeignClient(name = ServiceConstant.EPDC_GROUP_SERVER, fallback = GroupFeignClientFallback.class) +public interface GroupFeignClient { + + /** + * + * 创建网格党员群 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/21 0:01 + */ + @PostMapping(value = "group/epdc-app/group/createParty", consumes = MediaType.APPLICATION_JSON_VALUE) + Result createPartyGroup(CompleteDeptDTO formDto); +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java new file mode 100644 index 000000000..fe8696ae6 --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java @@ -0,0 +1,21 @@ +package com.elink.esua.epdc.feign.fallback; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.CompleteDeptDTO; +import com.elink.esua.epdc.feign.GroupFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Author：liuchuang + * @Date：2019/11/20 23:41 + */ +@Component +public class GroupFeignClientFallback implements GroupFeignClient { + + @Override + public Result createPartyGroup(CompleteDeptDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "createPartyGroup", formDto); + } +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 5234ad883..8d62456c8 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum; import com.elink.esua.epdc.commons.tools.exception.ErrorCode; import com.elink.esua.epdc.commons.tools.exception.RenException; @@ -26,6 +27,7 @@ import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.SysSimpleDeptDTO; import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO; import com.elink.esua.epdc.entity.SysDeptEntity; +import com.elink.esua.epdc.feign.GroupFeignClient; import com.elink.esua.epdc.service.SysDeptService; import com.elink.esua.epdc.service.SysUserService; import lombok.extern.slf4j.Slf4j; @@ -51,6 +53,9 @@ public class SysDeptServiceImpl extends BaseServiceImpl list(Map params) { //普通管理员，只能查询所属部门及子部门的数据 @@ -103,6 +108,13 @@ public class SysDeptServiceImpl extends BaseServiceImpl completeDeptDtoResult = this.getCompleteDept(entity.getId().toString()); + groupFeignClient.createPartyGroup(completeDeptDtoResult.getData()); + } } @Override diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/async/GroupTask.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/async/GroupTask.java new file mode 100644 index 000000000..b209235e8 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/async/GroupTask.java @@ -0,0 +1,50 @@ +package com.elink.esua.epdc.async; + +import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO; +import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO; +import com.elink.esua.epdc.feign.GroupFeignClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Component; + +/** + * + * 友邻社群模块 + * + * @Author：liuchuang + * @Date：2019/11/21 10:19 + */ +@Component +public class GroupTask { + + @Autowired + private GroupFeignClient groupFeignClient; + + /** + * + * 加入网格党员群 + * + * @params [] + * @return void + * @author liuchuang + * @since 2019/11/21 10:21 + */ + @Async + public void joinGridPartyGroup(GroupUserFormDTO formDto) { + groupFeignClient.joinGridPartyGroup(formDto); + } + + /** + * + * 更新社群用户党员标识并加入关联的所有网格党员群 + * + * @params [formDto] + * @return void + * @author liuchuang + * @since 2019/11/21 11:12 + */ + @Async + public void updateUserPartyMember(GroupUserPartyMemberFormDTO formDto) { + groupFeignClient.updateUserPartyMember(formDto); + } +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java index b79f9e3a6..508a64951 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java @@ -195,7 +195,7 @@ public interface GroupFeignClient { /** * - * 更新社群用户党员标识 + * 更新社群用户党员标识并加入关联的所有网格党员群 * * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result @@ -204,4 +204,16 @@ public interface GroupFeignClient { */ @PostMapping(value = "group/epdc-app/usergroup/partyMember", consumes = MediaType.APPLICATION_JSON_VALUE) Result updateUserPartyMember(GroupUserPartyMemberFormDTO formDto); + + /** + * + * 用户加入党员群 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/21 10:35 + */ + @PostMapping(value = "group/epdc-app/group/joinPartyGroup", consumes = MediaType.APPLICATION_JSON_VALUE) + Result joinGridPartyGroup(GroupUserFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java index 42754e74d..364fdab45 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java @@ -94,4 +94,9 @@ public class GroupFeignClientFallback implements GroupFeignClient { public Result updateUserPartyMember(GroupUserPartyMemberFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "updateUserPartyMember", formDto); } + + @Override + public Result joinGridPartyGroup(GroupUserFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "joinGridPartyGroup", formDto); + } } 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 0b2f1c825..7cee16d4c 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 @@ -3,6 +3,7 @@ package com.elink.esua.epdc.service.impl; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import cn.binarywang.wx.miniapp.bean.WxMaUserInfo; +import com.elink.esua.epdc.async.GroupTask; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.common.token.util.CpUserDetailRedis; import com.elink.esua.epdc.commons.tools.constant.NumConstant; @@ -11,6 +12,7 @@ import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import com.elink.esua.epdc.commons.tools.utils.*; import com.elink.esua.epdc.dto.*; +import com.elink.esua.epdc.dto.enums.GroupUserStateEnum; import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO; import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcGridLeaderRegisterFormDTO; @@ -20,6 +22,8 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; import com.elink.esua.epdc.dto.form.*; +import com.elink.esua.epdc.dto.group.form.GroupAddUserFormDTO; +import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO; import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO; import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; @@ -83,7 +87,7 @@ public class AppUserServiceImpl implements AppUserService { private RedisUtils redisUtils; @Autowired - private GroupFeignClient groupFeignClient; + private GroupTask groupTask; private static String USER_FACE = "https://epdc.elinkchina.com.cn/esua-epdc/static/default/default_user_face.png"; @@ -218,6 +222,9 @@ public class AppUserServiceImpl implements AppUserService { EpdcAppAuthorizationDTO authorization = this.packageEpdcAppAuthorization(tokenDto, newAppUser.getGrid(), AppUserStatesEnum.STATE_REGISTERED.value()); + // 网格长加入网格党员群并设置为群主 + this.joinGridPartyGroup(newAppUser, NumConstant.ONE_STR); + return new Result().ok(authorization); } @@ -626,6 +633,10 @@ public class AppUserServiceImpl implements AppUserService { } userResult = registerBindGridResultDto.getData(); registeredUser = userResult.getUserDTO(); + // 用户已认证为党员，绑定网格时加入该网格党员群 + if (NumConstant.ONE_STR.equals(registeredUser.getPartyFlag())) { + this.joinGridPartyGroup(registeredUser, NumConstant.ZERO_STR); + } } // 已注册已绑定当前网格 @@ -710,11 +721,19 @@ public class AppUserServiceImpl implements AppUserService { tokenDto.setPartyFlag(user.getPartyFlag()); EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(tokenDto, userGrid.getGrid(), userDto.getState()); - // 更新社群用户党员标识 - GroupUserPartyMemberFormDTO formDto = new GroupUserPartyMemberFormDTO(); - formDto.setUserId(user.getId()); - formDto.setPartyMember(user.getPartyFlag()); - groupFeignClient.updateUserPartyMember(formDto); + // 更新社群用户党员标识并加入关联的所有网格党员群 + if (NumConstant.ONE_STR.equals(user.getPartyFlag())) { + GroupUserPartyMemberFormDTO formDto = new GroupUserPartyMemberFormDTO(); + formDto.setUserId(user.getId()); + formDto.setPartyMember(user.getPartyFlag()); + formDto.setNickname(user.getNickname()); + formDto.setUserAvatar(user.getFaceImg()); + formDto.setMobile(user.getMobile()); + formDto.setDeptId(user.getGridId()); + formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()); + + groupTask.updateUserPartyMember(formDto); + } return new Result().ok(authorizationDto); } @@ -847,4 +866,26 @@ public class AppUserServiceImpl implements AppUserService { } return null; } + + /** + * + * 用户加入网格党员群 + * + * @params [userDto, lordFlag] + * @return void + * @author liuchuang + * @since 2019/11/21 10:58 + */ + private void joinGridPartyGroup(UserDTO userDto, String lordFlag) { + GroupUserFormDTO formDto = new GroupUserFormDTO(); + formDto.setUserId(userDto.getId()); + formDto.setNickname(userDto.getNickname()); + formDto.setUserAvatar(userDto.getFaceImg()); + formDto.setMobile(userDto.getMobile()); + formDto.setPartyMember(userDto.getPartyFlag()); + formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()); + formDto.setLordFlag(lordFlag); + formDto.setGridId(userDto.getGridId()); + groupTask.joinGridPartyGroup(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java index 40fe3c679..c7dfac26e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java @@ -53,6 +53,7 @@ public class GroupServiceImpl implements GroupService { formDto.setGrid(deptDTO.getGrid()); formDto.setGridId(deptDTO.getGridId()); formDto.setGroupCategory(NumConstant.ONE_STR); + formDto.setState(GroupStateEnum.GROUP_STATE_PENDING_REVIEW.getValue()); // 群主信息 GroupUserFormDTO groupUserFormDTO = new GroupUserFormDTO(); groupUserFormDTO.setUserId(userDetail.getUserId()); diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupConstant.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupConstant.java new file mode 100644 index 000000000..748399514 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupConstant.java @@ -0,0 +1,21 @@ +package com.elink.esua.epdc.dto.constant; + +/** + * + * 友邻社群常量 + * + * @Author：liuchuang + * @Date：2019/11/21 14:12 + */ +public interface GroupConstant { + + /** + * 网格党员群名称后缀 + */ + String PARTY_GROUP_NAME_SUFFIX = "党员群"; + + /** + * 网格党员群默认头像 + */ + String PARTY_GROUP_AVATAR = ""; +} diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupCreateFormDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupCreateFormDTO.java index 45578cde7..b6e0d0132 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupCreateFormDTO.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupCreateFormDTO.java @@ -75,6 +75,12 @@ public class GroupCreateFormDTO implements Serializable { */ @NotNull(message = "用户网格ID不能为空") private Long gridId; + + /** + * 社群状态 + */ + private Integer state; + /** * 群主信息 */ diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupUserFormDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupUserFormDTO.java index c508d5cc6..0825981de 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupUserFormDTO.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupUserFormDTO.java @@ -52,4 +52,9 @@ public class GroupUserFormDTO implements Serializable { * 处理意见 */ private String auditOpinion; + + /** + * 网格ID + */ + private Long gridId; } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupUserPartyMemberFormDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupUserPartyMemberFormDTO.java index e7a2d240d..e5720b894 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupUserPartyMemberFormDTO.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupUserPartyMemberFormDTO.java @@ -18,10 +18,35 @@ public class GroupUserPartyMemberFormDTO implements Serializable { */ @NotBlank(message = "用户ID不能为空") private String userId; - + /** + * 用户昵称 + */ + @NotBlank(message = "用户昵称不能为空") + private String nickname; + /** + * 用户头像 + */ + @NotBlank(message = "用户头像不能为空") + private String userAvatar; + /** + * 用户手机号 + */ + private String mobile; + /** + * 群主标识 0：否，1：是 + */ + private String lordFlag; /** * 党员标识 0：否，1：是 */ - @NotBlank(message = "党员标识不能为空") private String partyMember; + /** + * 状态 0：待审核，5：审核不通过，10：审核通过，15：已退群，20：已移除 + */ + private Integer state; + + /** + * 部门ID + */ + private Long deptId; } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/UserFeignClient.java index 3c37483e2..8a754d889 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/UserFeignClient.java @@ -2,11 +2,13 @@ package com.elink.esua.epdc.modules.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.UserGridRelationDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO; import com.elink.esua.epdc.modules.feign.fallback.UserFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import java.util.List; @@ -31,4 +33,16 @@ public interface UserFeignClient { */ @GetMapping("app-user/epdc-app/user/getInviteUserList") Result> getInviteUserList(EpdcUserGroupInviteFormDTO formDto); + + /** + * + * 获取用户所有网格 + * + * @params [userId] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/11/21 12:07 + */ + @GetMapping("app-user/usergrid/listUserGrid/{userId}") + Result> listUserGrid(@PathVariable("userId") String userId); } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/UserFeignClientFallback.java index 4984aec98..55aacfb9c 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/UserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/UserFeignClientFallback.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.modules.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.UserGridRelationDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO; import com.elink.esua.epdc.modules.feign.UserFeignClient; @@ -21,4 +22,9 @@ public class UserFeignClientFallback implements UserFeignClient { public Result> getInviteUserList(EpdcUserGroupInviteFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getInviteUserList", formDto); } + + @Override + public Result> listUserGrid(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "listUserGrid", userId); + } } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppGroupController.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppGroupController.java index 8c3c11f58..2f346331f 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppGroupController.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppGroupController.java @@ -1,8 +1,13 @@ package com.elink.esua.epdc.modules.group.controller; import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.CompleteDeptDTO; +import com.elink.esua.epdc.dto.constant.GroupConstant; +import com.elink.esua.epdc.dto.enums.GroupStateEnum; import com.elink.esua.epdc.dto.enums.GroupUserStateEnum; import com.elink.esua.epdc.dto.group.GroupSettingStateDTO; import com.elink.esua.epdc.dto.group.form.*; @@ -43,6 +48,29 @@ public class AppGroupController { return groupService.saveGroup(formDto); } + /** + * + * 创建网格党员群 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/21 0:01 + */ + @PostMapping("createParty") + public Result createPartyGroup(@RequestBody CompleteDeptDTO formDto) { + GroupCreateFormDTO groupCreateFormDto = ConvertUtils.sourceToTarget(formDto, GroupCreateFormDTO.class); + groupCreateFormDto.setArea(formDto.getDistrict()); + groupCreateFormDto.setAreaId(formDto.getDistrictId()); + groupCreateFormDto.setGroupName(formDto.getCommunity().concat(formDto.getGrid()).concat(GroupConstant.PARTY_GROUP_NAME_SUFFIX)); + groupCreateFormDto.setGroupAvatar(GroupConstant.PARTY_GROUP_AVATAR); + groupCreateFormDto.setGroupIntroduction(formDto.getStreet().concat(formDto.getCommunity()).concat(formDto.getGrid())); + groupCreateFormDto.setGroupCategory(NumConstant.ZERO_STR); + groupCreateFormDto.setState(GroupStateEnum.GROUP_STATE_EXAMINATION_PASSED.getValue()); + + return groupService.saveGroup(groupCreateFormDto); + } + /** * * 解散社群 @@ -201,4 +229,19 @@ public class AppGroupController { return groupService.applyForGroup(formDto); } + /** + * + * 用户加入党员群 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/21 10:35 + */ + @PostMapping("joinPartyGroup") + public Result joinGridPartyGroup(@RequestBody GroupUserFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return groupService.joinGridPartyGroup(formDto); + } + } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppUserGroupController.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppUserGroupController.java index 63f7cb5a6..26cd140f7 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppUserGroupController.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppUserGroupController.java @@ -74,7 +74,7 @@ public class AppUserGroupController { /** * - * 更新社群用户党员标识 + * 更新社群用户党员标识并加入关联的所有网格党员群 * * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java index 5524f1baa..c21310669 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java @@ -137,5 +137,16 @@ public interface GroupDao extends BaseDao { * @since 2019/11/12 16:14 */ List selectListOfGroupOrderByMember(Map params); + + /** + * + * 根据网格ID获取网格党员群 + * + * @params [gridId] + * @return com.elink.esua.epdc.dto.group.GroupDTO + * @author liuchuang + * @since 2019/11/20 22:54 + */ + GroupDTO selectOnePartyGroupInfoByGridId(Long gridId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java index 0fb53fbd3..89873f07d 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java @@ -250,4 +250,26 @@ public interface GroupService extends BaseService { */ PageData listGroupOrderByMember(Map params); + /** + * + * 根据网格ID获取网格党员群 + * + * @params [gridId] + * @return com.elink.esua.epdc.dto.group.GroupDTO + * @author liuchuang + * @since 2019/11/20 22:51 + */ + GroupDTO getPartyGroupInfoByGridId(Long gridId); + + /** + * + * 用户加入党员群 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/21 10:39 + */ + Result joinGridPartyGroup(GroupUserFormDTO formDto); + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java index 139b678ab..627b0a7aa 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java @@ -124,9 +124,12 @@ public class GroupServiceImpl extends BaseServiceImpl imp } GroupEntity entity = ConvertUtils.sourceToTarget(formDto, GroupEntity.class); if (insert(entity)) { - UserGroupDTO userGroupDTO = ConvertUtils.sourceToTarget(formDto.getGroupUserFormDTO(), UserGroupDTO.class); - userGroupDTO.setGroupId(entity.getId()); - userGroupService.save(userGroupDTO); + if (null != formDto.getGroupUserFormDTO()) { + // 保存群主 + UserGroupDTO userGroupDTO = ConvertUtils.sourceToTarget(formDto.getGroupUserFormDTO(), UserGroupDTO.class); + userGroupDTO.setGroupId(entity.getId()); + userGroupService.save(userGroupDTO); + } } return new Result(); } @@ -332,4 +335,37 @@ public class GroupServiceImpl extends BaseServiceImpl imp List list = baseDao.selectListOfGroupOrderByMember(params); return new PageData<>(list, page.getTotal()); } + + @Override + public GroupDTO getPartyGroupInfoByGridId(Long gridId) { + return baseDao.selectOnePartyGroupInfoByGridId(gridId); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Result joinGridPartyGroup(GroupUserFormDTO formDto) { + // 获取网格党员群 + GroupDTO groupDto = this.getPartyGroupInfoByGridId(formDto.getGridId()); + if (null == groupDto) { + return new Result().error("网格党员群不存在"); + } + // 校验用户是否已加入党员群 + int[] states = {GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()}; + UserGroupDTO userGroupDto = userGroupService.getGroupUserInfo(groupDto.getId(), formDto.getUserId(), states); + if (null == userGroupDto) { + UserGroupEntity userGroupEntity = ConvertUtils.sourceToTarget(formDto, UserGroupEntity.class); + userGroupEntity.setGroupId(groupDto.getId()); + userGroupService.insert(userGroupEntity); + } else { + // 更新用户为党员群群主 + if (NumConstant.ZERO_STR.equals(userGroupDto.getLordFlag()) && NumConstant.ONE_STR.equals(formDto.getLordFlag())) { + UserGroupEntity userGroupEntity = new UserGroupEntity(); + userGroupEntity.setId(userGroupDto.getId()); + userGroupEntity.setLordFlag(formDto.getLordFlag()); + userGroupService.updateById(userGroupEntity); + } + } + + return new Result(); + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java index c30c4684b..6019f50af 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.UserGridRelationDTO; import com.elink.esua.epdc.dto.constant.GroupNoticeConstant; import com.elink.esua.epdc.dto.enums.GroupUserStateEnum; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; @@ -243,7 +244,40 @@ public class UserGroupServiceImpl extends BaseServiceImpl> listResult = userFeignClient.listUserGrid(formDto.getUserId()); + if (!listResult.success()) { + return new Result().error("获取用户绑定网格信息失败"); + } + + for (UserGridRelationDTO dto: + listResult.getData()) { + // 获取网格党员群信息 + GroupDTO groupDto = groupService.getPartyGroupInfoByGridId(dto.getGridId()); + if (null != groupDto) { + // 校验用户是否已加入党员群 + int[] states = {GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()}; + UserGroupDTO userGroupDto = this.getGroupUserInfo(groupDto.getId(), formDto.getUserId(), states); + if (null != userGroupDto) { + // 更新用户为党员群群主 + if (NumConstant.ZERO_STR.equals(userGroupDto.getLordFlag()) && NumConstant.ONE_STR.equals(dto.getLeaderFlag())) { + UserGroupEntity userGroupEntity = new UserGroupEntity(); + userGroupEntity.setId(userGroupDto.getId()); + userGroupEntity.setLordFlag(dto.getLeaderFlag()); + this.updateById(userGroupEntity); + } + } else { + // 插入党员群 + UserGroupEntity entity = ConvertUtils.sourceToTarget(formDto, UserGroupEntity.class); + entity.setGroupId(groupDto.getId()); + entity.setLordFlag(dto.getLeaderFlag()); + this.insert(entity); + } + } + } + return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml index a11dc1b88..684365f26 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml @@ -252,4 +252,8 @@ gp.CREATED_TIME DESC + + \ No newline at end of file From 962516d117343f07fa313bd87ae35675d88a377c Mon Sep 17 00:00:00 2001 From: liuchuang Date: Thu, 21 Nov 2019 14:54:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=8E=B7=E5=8F=96token?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=B3=A8=E5=86=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/impl/AuthServiceImpl.java | 12 +++++++----- .../common/token/dto/WorkUserAuthorizationDTO.java | 5 +++++ .../esua/epdc/service/impl/WorkUserServiceImpl.java | 5 ++++- .../dto/constant/GroupConstant.java | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java index 8032d27a2..88cde28c8 100644 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java +++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java @@ -14,6 +14,7 @@ import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO; import com.elink.esua.epdc.common.token.dto.WorkUserTokenFormDTO; import com.elink.esua.epdc.common.token.util.CpUserDetailRedis; import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.exception.ErrorCode; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.log.SysLogLogin; @@ -142,6 +143,9 @@ public class AuthServiceImpl implements AuthService { Result result = userFeignClient.getByUsername(username); UserDetail user = result.getData(); + //授权信息 + WorkUserAuthorizationDTO authorization = new WorkUserAuthorizationDTO(); + //登录日志 SysLogLogin log = new SysLogLogin(); log.setType(LogTypeEnum.LOGIN.value()); @@ -156,8 +160,8 @@ public class AuthServiceImpl implements AuthService { log.setStatus(LoginStatusEnum.FAIL.value()); log.setCreatorName(username); logProducer.saveLog(log); - - return new Result().error("账号不存在"); + authorization.setRegisterState(NumConstant.ZERO_STR); + return new Result().ok(authorization); } //密码错误 @@ -176,7 +180,6 @@ public class AuthServiceImpl implements AuthService { log.setCreator(user.getId()); log.setCreatorName(user.getUsername()); logProducer.saveLog(log); - return new Result().error("账号已停用"); } @@ -186,8 +189,6 @@ public class AuthServiceImpl implements AuthService { //登录成功，生成token String token = jwtUtils.generateToken(user.getId()); - //授权信息 - WorkUserAuthorizationDTO authorization = new WorkUserAuthorizationDTO(); authorization.setToken(token); authorization.setExpire(jwtProperties.getExpire()); @@ -203,6 +204,7 @@ public class AuthServiceImpl implements AuthService { authorization.setDeptName(user.getDeptName()); authorization.setUserTagKey(user.getTypeKey()); + authorization.setRegisterState(NumConstant.ONE_STR); return new Result().ok(authorization); } diff --git a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/WorkUserAuthorizationDTO.java b/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/WorkUserAuthorizationDTO.java index 17c83983a..afee518ad 100644 --- a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/WorkUserAuthorizationDTO.java +++ b/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/WorkUserAuthorizationDTO.java @@ -36,6 +36,11 @@ public class WorkUserAuthorizationDTO implements Serializable { */ private String userTagKey; + /** + * 注册状态 0-未注册，1-已注册 + */ + private String registerState; + /** * 用户所有角色权限信息 */ diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java index 435a0e02f..ecd615a05 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java @@ -5,6 +5,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO; import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO; import com.elink.esua.epdc.common.token.dto.WorkUserTokenFormDTO; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -63,7 +64,9 @@ public class WorkUserServiceImpl implements WorkUserService { } SysUserDTO userDto = sysUserDtoResult.getData(); if (null == userDto) { - return new Result().error("用户不存在"); + WorkUserAuthorizationDTO resultDto = new WorkUserAuthorizationDTO(); + resultDto.setRegisterState(NumConstant.ZERO_STR); + return new Result().ok(resultDto); } return resourceFeignClient.getToken(ConvertUtils.sourceToTarget(userDto, WorkUserTokenFormDTO.class)); diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupConstant.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupConstant.java index 748399514..f5634a11c 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupConstant.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupConstant.java @@ -17,5 +17,5 @@ public interface GroupConstant { /** * 网格党员群默认头像 */ - String PARTY_GROUP_AVATAR = ""; + String PARTY_GROUP_AVATAR = "https://epdc.elinkchina.com.cn/esua-epdc/static/default/default_party_group_avatar.png"; } From 010193f103474760b1399f57173f458dbbfcdea2 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Thu, 21 Nov 2019 15:19:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=8E=A5=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issue/result/IssueProgressResultDTO.java | 40 +++++++++++++++++++ .../esua/epdc/modules/issue/dao/IssueDao.java | 11 +++++ .../modules/issue/service/IssueService.java | 11 +++++ .../issue/service/impl/IssueServiceImpl.java | 5 +++ .../main/resources/mapper/issue/IssueDao.xml | 25 ++++++++++++ 5 files changed, 92 insertions(+) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java new file mode 100644 index 000000000..659d762e2 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java @@ -0,0 +1,40 @@ +package com.elink.esua.epdc.dto.issue.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * + * 议题处理进度（后台和工作端用） + * + * @Author：liuchuang + * @Date：2019/11/21 15:08 + */ +@Data +public class IssueProgressResultDTO implements Serializable { + private static final long serialVersionUID = 2739821096656995025L; + + /** + * 状态 + */ + private String state; + /** + * 时间 + */ + private String createdTime; + /** + * 意见 + */ + private String advice; + /** + * 操作人部门 + */ + private String handlerDept; + + /** + * 处理图片 + */ + private List images; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java index 91b48cd3e..375501dae 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java @@ -158,4 +158,15 @@ public interface IssueDao extends BaseDao { * 工作端-议题详情 */ WorkIssueDetailResultDTO selectOneWorkIssueDetail(String issueId); + + /** + * + * 议题处理进度(后台/工作端用) + * + * @params [issueId] + * @return java.util.List + * @author liuchuang + * @since 2019/11/21 15:16 + */ + List selectListIssueProgress(String issueId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java index 70508326c..7f3476dc4 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java @@ -237,4 +237,15 @@ public interface IssueService extends BaseService { * 工作端-议题详情 */ WorkIssueDetailResultDTO selectOneWorkIssueDetail(String issueId); + + /** + * + * 议题处理进度(后台/工作端用) + * + * @params [issueId] + * @return java.util.List + * @author liuchuang + * @since 2019/11/21 15:16 + */ + List listIssueProgress(String issueId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index b694223cb..cc2a9ea79 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -444,4 +444,9 @@ public class IssueServiceImpl extends BaseServiceImpl imp public WorkIssueDetailResultDTO selectOneWorkIssueDetail(String issueId) { return baseDao.selectOneWorkIssueDetail(issueId); } + + @Override + public List listIssueProgress(String issueId) { + return baseDao.selectListIssueProgress(issueId); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 2bc4690a2..5c3d9c64d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -354,6 +354,31 @@ CREATED_TIME DESC + + + + + + + + + + +