diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java new file mode 100644 index 0000000000..d6b1f53cd7 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -0,0 +1,36 @@ +package com.epmet.commons.tools.exception; + +/** + * @Auther: yinzuomei + * @Date: 2020/3/30 16:18 + * @Description: + */ +public enum EpmetErrorCode { + CANNOT_JOIN_GROUP(8001, "只有认证居民才可以加入小组"), + CANNOT_CREATE_GROUP(8002, "只有党员和热心居民才能创建小组"), + GROUP_ALREADY_EXISTED(8003,"组名已存在"); + + private int value; + private String name; + + EpmetErrorCode(int value, String name) { + this.value = value; + this.name = name; + } + + public int getValue() { + return value; + } + + public void setValue(int value) { + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java index e04aab44f7..57e5717cda 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java @@ -24,7 +24,8 @@ public class GroupSummarizeResultDTO implements Serializable { private String groupHeadPhoto; /** - * 组长名称 + * 组长名称！！！！！！！！ + * 暂定街道-姓名 */ private String leaderName; @@ -54,7 +55,7 @@ public class GroupSummarizeResultDTO implements Serializable { private Integer totalApplyingMember; /** - * 群主标识leader,member成员 + * 当前用户对应的群主标识leader,member成员 */ private String leaderFlag; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java index 7e5e1f1a57..4e92c7bb3d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java @@ -177,4 +177,17 @@ public class ResiGroupController { resiUserInfoFormDTO.setCustomerId(customerId); return resiGroupService.initApplyGroup(resiUserInfoFormDTO); } + + /** + * @param tokenDto + * @param customerId + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 创建小组界面初始化 只有党员和热心居民才能创建小组 + * @Date 2020/3/30 15:44 + **/ + @PostMapping("initapplycreategroup") + public Result initApplyCreatedGroup(@LoginUser TokenDto tokenDto, @RequestParam("customerId") String customerId) { + return resiGroupService.initApplyCreatedGroup(tokenDto,customerId); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java index 4216affa22..bf67a9ebd5 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.group.entity.ResiGroupEntity; import com.epmet.resi.group.dto.group.form.*; import com.epmet.resi.group.dto.group.result.*; +import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -87,4 +88,22 @@ public interface ResiGroupDao extends BaseDao { * @Date 2020/3/29 17:55 **/ GroupSummarizeResultDTO selectGroupSummarize(GroupSummarizeFormDTO groupSummarizeFormDTO); + + /** + * @param groupId + * @return com.epmet.resi.group.dto.member.ResiGroupMemberDTO + * @Author yinzuomei + * @Description 根据组id组组长信息 + * @Date 2020/3/30 15:15 + **/ + ResiGroupMemberDTO selectGroupLeader(String groupId); + + /** + * @param applyCreateGroupFormDTO + * @return java.util.List + * @Author yinzuomei + * @Description 校验群名称是否存在 + * @Date 2020/3/30 16:03 + **/ + List checkResiGroupName(ApplyCreateGroupFormDTO applyCreateGroupFormDTO); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java index b54189a237..1f61dd8ae9 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java @@ -20,6 +20,7 @@ package com.epmet.modules.group.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.modules.group.entity.ResiGroupEntity; @@ -172,4 +173,14 @@ public interface ResiGroupService extends BaseService { * @Date 2020/3/30 10:17 **/ Result initApplyGroup(UserResiInfoFormDTO resiUserInfoFormDTO); + + /** + * @param tokenDto + * @param customerId + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 校验用户是否是热心居民或者党员 + * @Date 2020/3/30 15:50 + **/ + Result initApplyCreatedGroup(TokenDto tokenDto, String customerId); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 51dc8bdec1..b927b3102d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -22,7 +22,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; @@ -218,11 +220,37 @@ public class ResiGroupServiceImpl extends BaseServiceImpl().error(ModuleConstant.GETGROUPSUMMARIZE_FAILED); } - //群主名称需要调用feign查询 - groupSummarizeResultDTO.setLeaderName("测试"); + //获取组长信息 + Result groupLeaderUserInfo=this.getGroupLeaderUserInfo(groupSummarizeFormDTO.getGroupId()); + if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { + groupSummarizeResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName()); + } return new Result().ok(groupSummarizeResultDTO); } + /** + * @param groupId + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 根据组id查询组长信息 + * @Date 2020/3/30 15:07 + **/ + private Result getGroupLeaderUserInfo(String groupId) { + //群主名称需要调用feign查询 + ResiGroupEntity resiGroupEntity = baseDao.selectById(groupId); + if (null == resiGroupEntity) { + return new Result<>(); + } + ResiGroupMemberDTO groupMemberDTO = baseDao.selectGroupLeader(groupId); + if (null == groupMemberDTO) { + return new Result<>(); + } + UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO(); + resiUserInfoFormDTO.setCustomerId(resiGroupEntity.getCustomerId()); + resiUserInfoFormDTO.setUserId(groupMemberDTO.getCustomerUserId()); + return epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); + } + /** * @param applyCreateGroupFormDTO * @return com.epmet.commons.tools.utils.Result @@ -232,10 +260,18 @@ public class ResiGroupServiceImpl extends BaseServiceImpl resiGroupEntityList=this.getResiGroupEntityList(applyCreateGroupFormDTO); + if(null!=resiGroupEntityList&&resiGroupEntityList.size()>0){ + Result result=new Result(); + result.setCode(EpmetErrorCode.GROUP_ALREADY_EXISTED.getValue()); + result.setMsg(EpmetErrorCode.GROUP_ALREADY_EXISTED.getName()); + return result; + } + //2、插入一条待审核的组信息 ResiGroupEntity resiGroupEntity = this.structureResiGroupEntity(applyCreateGroupFormDTO); insert(resiGroupEntity); - //2、插入一条待审核的操作记录 + //3、插入一条待审核的操作记录 ResiGroupOperationDTO resiGroupOperation = new ResiGroupOperationDTO(); resiGroupOperation.setResiGroupId(resiGroupEntity.getId()); resiGroupOperation.setState(GroupStateConstant.GROUP_UNDER_AUDITTING); @@ -244,6 +280,18 @@ public class ResiGroupServiceImpl extends BaseServiceImpl + * @Author yinzuomei + * @Description 查询是否存在相同名字的群 + * @Date 2020/3/30 16:01 + **/ + private List getResiGroupEntityList(ApplyCreateGroupFormDTO applyCreateGroupFormDTO) { + List list = baseDao.checkResiGroupName(applyCreateGroupFormDTO); + return list; + } + /** * @param applyJoinGroupFormDTO * @return com.epmet.commons.tools.utils.Result @@ -253,14 +301,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); - if (!result.success() || null == result.getData()) { - return new Result().error(ModuleConstant.NOT_REGISTERED); - } - return new Result(); + if (StringUtils.isBlank(resiUserInfoFormDTO.getCustomerId())) { + return new Result().error(ModuleConstant.CUSTOMERID_NOT_NULL); + } + if (StringUtils.isBlank(resiUserInfoFormDTO.getUserId())) { + return new Result().error(ModuleConstant.USER_NOT_NULL); } - return new Result().error(ModuleConstant.USER_NOT_NULL); + Result result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); + if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) { + Result errorResult=new Result(); + result.setCode(EpmetErrorCode.CANNOT_JOIN_GROUP.getValue()); + result.setMsg(EpmetErrorCode.CANNOT_JOIN_GROUP.getName()); + return errorResult; + } + return new Result(); } private ResiGroupEntity structureResiGroupEntity(ApplyCreateGroupFormDTO applyCreateGroupFormDTO) { @@ -294,4 +351,23 @@ public class ResiGroupServiceImpl extends BaseServiceImpl + + + + + + diff --git a/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/UserEnterGridFormDTO.java b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/UserEnterGridFormDTO.java new file mode 100644 index 0000000000..21864bec1d --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/UserEnterGridFormDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description + * @ClassName UserEnterGridFormDTO + * @Author wangc + * @date 2020.03.30 10:09 + */ +@Data +public class UserEnterGridFormDTO implements Serializable{ + + private static final long serialVersionUID = 1L; + + @NotBlank(message = "客户Id不能为空") + private String customerId; + + @NotBlank(message = "网格Id不能为空") + private String gridId; + + +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java index e2a164c48f..e3e998fd78 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java @@ -6,8 +6,6 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.StrangerAccessRecordDTO; -import com.epmet.dto.form.CustomerGridListFormDTO; -import com.epmet.dto.result.CustomerGridForStrangerResultDTO; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java new file mode 100644 index 0000000000..bf19d03521 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java @@ -0,0 +1,33 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.UserEnterGridFormDTO; +import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description 用户引导Controller + * @ClassName UserGuideController + * @Author wangc + * @date 2020.03.30 09:34 + */ +@RestController +@RequestMapping("user") +public class UserGuideController { + + + @PostMapping("entergrid") + Result enterGrid(@LoginUser TokenDto token, @RequestBody UserEnterGridFormDTO userEnterGridFormDTO){ + + ValidatorUtils.validateEntity(userEnterGridFormDTO); + + return null; + } + +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java index b2d42505b3..6e0479fa9f 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java @@ -110,4 +110,6 @@ public interface StrangerAccessRecordService extends BaseService getGridHome(TokenDto tokenDTO, StrangerFormDTO formDTO); + + } diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java new file mode 100644 index 0000000000..d008450ade --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java @@ -0,0 +1,24 @@ +package com.epmet.service.impl; + +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.UserEnterGridFormDTO; +import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; +import com.epmet.service.UserAccessService; + +/** + * @Description + * @ClassName UserAccessServiceImpl + * @Author wangc + * @date 2020.03.30 14:05 + */ +public class UserAccessServiceImpl implements UserAccessService { + @Override + public Result enterGrid(TokenDto tokenDto, UserEnterGridFormDTO formDTO) { + + //TODO 加入不放行白名单 + + + return null; + } +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java index f101786268..b7a16ec445 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java @@ -103,4 +103,9 @@ public class UserResiInfoDTO implements Serializable { */ private Date updatedTime; -} \ No newline at end of file + /** + * 用户显示名称 + */ + private String showName; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EnterGridFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EnterGridFormDTO.java new file mode 100644 index 0000000000..254a19c0e8 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EnterGridFormDTO.java @@ -0,0 +1,29 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description + * @ClassName EnterGridFormDTO + * @Author wangc + * @date 2020.03.30 14:38 + */ + +@Data +public class EnterGridFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotBlank(message = "用户Id不能为空") + private String userId; + + @NotBlank(message = "客户Id不能为空") + private String customerId; + + @NotBlank(message = "网格Id不能为空") + private String gridId; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserRoleFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserRoleFormDTO.java new file mode 100644 index 0000000000..75340b75c5 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserRoleFormDTO.java @@ -0,0 +1,28 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description + * @ClassName UserRoleFormDTO + * @Author wangc + * @date 2020.03.30 15:26 + */ +@Data +public class UserRoleFormDTO implements Serializable{ + + private static final long serialVersionUID = 1L; + + @NotBlank(message = "用户Id不能为空") + private String userId; + + @NotBlank(message = "客户Id不能为空") + private String customerId; + + @NotBlank(message = "用户来源app不能为空") + private String app; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java new file mode 100644 index 0000000000..5bcfd548cc --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java @@ -0,0 +1,30 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @ClassName UserInfoOnEnterGridResultDTO + * @Author wangc + * @date 2020.03.30 14:40 + */ +@Data +public class UserInfoOnEnterGridResultDTO implements Serializable{ + private static final long serialVersionUID = 1L; + + private String currentCustomerId; + + private String currentGridId; + + private String currentGridName; + + private String nickname; + + private String userHeadPhoto; + + private List userRoleList; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserRoleResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserRoleResultDTO.java new file mode 100644 index 0000000000..11de4ed8c2 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserRoleResultDTO.java @@ -0,0 +1,28 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @ClassName UserRoleResultDTO + * @Author wangc + * @date 2020.03.30 15:29 + */ +@Data +public class UserRoleResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 角色名称 + * */ + private String roleName; + + /** + * 角色key值:normal_resi 、normal_resi 、 normal_resi + * */ + private String roleKey; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java index eed8b4b3a7..65e8b455fa 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java @@ -26,6 +26,8 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.RegisterRelationDTO; +import com.epmet.dto.form.EnterGridFormDTO; +import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; import com.epmet.excel.RegisterRelationExcel; import com.epmet.service.RegisterRelationService; import org.springframework.beans.factory.annotation.Autowired; @@ -91,4 +93,18 @@ public class RegisterRelationController { ExcelUtils.exportExcelToTarget(response, null, list, RegisterRelationExcel.class); } + /** + * @Description 在用户进入网格时查询用户的注册信息（且统计）以及角色列表 + * @Param enterGridFormDTO + * @return UserInfoOnEnterGridResultDTO + * @Author wangc + * @Date 2020.03.30 15:06 + **/ + @PostMapping("getuserinfoandroles") + public Result getUserInfoAndRoles(@RequestBody EnterGridFormDTO enterGridFormDTO){ + + ValidatorUtils.validateEntity(enterGridFormDTO); + + return registerRelationService.getUserInfoAndRoles(enterGridFormDTO); + } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java index 8abd9cb961..9ad160716a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java @@ -26,6 +26,8 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.UserRoleDTO; +import com.epmet.dto.form.UserRoleFormDTO; +import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.excel.UserRoleExcel; import com.epmet.service.UserRoleService; import org.springframework.beans.factory.annotation.Autowired; @@ -91,4 +93,19 @@ public class UserRoleController { ExcelUtils.exportExcelToTarget(response, null, list, UserRoleExcel.class); } + /** + * @Description 根据用户Id、来源app、客户Id查询用户角色 + * @Param userRoleFormDTO + * @return UserRoleResultDTO + * @Author wangc + * @Date 2020.03.30 15:35 + **/ + @PostMapping("getuserroleinfo") + public Result> getUserRoleInfo(@RequestBody UserRoleFormDTO userRoleFormDTO){ + + ValidatorUtils.validateEntity(userRoleFormDTO); + + return userRoleService.getUserRoleInfo(userRoleFormDTO); + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java index ca82e9ae48..0fac9314a9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java @@ -18,9 +18,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.UserRoleFormDTO; +import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.entity.UserRoleEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 用户角色关系表 * @@ -29,5 +33,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface UserRoleDao extends BaseDao { - + /** + * @Description 根据用户Id、来源app、客户Id查询用户角色 + * @Param userRoleFormDTO + * @return UserRoleResultDTO + * @Author wangc + * @Date 2020.03.30 15:35 + **/ + List getUserRoleInfo(UserRoleFormDTO userRoleFormDTO); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java index 7eb2f2d376..2ba4b0b66d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java @@ -19,7 +19,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; import com.epmet.dto.RegisterRelationDTO; +import com.epmet.dto.form.EnterGridFormDTO; +import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; import com.epmet.entity.RegisterRelationEntity; import java.util.List; @@ -92,4 +95,13 @@ public interface RegisterRelationService extends BaseService getUserInfoAndRoles(EnterGridFormDTO enterGridFormDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java index 877c2d0f52..525eda15a3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java @@ -19,7 +19,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserRoleDTO; +import com.epmet.dto.form.UserRoleFormDTO; +import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.entity.UserRoleEntity; import java.util.List; @@ -92,4 +95,14 @@ public interface UserRoleService extends BaseService { * @date 2020-03-30 */ void delete(String[] ids); + + /** + * @Description 根据用户Id、来源app、客户Id查询用户角色 + * @Param userRoleFormDTO + * @return UserRoleResultDTO + * @Author wangc + * @Date 2020.03.30 15:35 + **/ + Result> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index f2fdb3d3eb..5c5358527c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -23,8 +23,14 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.RegisterRelationDao; +import com.epmet.dao.UserResiInfoDao; +import com.epmet.dao.UserRoleDao; +import com.epmet.dao.UserWechatDao; import com.epmet.dto.RegisterRelationDTO; +import com.epmet.dto.form.EnterGridFormDTO; +import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; import com.epmet.entity.RegisterRelationEntity; import com.epmet.redis.RegisterRelationRedis; import com.epmet.service.RegisterRelationService; @@ -49,6 +55,15 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -101,4 +116,26 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl getUserInfoAndRoles(EnterGridFormDTO enterGridFormDTO) { + + //1.查找用户注册关系表，如果没有表示当前用户为陌生人(拉取用户微信表信息)，如果有表示当前用户已经进行居民认证 + + //2.根据居民认证的网格、客户进行统计 + + //3.去网格表中查询网格对应的名称 + + + + + return null; + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 999de6f549..2abb58c305 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -112,7 +112,11 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) { - UserResiInfoDTO userResiInfoDTO=baseDao.selectUserResiInfoDTO(userResiInfoFormDTO); + UserResiInfoDTO userResiInfoDTO = baseDao.selectUserResiInfoDTO(userResiInfoFormDTO); + if (null != userResiInfoDTO) { + String showName = userResiInfoDTO.getStreet() + "-" + userResiInfoDTO.getSurname() + userResiInfoDTO.getName(); + userResiInfoDTO.setShowName(showName); + } return new Result().ok(userResiInfoDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java index 28508b6652..c3926f71d0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java @@ -23,8 +23,11 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.UserRoleDao; import com.epmet.dto.UserRoleDTO; +import com.epmet.dto.form.UserRoleFormDTO; +import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.entity.UserRoleEntity; import com.epmet.redis.UserRoleRedis; import com.epmet.service.UserRoleService; @@ -101,4 +104,16 @@ public class UserRoleServiceImpl extends BaseServiceImpl> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) { + return new Result>().ok(baseDao.getUserRoleInfo(userRoleFormDTO)); + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml index 7ea5756844..5e8221dd5d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml @@ -17,4 +17,27 @@ + + + \ No newline at end of file