From e73aeddaa1f9d84353ff3aa8412327cc03586a23 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Tue, 2 Jun 2020 15:31:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E7=BE=A4=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/GroupUserBannedFormDTO.java | 30 +++++ .../epdc/dto/GroupUserManagerFormDTO.java | 29 +++++ .../elink/esua/epdc/dto/PartyGroupDTO.java | 8 ++ .../esua/epdc/dto/PartyUserGroupDTO.java | 35 ++++++ .../epdc/dto/constant/PartyGroupConstant.java | 23 ++++ .../epdc/controller/PartyGroupController.java | 13 ++- .../controller/PartyUserGroupController.java | 27 ++++- .../elink/esua/epdc/dao/PartyGroupDao.java | 17 +++ .../esua/epdc/dao/PartyUserGroupDao.java | 29 ++++- .../esua/epdc/entity/PartyGroupEntity.java | 3 + .../epdc/entity/PartyUserGroupEntity.java | 29 +++++ .../com/elink/esua/epdc/enums/BannedEnum.java | 45 ++++++++ .../esua/epdc/feign/AdminFeignClient.java | 5 - .../esua/epdc/feign/UserFeignClient.java | 62 ++++++++++ .../fallback/UserFeignClientFallback.java | 46 ++++++++ .../esua/epdc/service/PartyGroupService.java | 17 +++ .../epdc/service/PartyUserGroupService.java | 43 +++++++ .../service/impl/PartyGroupServiceImpl.java | 104 +++++++++++++++-- .../impl/PartyUserGroupServiceImpl.java | 76 +++++++++++++ .../main/resources/mapper/PartyGroupDao.xml | 50 +++++++++ .../mapper/PartyGroupOfficialsDao.xml | 1 + .../main/resources/mapper/PartyTopicDao.xml | 1 + .../resources/mapper/PartyUserGroupDao.xml | 106 ++++++++++++++++++ .../esua/epdc/controller/UserController.java | 12 ++ .../UserGridRelationController.java | 12 ++ .../java/com/elink/esua/epdc/dao/UserDao.java | 9 ++ .../esua/epdc/dao/UserGridRelationDao.java | 8 ++ .../epdc/service/UserGridRelationService.java | 8 ++ .../elink/esua/epdc/service/UserService.java | 8 ++ .../impl/UserGridRelationServiceImpl.java | 5 + .../epdc/service/impl/UserServiceImpl.java | 6 + .../src/main/resources/mapper/UserDao.xml | 5 + .../resources/mapper/UserGridRelationDao.xml | 20 ++++ 33 files changed, 876 insertions(+), 16 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/GroupUserBannedFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/GroupUserManagerFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/constant/PartyGroupConstant.java create mode 100644 esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/enums/BannedEnum.java create mode 100644 esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java create mode 100644 esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/GroupUserBannedFormDTO.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/GroupUserBannedFormDTO.java new file mode 100644 index 00000000..c3e2ca13 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/GroupUserBannedFormDTO.java @@ -0,0 +1,30 @@ +package com.elink.esua.epdc.dto; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.io.Serializable; + +/** + * @author songyunpeng + * @Description + * @create 2020-06-01 + */ +@Data +public class GroupUserBannedFormDTO implements Serializable { + private static final long serialVersionUID = -8847567240714882803L; + + /** + * 用户党群关联表iD + */ + @NotBlank(message = "用户党群关联表ID不能为空") + private String id; + + /** + * 禁言标识 + */ + @NotBlank(message = "禁言标识不能为空") + private String bannedFlag; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/GroupUserManagerFormDTO.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/GroupUserManagerFormDTO.java new file mode 100644 index 00000000..088b8259 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/GroupUserManagerFormDTO.java @@ -0,0 +1,29 @@ +package com.elink.esua.epdc.dto; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @author songyunpeng + * @Description + * @create 2020-06-01 + */ +@Data +public class GroupUserManagerFormDTO implements Serializable { + private static final long serialVersionUID = -8847567240714882803L; + + /** + * 用户党群关联表iD + */ + @NotBlank(message = "用户党群关联表ID不能为空") + private String groupUserId; + + /** + * 身份标识 + */ + @NotBlank(message = "身份标识不能为空") + private String identityFlag; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupDTO.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupDTO.java index 2af9cf0b..dd3aac62 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupDTO.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupDTO.java @@ -117,5 +117,13 @@ public class PartyGroupDTO implements Serializable { * 更新时间 */ private Date updatedTime; + /** + * 群主ID + */ + private String userId; + /** + * 群主昵称 + */ + private String nickname; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyUserGroupDTO.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyUserGroupDTO.java index 3513e51e..ed010f22 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyUserGroupDTO.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyUserGroupDTO.java @@ -123,4 +123,39 @@ public class PartyUserGroupDTO implements Serializable { */ private Date updatedTime; + /** + * 所有部门ID + */ + private String allDeptIds; + + /** + * 所有部门名称 + */ + private String allDeptNames; + + /** + * 父所有部门 + */ + private String parentDeptIds; + + /** + * 父所有部门 + */ + private String parentDeptNames; + + /** + * 网格 + */ + private String grid; + + /** + * 网格ID + */ + private Long gridId; + + /** + * 禁言状态 + */ + private String bannedState; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/constant/PartyGroupConstant.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/constant/PartyGroupConstant.java new file mode 100644 index 00000000..4927de5c --- /dev/null +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/constant/PartyGroupConstant.java @@ -0,0 +1,23 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

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

+ * 版权所有，侵权必究！ + + */ +package com.elink.esua.epdc.dto.constant; + +/** + * 常量 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +public interface PartyGroupConstant { + /** + * 党群身份标识 群主 + */ + String PARTY_GROUP_IDENTITY_FLAG = "1"; + +} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyGroupController.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyGroupController.java index 0b44bf08..99d55257 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyGroupController.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyGroupController.java @@ -28,8 +28,10 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.dto.PartyGroupDTO; import com.elink.esua.epdc.dto.PartyGroupListDTO; +import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.excel.PartyGroupExcel; import com.elink.esua.epdc.service.PartyGroupService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -53,7 +55,7 @@ public class PartyGroupController { @GetMapping("page") public Result> page(@RequestParam Map params){ - PageData page = partyGroupService.page(params); + PageData page = partyGroupService.listPage(params); return new Result>().ok(page); } @@ -107,4 +109,13 @@ public class PartyGroupController { } + @GetMapping("getUserList/{deptId}") + public Result> getUserList(@PathVariable("deptId") Long deptId) { + if(deptId==null){ + return new Result>().error("部门ID为空！"); + } + List data = partyGroupService.getUserList(deptId); + return new Result>().ok(data); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyUserGroupController.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyUserGroupController.java index 4813d91f..5e6a43a7 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyUserGroupController.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/PartyUserGroupController.java @@ -25,6 +25,8 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.GroupUserBannedFormDTO; +import com.elink.esua.epdc.dto.GroupUserManagerFormDTO; import com.elink.esua.epdc.dto.PartyUserGroupDTO; import com.elink.esua.epdc.excel.PartyUserGroupExcel; import com.elink.esua.epdc.service.PartyUserGroupService; @@ -51,7 +53,7 @@ public class PartyUserGroupController { @GetMapping("page") public Result> page(@RequestParam Map params){ - PageData page = partyUserGroupService.page(params); + PageData page = partyUserGroupService.listPage(params); return new Result>().ok(page); } @@ -90,5 +92,28 @@ public class PartyUserGroupController { List list = partyUserGroupService.list(params); ExcelUtils.exportExcelToTarget(response, null, list, PartyUserGroupExcel.class); } + /** + * @Description 禁言 + * @Author songyunpeng + * @Date 2020/6/2 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("banned") + public Result banned(@RequestBody GroupUserBannedFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return partyUserGroupService.modifyBannedState(formDto); + } + /** + * @Description 设为身份标识 + * @Author songyunpeng + * @Date 2020/6/2 + * @Param [id] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("setGroupManager") + public Result setGroupManager(@RequestBody GroupUserManagerFormDTO formDto) { + return partyUserGroupService.modifyGroupManagerState(formDto); + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupDao.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupDao.java index 377bff17..403a8ef5 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupDao.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupDao.java @@ -18,11 +18,13 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.PartyGroupDTO; import com.elink.esua.epdc.dto.PartyGroupListDTO; import com.elink.esua.epdc.entity.PartyGroupEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; +import java.util.Map; /** * 党群表 @@ -40,4 +42,19 @@ public interface PartyGroupDao extends BaseDao { * @return java.util.List **/ List selectListOfGroupByDeptId(Long deptId); + /** + * @Description pc列表 + * @Author songyunpeng + * @Date 2020/6/1 + * @Param [params] + **/ + List selectListOfPartyGroupDTO(Map params); + /** + * @Description pc获取详情 + * @Author songyunpeng + * @Date 2020/6/1 + * @Param [id] + * @return com.elink.esua.epdc.entity.PartyGroupEntity + **/ + PartyGroupDTO selectDetailById(String id); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyUserGroupDao.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyUserGroupDao.java index bcc8c7d3..b6368f1a 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyUserGroupDao.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyUserGroupDao.java @@ -18,9 +18,13 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.PartyUserGroupDTO; import com.elink.esua.epdc.entity.PartyUserGroupEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** * 党群成员关系表 * @@ -29,5 +33,28 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PartyUserGroupDao extends BaseDao { - + /** + * @Description 获取指定党群内的群主信息 + * @Author songyunpeng + * @Date 2020/6/1 + * @Param [ groupId] + * @return com.elink.esua.epdc.dto.PartyUserGroupDTO + **/ + PartyUserGroupDTO getManagerByGroupId(String groupId); + /** + * @Description 获取指定党群内的用户信息 + * @Author songyunpeng + * @Date 2020/6/1 + * @Param [groupId, userId] + * @return com.elink.esua.epdc.dto.PartyUserGroupDTO + **/ + PartyUserGroupDTO getUserByGroupIdAndUserId(String groupId, String userId); + /** + * @Description pc列表 + * @Author songyunpeng + * @Date 2020/6/2 + * @Param [params] + * @return java.util.List + **/ + List getPartyUserGroupPageFromPC(Map params); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupEntity.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupEntity.java index 3454c3c6..e95040ab 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupEntity.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupEntity.java @@ -88,4 +88,7 @@ public class PartyGroupEntity extends BaseEpdcEntity { */ private String parentDeptNames; + + + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyUserGroupEntity.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyUserGroupEntity.java index fb6ec9bb..f8aa9d33 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyUserGroupEntity.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyUserGroupEntity.java @@ -92,5 +92,34 @@ public class PartyUserGroupEntity extends BaseEpdcEntity { * 禁言结束时间 */ private Date bannedEndTime; + /** + * 所有部门ID + */ + private String allDeptIds; + + /** + * 所有部门名称 + */ + private String allDeptNames; + + /** + * 父所有部门 + */ + private String parentDeptIds; + + /** + * 父所有部门 + */ + private String parentDeptNames; + + /** + * 网格 + */ + private String grid; + + /** + * 网格ID + */ + private Long gridId; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/enums/BannedEnum.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/enums/BannedEnum.java new file mode 100644 index 00000000..78376480 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/enums/BannedEnum.java @@ -0,0 +1,45 @@ +package com.elink.esua.epdc.enums; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 禁言标识枚举 + * + * @author songyunpeng + * @Date 20-04-2 + */ +@JsonFormat(shape = JsonFormat.Shape.OBJECT) +public enum BannedEnum { + /** + * 不禁言 + */ + BANNED_NO("0"), + /** + * 禁言一天 + */ + BANNED_DAY("1"), + /** + * 禁言一周 + */ + BANNED_WEEK("2"), + /** + * 禁言一月 + */ + BANNED_MONTH("3"), + /** + * 永久禁言 + */ + BANNED_FOREVER("4"); + + private String value; + + BannedEnum(final String value) { + this.value = value; + } + + public String getValue() { + return this.value; + } + + +} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index ed3e7616..98d77284 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -4,16 +4,11 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.SysDeptDTO; -import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO; -import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import java.util.List; /** diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java new file mode 100644 index 00000000..d48487ab --- /dev/null +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -0,0 +1,62 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

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

+ * 版权所有，侵权必究！ + */ + +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.UserDTO; +import com.elink.esua.epdc.dto.UserGridRelationDTO; +import com.elink.esua.epdc.feign.fallback.UserFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +import java.util.List; + + +/** + * 用户接口 + * + * @author songyunpeng + * @since 1.0.0 + */ +@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = UserFeignClientFallback.class, contextId = "UserFeignClient") +public interface UserFeignClient { + + /** + * @Description 获取指定街道下用户信息（未删除，状态不为0） + * @Author songyunpeng + * @Date 2020/6/1 + * @Param [deptId] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @GetMapping("/app-user/user/getUserList/{deptId}") + Result> getUserList(@PathVariable("deptId") Long deptId); + + /** + * @Description 查询用户基础信息 + * @Author songyunpeng + * @Date 2020/6/1 + * @Param [userId] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @GetMapping("app-user/epdc-app/user/getById/{userId}") + Result getUserInfoById(@PathVariable("userId") String userId); + + /** + * @Description 获取用户第一次扫码网格的信息 + * @Author songyunpeng + * @Date 2020/6/2 + * @Param [userId] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @GetMapping(value = "app-user/usergrid/getUserFirstScanGird/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getUserFirstScanGird(@PathVariable("userId") String userId); +} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java new file mode 100644 index 00000000..be8bdc4c --- /dev/null +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -0,0 +1,46 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

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

+ * 版权所有，侵权必究！ + */ + +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.UserDTO; +import com.elink.esua.epdc.dto.UserGridRelationDTO; +import com.elink.esua.epdc.feign.UserFeignClient; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * 用户接口 Fallback + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Component +public class UserFeignClientFallback implements UserFeignClient { + + + @Override + public Result> getUserList(Long deptId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserList", deptId); + } + + + @Override + public Result getUserInfoById(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoById", userId); + } + + @Override + public Result getUserFirstScanGird(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserFirstScanGird", userId); + } +} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java index 44f5e1cb..7392f7c3 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java @@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.PartyGroupDTO; import com.elink.esua.epdc.dto.PartyGroupListDTO; +import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.entity.PartyGroupEntity; import java.util.List; @@ -101,4 +102,20 @@ public interface PartyGroupService extends BaseService { * @return java.util.List **/ List listOfGroupByDeptId(Long deptId); + /** + * @Description 获取指定街道下用户信息（未删除，状态不为0） + * @Author songyunpeng + * @Date 2020/6/1 + * @Param [deptId] + * @return java.util.List + **/ + List getUserList(Long deptId); + /** + * @Description 获取pc列表 + * @Author songyunpeng + * @Date 2020/6/1 + * @Param [params] + * @return com.elink.esua.epdc.commons.tools.page.PageData + **/ + PageData listPage(Map params); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyUserGroupService.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyUserGroupService.java index 8b94f056..9aa660b3 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyUserGroupService.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyUserGroupService.java @@ -19,6 +19,9 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.GroupUserBannedFormDTO; +import com.elink.esua.epdc.dto.GroupUserManagerFormDTO; import com.elink.esua.epdc.dto.PartyUserGroupDTO; import com.elink.esua.epdc.entity.PartyUserGroupEntity; @@ -92,4 +95,44 @@ public interface PartyUserGroupService extends BaseService * @date 2020-05-29 */ void delete(String[] ids); + /** + * @Description 获取指定党群内的群主信息 + * @Author songyunpeng + * @Date 2020/6/1 + * @Param [ groupId] + * @return com.elink.esua.epdc.dto.PartyUserGroupDTO + **/ + PartyUserGroupDTO getManagerByGroupId(String groupId); + /** + * @Description 获取指定党群内的用户信息 + * @Author songyunpeng + * @Date 2020/6/1 + * @Param [ groupId] + * @return com.elink.esua.epdc.dto.PartyUserGroupDTO + **/ + PartyUserGroupDTO getUserByGroupIdAndUserId(String groupId,String userId); + /** + * @Description pc列表 + * @Author songyunpeng + * @Date 2020/6/2 + * @Param [params] + * @return com.elink.esua.epdc.commons.tools.page.PageData + **/ + PageData listPage(Map params); + /** + * @Description 禁言 + * @Author songyunpeng + * @Date 2020/6/2 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result modifyBannedState(GroupUserBannedFormDTO formDto); + /** + * @Description 修改身份 + * @Author songyunpeng + * @Date 2020/6/2 + * @Param [id, i] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result modifyGroupManagerState(GroupUserManagerFormDTO formDto); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java index bba4ca6b..4a005887 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java @@ -26,14 +26,14 @@ 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.dao.PartyGroupDao; -import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; -import com.elink.esua.epdc.dto.PartyGroupDTO; -import com.elink.esua.epdc.dto.PartyGroupListDTO; -import com.elink.esua.epdc.dto.SysDeptDTO; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.entity.PartyGroupEntity; +import com.elink.esua.epdc.entity.PartyUserGroupEntity; import com.elink.esua.epdc.feign.AdminFeignClient; +import com.elink.esua.epdc.feign.UserFeignClient; import com.elink.esua.epdc.redis.PartyGroupRedis; import com.elink.esua.epdc.service.PartyGroupService; +import com.elink.esua.epdc.service.PartyUserGroupService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -58,6 +58,13 @@ public class PartyGroupServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -85,13 +92,21 @@ public class PartyGroupServiceImpl extends BaseServiceImpl sysDeptDTO = adminFeignClient.getSysDeptDTO(Long.parseLong(dto.getDeptId())); if(!sysDeptDTO.success() || sysDeptDTO.getData()==null){ @@ -110,15 +125,72 @@ public class PartyGroupServiceImpl extends BaseServiceImpl userInfoById = userFeignClient.getUserInfoById(userId); + if(!userInfoById.success() || userInfoById.getData() == null){ + throw new RenException("获取用户信息失败"); + } + UserDTO userDto = userInfoById.getData(); + PartyUserGroupEntity partyUserGroupEntity = new PartyUserGroupEntity(); + partyUserGroupEntity.setIdentityFlag(userDto.getPartyFlag()); + partyUserGroupEntity.setUserId(userDto.getId()); + partyUserGroupEntity.setNickname(userDto.getNickname()); + partyUserGroupEntity.setUserAvatar(userDto.getFaceImg()); + partyUserGroupEntity.setMobile(userDto.getMobile()); + partyUserGroupEntity.setPartyGroupId(partyGroupId); + partyUserGroupEntity.setIdentityFlag("1"); + //网格信息 + if(userDto.getGridId()!=null && userDto.getGridId()!=0){ + partyUserGroupEntity.setGrid(userDto.getGrid()); + partyUserGroupEntity.setGridId(userDto.getGridId()); + partyUserGroupEntity.setAllDeptIds(userDto.getAllDeptIds()); + partyUserGroupEntity.setAllDeptNames(userDto.getAllDeptNames()); + partyUserGroupEntity.setParentDeptIds(userDto.getParentDeptIds()); + partyUserGroupEntity.setParentDeptNames(userDto.getParentDeptNames()); + }else{ + Result userFirstScanGird = userFeignClient.getUserFirstScanGird(userId); + if(!userFirstScanGird.success() || userFirstScanGird.getData() == null){ + throw new RenException("获取用户网格关联信息失败"); + } + UserGridRelationDTO userGridRelationDTO = userFirstScanGird.getData(); + partyUserGroupEntity.setGrid(userGridRelationDTO.getGrid()); + partyUserGroupEntity.setGridId(userGridRelationDTO.getGridId()); + partyUserGroupEntity.setAllDeptIds(userGridRelationDTO.getAllDeptIds()); + partyUserGroupEntity.setAllDeptNames(userGridRelationDTO.getAllDeptNames()); + partyUserGroupEntity.setParentDeptIds(userGridRelationDTO.getParentDeptIds()); + partyUserGroupEntity.setParentDeptNames(userGridRelationDTO.getParentDeptNames()); + } + partyUserGroupService.insert(partyUserGroupEntity); + } @Override @Transactional(rollbackFor = Exception.class) public void update(PartyGroupDTO dto) { + //保存部门信息 + this.saveDeptInfo(dto); PartyGroupEntity entity = ConvertUtils.sourceToTarget(dto, PartyGroupEntity.class); updateById(entity); + //判断是否更新群主 + PartyUserGroupDTO managerByGroupId = partyUserGroupService.getManagerByGroupId(dto.getId()); + //存在群主且如过改变群主信息 则之前群主为群成员 + if(managerByGroupId != null && !managerByGroupId.getUserId().equals(dto.getUserId())){ + //先更新之前的群主为群成员 + managerByGroupId.setIdentityFlag("0"); + partyUserGroupService.update(managerByGroupId); + } + //判断新指定的群主是否已存在党群成员中 + PartyUserGroupDTO userByGroupIdAndUserId = partyUserGroupService.getUserByGroupIdAndUserId(dto.getId(), dto.getUserId()); + //新指定群主不存在则直接新增 + if(userByGroupIdAndUserId==null){ + //保存群主信息 + this.insertUserGroup(dto.getUserId(),entity.getId()); + }else{//存在则只更新身份标识 + userByGroupIdAndUserId.setIdentityFlag("1"); + partyUserGroupService.update(userByGroupIdAndUserId); + } } @Override @@ -134,4 +206,20 @@ public class PartyGroupServiceImpl extends BaseServiceImpl getUserList(Long deptId) { + Result> userList = userFeignClient.getUserList(deptId); + if(!userList.success() || userList.getData()==null){ + throw new RenException("获取用户列表信息失败"); + } + return userList.getData(); + } + + @Override + public PageData listPage(Map params) { + IPage page = getPage(params); + List list = baseDao.selectListOfPartyGroupDTO(params); + return new PageData<>(list, page.getTotal()); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyUserGroupServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyUserGroupServiceImpl.java index 36142595..a35b416a 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyUserGroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyUserGroupServiceImpl.java @@ -20,12 +20,19 @@ package com.elink.esua.epdc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.exception.RenException; 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.DateUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.PartyUserGroupDao; +import com.elink.esua.epdc.dto.GroupUserBannedFormDTO; +import com.elink.esua.epdc.dto.GroupUserManagerFormDTO; import com.elink.esua.epdc.dto.PartyUserGroupDTO; +import com.elink.esua.epdc.dto.constant.PartyGroupConstant; import com.elink.esua.epdc.entity.PartyUserGroupEntity; +import com.elink.esua.epdc.enums.BannedEnum; import com.elink.esua.epdc.redis.PartyUserGroupRedis; import com.elink.esua.epdc.service.PartyUserGroupService; import org.apache.commons.lang3.StringUtils; @@ -34,6 +41,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -101,4 +109,72 @@ public class PartyUserGroupServiceImpl extends BaseServiceImpl listPage(Map params) { + IPage page = getPage(params); + List list = baseDao.getPartyUserGroupPageFromPC(params); + return new PageData<>(list, page.getTotal()); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Result modifyBannedState(GroupUserBannedFormDTO formDto) { + PartyUserGroupEntity entity = new PartyUserGroupEntity(); + entity.setId(formDto.getId()); + //设置禁言时长 + if(BannedEnum.BANNED_NO.getValue().equals(formDto.getBannedFlag())){ + entity.setBannedStartTime(new Date()); + entity.setBannedEndTime(new Date()); + }else if (BannedEnum.BANNED_DAY.getValue().equals(formDto.getBannedFlag())){ + entity.setBannedStartTime(new Date()); + entity.setBannedEndTime(DateUtils.addDateDays(new Date(),1)); + }else if (BannedEnum.BANNED_WEEK.getValue().equals(formDto.getBannedFlag())){ + entity.setBannedStartTime(new Date()); + entity.setBannedEndTime(DateUtils.addDateWeeks(new Date(),1)); + }else if (BannedEnum.BANNED_MONTH.getValue().equals(formDto.getBannedFlag())){ + entity.setBannedStartTime(new Date()); + entity.setBannedEndTime(DateUtils.addDateMonths(new Date(),1)); + }else if (BannedEnum.BANNED_FOREVER.getValue().equals(formDto.getBannedFlag())){ + entity.setBannedStartTime(new Date()); + entity.setBannedEndTime(DateUtils.addDateYears(new Date(),100)); + } + updateById(entity); + return new Result(); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Result modifyGroupManagerState(GroupUserManagerFormDTO formDto) { + //判断是否是指定群主操作 + if(PartyGroupConstant.PARTY_GROUP_IDENTITY_FLAG.equals(formDto.getIdentityFlag())){ + //先将之前的群主身份取消为群成员 + PartyUserGroupDTO partyUserGroupDTO = get(formDto.getGroupUserId()); + if(partyUserGroupDTO==null){ + throw new RenException("获取成员党群信息异常"); + } + //获取之前的群主信息 + PartyUserGroupDTO managerByGroupId = getManagerByGroupId(partyUserGroupDTO.getPartyGroupId()); + if(managerByGroupId!=null){ + managerByGroupId.setIdentityFlag("0"); + updateById(ConvertUtils.sourceToTarget(managerByGroupId,PartyUserGroupEntity.class)); + } + } + //更新当前用户身份 + PartyUserGroupEntity entity = new PartyUserGroupEntity(); + entity.setId(formDto.getGroupUserId()); + entity.setIdentityFlag(formDto.getIdentityFlag()); + updateById(entity); + return new Result(); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml index 6fc62dd4..d111f12c 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml @@ -35,5 +35,55 @@ AND find_in_set(#{deptId},ALL_DEPT_IDS) + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml index 545ea238..b724585b 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml @@ -51,6 +51,7 @@ AND (GRID_ID = #{gridId} OR find_in_set(#{gridId},ALL_DEPT_IDS)) + order by CREATED_TIME desc \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml index 90bcb1b7..202a6839 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml @@ -79,6 +79,7 @@ #{endTime} + order by CREATED_TIME desc diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyUserGroupDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyUserGroupDao.xml index 4eff6ac1..6fa2a4fe 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyUserGroupDao.xml +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyUserGroupDao.xml @@ -25,4 +25,110 @@ + + + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java index 5ad1d17c..a4e38b21 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -178,4 +178,16 @@ public class UserController { return userService.handleUserPoints(formDTO); } + + /** + * @Description 获取已认证未删除用户列表 + * @Author songyunpeng + * @Date 2020/6/1 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @GetMapping("getUserList/{deptId}") + public Result> getUserList(@PathVariable("deptId") Long deptId) { + return userService.getUserList(deptId); + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java index f7c5e3f2..ca2ca1ea 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java @@ -102,6 +102,18 @@ public class UserGridRelationController { UserGridRelationDTO data = userGridRelationService.getUserLastSwitchGird(userId); return new Result().ok(data); } + /** + * @Description 获取用户第一次扫码网格的信息 + * @Author songyunpeng + * @Date 2020/6/2 + * @Param [userId] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @GetMapping("getUserFirstScanGird/{userId}") + public Result getUserFirstScanGird(@PathVariable("userId") String userId){ + UserGridRelationDTO data = userGridRelationService.getUserFirstScanGird(userId); + return new Result().ok(data); + } /** * @param id epdc_user_grid_relation表主键 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java index 35558f90..ff1c3c22 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java @@ -18,6 +18,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.CachingUserInfoDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUnauthorizedAmountFromDTO; @@ -196,4 +197,12 @@ public interface UserDao extends BaseDao { * @Date 2019/12/18 14:12 **/ CachingUserInfoDTO selectCachingUserInfoDTO(@Param("openId") String openId, @Param("unionId") String unionId); + /** + * @Description 获取指定部门下未删除已认证用户列表 + * @Author songyunpeng + * @Date 2020/6/1 + * @Param [] + * @return java.util.List + **/ + List getUserList(Long deptId); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserGridRelationDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserGridRelationDao.java index cb3a4041..e283aaca 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserGridRelationDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserGridRelationDao.java @@ -66,4 +66,12 @@ public interface UserGridRelationDao extends BaseDao { * @since 2020/3/7 1:20 */ void updateGridByDeptId(String newDeptName, Long deptId); + /** + * @Description 获取用户第一次扫码网格的信息 + * @Author songyunpeng + * @Date 2020/6/2 + * @Param [userId] + * @return com.elink.esua.epdc.dto.UserGridRelationDTO + **/ + UserGridRelationDTO getUserFirstScanGrid(String userId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java index c4009747..93a09f7b 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java @@ -188,4 +188,12 @@ public interface UserGridRelationService extends BaseService { * @Date 2019/12/18 14:01 **/ Result queryCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO); + /** + * @Description 获取已认证未删除用户列表 + * @Author songyunpeng + * @Date 2020/6/1 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + Result> getUserList(Long deptId); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java index 76a97635..ab120126 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java @@ -233,6 +233,11 @@ public class UserGridRelationServiceImpl extends BaseServiceImpl implem return new Result().ok(cachingUserInfoDTO); } + @Override + public Result> getUserList(Long deptId) { + List list = baseDao.getUserList(deptId); + return new Result>().ok(list); + } + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 1c5bf86e..48d129a7 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -500,4 +500,9 @@ + + diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserGridRelationDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserGridRelationDao.xml index 722d56e3..cf5f2c27 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserGridRelationDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserGridRelationDao.xml @@ -33,4 +33,24 @@ UPDATE epdc_user_grid_relation SET GRID = #{newDeptName}, UPDATED_TIME = NOW() WHERE GRID_ID = #{deptId} + + + \ No newline at end of file