Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2

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;
+	}
+}

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;
 }

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);
+	}
 }

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<ResiGroupEntity> {
 	 * @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<com.epmet.modules.group.entity.ResiGroupEntity>
+	 * @Author yinzuomei
+	 * @Description 校验群名称是否存在
+	 * @Date 2020/3/30 16:03
+	 **/
+	List<ResiGroupEntity> checkResiGroupName(ApplyCreateGroupFormDTO applyCreateGroupFormDTO);
 }

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<ResiGroupEntity> {
 	 * @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);
 }

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<ResiGroupDao, ResiGrou
 		if (null != groupSummarizeResultDTO) {
 			return new Result<GroupSummarizeResultDTO>().error(ModuleConstant.GETGROUPSUMMARIZE_FAILED);
 		}
-		//群主名称需要调用feign查询
-		groupSummarizeResultDTO.setLeaderName("测试");
+		//获取组长信息
+		Result<UserResiInfoDTO> groupLeaderUserInfo=this.getGroupLeaderUserInfo(groupSummarizeFormDTO.getGroupId());
+		if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
+			groupSummarizeResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName());
+		}
 		return new Result<GroupSummarizeResultDTO>().ok(groupSummarizeResultDTO);
 	}
 
+	/**
+	 * @param groupId
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.UserResiInfoDTO>
+	 * @Author yinzuomei
+	 * @Description 根据组id查询组长信息
+	 * @Date 2020/3/30 15:07
+	 **/
+	private Result<UserResiInfoDTO> 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<ResiGroupDao, ResiGrou
 	 **/
 	@Override
 	public Result applyCreateGroup(ApplyCreateGroupFormDTO applyCreateGroupFormDTO) {
-		//1、插入一条待审核的组信息
+		//1、校验是否同名
+		List<ResiGroupEntity> 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<ResiGroupDao, ResiGrou
 		return new Result();
 	}
 
+	/**
+	 * @param applyCreateGroupFormDTO
+	 * @return java.util.List<com.epmet.modules.group.entity.ResiGroupEntity>
+	 * @Author yinzuomei
+	 * @Description 查询是否存在相同名字的群
+	 * @Date 2020/3/30 16:01
+	 **/
+	private List<ResiGroupEntity> getResiGroupEntityList(ApplyCreateGroupFormDTO applyCreateGroupFormDTO) {
+		List<ResiGroupEntity> list = baseDao.checkResiGroupName(applyCreateGroupFormDTO);
+		return list;
+	}
+
 	/**
 	 * @param applyJoinGroupFormDTO
 	 * @return com.epmet.commons.tools.utils.Result
@@ -253,14 +301,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 **/
 	@Override
 	public Result applyJoinGroup(ApplyJoinGroupFormDTO applyJoinGroupFormDTO) {
-		ResiGroupDTO resiGroupDTO = this.get(applyJoinGroupFormDTO.getGroupId());
-		if (null == resiGroupDTO) {
-			return new Result().error(ModuleConstant.QUERY_GROUPINFO_FAILED);
-		}
 		//插入一条待审核的记录
 		GroupMemeberOperationDTO groupMemeberOperation = new GroupMemeberOperationDTO();
-		groupMemeberOperation.setGroupId(resiGroupDTO.getId());
-		groupMemeberOperation.setCustomerUserId(resiGroupDTO.getCustomerId());
+		groupMemeberOperation.setGroupId(applyJoinGroupFormDTO.getGroupId());
+		groupMemeberOperation.setCustomerUserId(applyJoinGroupFormDTO.getUserId());
 		groupMemeberOperation.setGroupId(applyJoinGroupFormDTO.getGroupId());
 		groupMemeberOperation.setOperateDes(applyJoinGroupFormDTO.getOperateDes());
 		groupMemeberOperation.setOperateStatus(MemberStateConstant.UNDER_AUDITTING);
@@ -270,16 +314,29 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		return new Result();
 	}
 
+	/**
+	 * @param resiUserInfoFormDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @Author yinzuomei
+	 * @Description 加入小组界面初始化
+	 * @Date 2020/3/30 10:17
+	 **/
 	@Override
 	public Result initApplyGroup(UserResiInfoFormDTO resiUserInfoFormDTO) {
-		if (StringUtils.isNotBlank(resiUserInfoFormDTO.getUserId()) && StringUtils.isNotBlank(resiUserInfoFormDTO.getCustomerId())) {
-			Result<UserResiInfoDTO> 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<UserResiInfoDTO> 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<ResiGroupDao, ResiGrou
 		return resiGroupEntity;
 	}
 
+	/**
+	 * @param tokenDto
+	 * @param customerId
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @Author yinzuomei
+	 * @Description 校验用户是否是热心居民或者党员
+	 * @Date 2020/3/30 15:50
+	 **/
+	@Override
+	public Result initApplyCreatedGroup(TokenDto tokenDto, String customerId) {
+		if (StringUtils.isBlank(customerId)) {
+			return new Result().error(ModuleConstant.CUSTOMERID_NOT_NULL);
+		}
+		if (null == tokenDto || StringUtils.isBlank(tokenDto.getUserId())) {
+			return new Result().error(ModuleConstant.USER_NOT_NULL);
+		}
+
+		return null;
+	}
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java

@@ -64,7 +64,7 @@ public interface ModuleConstant extends Constant {
 	String QUERY_GROUPINFO_FAILED="查询组信息失败";
 
 	/**
-	 * 申请加入小组时，需要根据groupId查询组信息
+	 * customerId不能为空
 	 */
-	String NOT_REGISTERED="为注册的居民不能加入小组";
+	String CUSTOMERID_NOT_NULL="客户id不能为空";
 }

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@@ -157,4 +157,35 @@
             AND rgs.DEL_FLAG = '0'
             and rg.id=#{groupId}
     </select>
+
+    <!--  根据组信息查询组张信息  -->
+    <select id="selectGroupLeader" parameterType="java.lang.String" resultType="com.epmet.resi.group.dto.member.ResiGroupMemberDTO">
+        SELECT
+            *
+        FROM
+            resi_group_member rgm
+        WHERE
+            rgm.DEL_FLAG = '0'
+            AND rgm.GROUP_LEADER_FLAG = 'leader'
+            AND rgm.RESI_GROUP_ID = #{groupId}
+    </select>
+
+    <!--  校验群名称是否存在  -->
+    <select id="checkResiGroupName" parameterType="com.epmet.resi.group.dto.group.form.ApplyCreateGroupFormDTO"
+            resultType="com.epmet.modules.group.entity.ResiGroupEntity">
+        SELECT
+            rg.*
+        FROM
+            resi_group rg
+            LEFT JOIN resi_group_member rgm ON ( rg.id = rgm.RESI_GROUP_ID )
+        WHERE
+            rg.DEL_FLAG = '0'
+            AND rgm.DEL_FLAG = '0'
+            AND rgm.GROUP_LEADER_FLAG = 'leader'
+            AND rgm.CUSTOMER_USER_ID = #{userId}
+            AND rg.GROUP_NAME = #{groupName}
+            AND rg.CUSTOMER_ID = #{customerId}
+            AND rg.GRID_ID = #{gridId}
+            AND rg.STATE in('approved','under_auditting')
+    </select>
 </mapper>

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;
+
+
+}

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;

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<UserInfoOnEnterGridResultDTO> enterGrid(@LoginUser TokenDto token, @RequestBody UserEnterGridFormDTO userEnterGridFormDTO){
+
+        ValidatorUtils.validateEntity(userEnterGridFormDTO);
+
+        return null;
+    }
+
+}

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java

@@ -110,4 +110,6 @@ public interface StrangerAccessRecordService extends BaseService<StrangerAccessR
      * @author sun
      */
     Result<HomeDesignByCustomerResultDTO> getGridHome(TokenDto tokenDTO, StrangerFormDTO formDTO);
+
+
 }

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<UserInfoOnEnterGridResultDTO> enterGrid(TokenDto tokenDto, UserEnterGridFormDTO formDTO) {
+
+        //TODO  加入不放行白名单
+
+
+        return null;
+    }
+}

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;
 
-}
+	/**
+	 * 用户显示名称
+	 */
+	private String showName;
+
+}

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;
+
+}

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;
+
+}

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<String> userRoleList;
+
+}

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;
+
+}

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<UserInfoOnEnterGridResultDTO> getUserInfoAndRoles(@RequestBody EnterGridFormDTO enterGridFormDTO){
+
+        ValidatorUtils.validateEntity(enterGridFormDTO);
+
+        return registerRelationService.getUserInfoAndRoles(enterGridFormDTO);
+    }
 }

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<List<UserRoleResultDTO>> getUserRoleInfo(@RequestBody UserRoleFormDTO userRoleFormDTO){
+
+        ValidatorUtils.validateEntity(userRoleFormDTO);
+
+        return userRoleService.getUserRoleInfo(userRoleFormDTO);
+    }
+
 }

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<UserRoleEntity> {
-	
+    /**
+     * @Description 根据用户Id、来源app、客户Id查询用户角色
+     * @Param userRoleFormDTO
+     * @return UserRoleResultDTO
+     * @Author wangc
+     * @Date 2020.03.30 15:35
+     **/
+    List<UserRoleResultDTO> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
+
 }

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<RegisterRelationEnt
      * @date 2020-03-30
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 在用户进入网格时查询用户的注册信息（且统计）以及角色列表
+     * @Param enterGridFormDTO
+     * @return UserInfoOnEnterGridResultDTO
+     * @Author wangc
+     * @Date 2020.03.30 15:06
+     **/
+    Result<UserInfoOnEnterGridResultDTO> getUserInfoAndRoles(EnterGridFormDTO enterGridFormDTO);
 }

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<UserRoleEntity> {
      * @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<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
+
 }

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<RegisterRelatio
     @Autowired
     private RegisterRelationRedis registerRelationRedis;
 
+    @Autowired
+    private UserWechatDao userWechatDao;
+
+    @Autowired
+    private UserResiInfoDao userResiInfoDao;
+
+    @Autowired
+    private UserRoleDao userRoleDao;
+
     @Override
     public PageData<RegisterRelationDTO> page(Map<String, Object> params) {
         IPage<RegisterRelationEntity> page = baseDao.selectPage(
@@ -101,4 +116,26 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Description 在用户进入网格时查询用户的注册信息（且统计）以及角色列表
+     * @Param enterGridFormDTO
+     * @return UserInfoOnEnterGridResultDTO
+     * @Author wangc
+     * @Date 2020.03.30 15:06
+     **/
+    @Override
+    public Result<UserInfoOnEnterGridResultDTO> getUserInfoAndRoles(EnterGridFormDTO enterGridFormDTO) {
+
+        //1.查找用户注册关系表，如果没有表示当前用户为陌生人(拉取用户微信表信息)，如果有表示当前用户已经进行居民认证
+
+        //2.根据居民认证的网格、客户进行统计
+
+        //3.去网格表中查询网格对应的名称
+
+
+
+
+        return null;
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

@@ -112,7 +112,11 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
      **/
     @Override
     public Result<UserResiInfoDTO> 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<UserResiInfoDTO>().ok(userResiInfoDTO);
     }
 

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<UserRoleDao, UserRoleEn
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Description 根据用户Id、来源app、客户Id查询用户角色
+     * @Param userRoleFormDTO
+     * @return UserRoleResultDTO
+     * @Author wangc
+     * @Date 2020.03.30 15:35
+     **/
+    @Override
+    public Result<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) {
+        return new Result<List<UserRoleResultDTO>>().ok(baseDao.getUserRoleInfo(userRoleFormDTO));
+    }
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml

@@ -17,4 +17,27 @@
     </resultMap>
 
 
+
+    <select id="getUserRoleInfo" parameterType="com.epmet.dto.form.UserRoleFormDTO" resultType="com.epmet.dto.result.UserRoleResultDTO" >
+
+    SELECT
+        er.ROLE_NAME,
+        er.ROLE_KEY
+    FROM
+        USER_ROLE ur
+        JOIN EPMET_ROLE er ON ur.ROLE_ID = er.ID
+
+    WHERE
+        er.APP = #{app}
+    AND
+        ur.CUSTOMER_ID = #{customerId}
+    AND
+        ur.USER_ID = #{userId}
+    AND
+        er.DEL_FLAG = 0
+    AND
+        ur.DEL_FLAG = 0
+
+    </select>
+
 </mapper>