认证成功后添加角色

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -11,7 +11,13 @@ public enum EpmetErrorCode {
 	GROUP_ALREADY_EXISTED(8003,"您的组名已存在，请重新修改"),
 	ALREADY_APPLIED_GROUP(8004,"该群已申请过，请耐心等待审核"),
 	ONLY_LEADER_CAN_INVITE(8005,"抱歉，只有群主才可以邀请新成员"),
-	LOSE_EFFICACY(8006,"链接已失效");
+	LOSE_EFFICACY(8006,"链接已失效"),
+
+	MOBILE_HAS_BEEN_USED(8101, "该手机已被使用，请更换手机或使用原绑定的微信用户登录"),
+	MOBILE_CODE_ERROR(8102, "手机验证码错误"),
+	AUTO_CONFIRM_FAILED(8103, "自动认证失败");
+
+
 
 	private int value;
 	private String name;

epmet-module/resi-partymember/resi-partymember-server/pom.xml

@@ -81,6 +81,12 @@
             <version>RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-user-server</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java

@@ -3,6 +3,7 @@ package com.epmet.modules.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiInfoDTO;
+import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -33,4 +34,13 @@ public interface EpmetUserFeignClient {
 	@PostMapping("/epmetuser/userresiinfo/saveResiInfo")
 	Result saveResiInfo (@RequestBody UserResiInfoDTO userResiInfoDTO);
 
+	/**
+	 * 添加用户角色关系
+	 *
+	 * @param userRoleDTO 参数
+	 * @return Result
+	 */
+	@PostMapping("/epmetuser/userrole/saveUserRole")
+	Result saveUserRole(@RequestBody UserRoleDTO userRoleDTO);
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiInfoDTO;
+import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
@@ -24,4 +25,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
 	public Result saveResiInfo(UserResiInfoDTO userResiInfoDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveResiInfo", userResiInfoDTO);
 	}
+
+	@Override
+	public Result saveUserRole(UserRoleDTO userRoleDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveUserRole", userRoleDTO);
+	}
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -1,9 +1,12 @@
 package com.epmet.modules.partymember.service.impl;
 
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.PartyMemberConstant;
+import com.epmet.constant.UserConstant;
 import com.epmet.dto.UserResiInfoDTO;
+import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.partymember.entity.*;
@@ -93,8 +96,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		PartymemberInfoDTO partyMemberInfoResult = partymemberInfoService.getPartyMemberInfoByMobile(partyMemberInfoParam);
 		if (null != partyMemberInfoResult) {
 			//TODO code待定
-			result.setCode(0);
-			result.setMsg("该手机已被使用，请更换手机或使用原绑定的微信用户登录");
+			result.setCode(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getValue());
+			result.setMsg(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getName());
 			return result;
 		}
 
@@ -123,8 +126,9 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null,
 					PartyMemberConstant.OPERATE_AUTO_FAILED);
 			//TODO code待定
-			result.setCode(0);
-			result.setMsg("验证码错误");
+			result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getValue());
+			result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getName());
+			return result;
 		}
 
 		//获取党员基本信息
@@ -142,18 +146,22 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			//将访问记录更新到热心居民申请行为记录表
 			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED);
 			//TODO code待定
-			result.setCode(0);
-			result.setMsg("认证失败");
+			result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getValue());
+			result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getName());
 		} else {
 			//自动认证成功
 			partyMemberInfoEntity.setConfirmResult("0");
 			partymemberInfoService.insert(partyMemberInfoEntity);
 			//将访问记录更新到热心居民申请行为记录表
 			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS);
+			//添加用户党员角色关系
+			UserRoleDTO userRole = new UserRoleDTO();
+			userRole.setUserId(partyMemberInfoDTO.getUserId());
+			userRole.setRoleKey(UserConstant.ROLE_PARTYMEMBER);
+			epmetUserFeignClient.saveUserRole(userRole);
 			//存入党员注册关系表  用于统计客户网格的认证党员数
 			saveRegisterRelation(partyMemberInfoDTO);
 		}
-		;
 
 		//将自动认证结果存入党员认证自动审核表
 		if (confirmAutoDTO != null) {
@@ -162,7 +170,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 					PartymemberConfirmAutoEntity.class));
 		}
 
-		//TODO 判断是否已注册居民，如果没有则注册居民
+		//判断是否已注册居民，如果没有则注册居民
 		isResiRegister(partyMemberInfoDTO);
 
 		return result;
@@ -201,11 +209,10 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		userResiInfoFormDTO.setUserId(partyMemberInfoDTO.getUserId());
 		Result<UserResiInfoDTO> userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
 		if (null == userResiInfoResult.getData()) {
-			//TODO 判断手机号是否可用
 			UserResiInfoDTO userResiInfoDTO = ConvertUtils.sourceToTarget(partyMemberInfoDTO, UserResiInfoDTO.class);
 			userResiInfoDTO.setRegMobile(partyMemberInfoDTO.getMobile());
+			userResiInfoDTO.setResiVisitId(partyMemberInfoDTO.getPartymemberVisitId());
 			epmetUserFeignClient.saveResiInfo(userResiInfoDTO);
-			//TODO 注册居民
 		}
 	}
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -53,6 +54,11 @@ public class UserRoleDTO implements Serializable {
      */
 	private String roleId;
 
+	/**
+	 * 角色Key值
+	 */
+	private String roleKey;
+
     /**
      * 删除标识：0.未删除 1.已删除
      */

epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java

@@ -10,27 +10,41 @@ public interface UserConstant {
 
 	/**
 	 * 政府端
-     * */
+	 */
 	String APP_GOV = "gov";
 
 	/**
 	 * 居民端
-     * */
+	 */
 	String APP_RESI = "resi";
 
 	/**
 	 * 运营端
-     * */
+	 */
 	String APP_OPER = "oper";
 
 	/**
 	 * PC端
-     * */
+	 */
 	String CLIENT_WEB = "web";
 
 	/**
 	 * 微信端
-     * */
+	 */
 	String CLIENT_WX = "wxmp";
 
+	/**
+	 * 居民角色
+	 */
+	String ROLE_RESI = "registered_resi";
+
+	/**
+	 * 热心居民角色
+	 */
+	String ROLE_WARMHEARTED = "warmhearted";
+
+	/**
+	 * 党员角色
+	 */
+	String ROLE_PARTYMEMBER = "partymember";
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java

@@ -52,19 +52,19 @@ public class UserRoleController {
 	private UserRoleService userRoleService;
 
 	@GetMapping("page")
-    public Result<PageData<UserRoleDTO>> page(@RequestParam Map<String, Object> params){
+	public Result<PageData<UserRoleDTO>> page(@RequestParam Map<String, Object> params) {
 		PageData<UserRoleDTO> page = userRoleService.page(params);
 		return new Result<PageData<UserRoleDTO>>().ok(page);
 	}
 
 	@GetMapping("{id}")
-    public Result<UserRoleDTO> get(@PathVariable("id") String id){
+	public Result<UserRoleDTO> get(@PathVariable("id") String id) {
 		UserRoleDTO data = userRoleService.get(id);
 		return new Result<UserRoleDTO>().ok(data);
 	}
 
 	@PostMapping
-    public Result save(@RequestBody UserRoleDTO dto){
+	public Result save(@RequestBody UserRoleDTO dto) {
 		//效验数据
 		ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
 		userRoleService.save(dto);
@@ -72,7 +72,7 @@ public class UserRoleController {
 	}
 
 	@PutMapping
-    public Result update(@RequestBody UserRoleDTO dto){
+	public Result update(@RequestBody UserRoleDTO dto) {
 		//效验数据
 		ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
 		userRoleService.update(dto);
@@ -80,7 +80,7 @@ public class UserRoleController {
 	}
 
 	@DeleteMapping
-    public Result delete(@RequestBody String[] ids){
+	public Result delete(@RequestBody String[] ids) {
 		//效验数据
 		AssertUtils.isArrayEmpty(ids, "id");
 		userRoleService.delete(ids);
@@ -94,18 +94,30 @@ public class UserRoleController {
 	}
 
 	/**
+	 * @return UserRoleResultDTO
 	 * @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){
+	public Result<List<UserRoleResultDTO>> getUserRoleInfo(@RequestBody UserRoleFormDTO userRoleFormDTO) {
 
 		ValidatorUtils.validateEntity(userRoleFormDTO);
 
 		return userRoleService.getUserRoleInfo(userRoleFormDTO);
 	}
 
+	/**
+	 * 添加用户角色关系
+	 *
+	 * @param userRoleDTO 参数
+	 * @return Result
+	 */
+	@PostMapping("saveUserRole")
+	public Result saveUserRole(@RequestBody UserRoleDTO userRoleDTO) {
+		return userRoleService.saveUserRole(userRoleDTO);
+	}
+
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java

@@ -30,4 +30,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface RoleDao extends BaseDao<RoleEntity> {
 
+	/**
+	 * 根据key值获取权限信息
+	 *
+	 * @param param 参数
+	 * @return RoleEntity
+	 */
+	RoleEntity selectRoleByKey(RoleEntity param);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/RoleService.java

@@ -92,4 +92,11 @@ public interface RoleService extends BaseService<RoleEntity> {
      * @date 2020-03-30
      */
     void delete(String[] ids);
+
+    /**
+     * 根据key获取role信息
+     * @param role
+     * @return RoleDTO
+     */
+    RoleDTO getRoleByKey(RoleDTO role);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java

@@ -97,12 +97,20 @@ public interface UserRoleService extends BaseService<UserRoleEntity> {
 	void delete(String[] ids);
 
 	/**
+	 * @return UserRoleResultDTO
 	 * @Description 根据用户Id、来源app、客户Id查询用户角色
 	 * @Param userRoleFormDTO
-     * @return UserRoleResultDTO
 	 * @Author wangc
 	 * @Date 2020.03.30 15:35
 	 **/
 	Result<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
 
+	/**
+	 * 添加用户角色关系
+	 *
+	 * @param userRoleDTO 参数
+	 * @return Result
+	 */
+	Result saveUserRole(UserRoleDTO userRoleDTO);
+
 }

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

@@ -101,4 +101,10 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleDao, RoleEntity> implem
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public RoleDTO getRoleByKey(RoleDTO role) {
+        RoleEntity entity = baseDao.selectRoleByKey(ConvertUtils.sourceToTarget(role, RoleEntity.class));
+        return ConvertUtils.sourceToTarget(entity, RoleDTO.class);
+    }
+
 }

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

@@ -26,17 +26,19 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.UserConstant;
 import com.epmet.constant.UserResiRegisterConstant;
 import com.epmet.dao.UserResiInfoDao;
 import com.epmet.dto.UserResiInfoDTO;
+import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.VerificationCodeFormDTO;
 import com.epmet.entity.UserResiInfoEntity;
-import com.epmet.entity.UserResiRegisterVisitEntity;
 import com.epmet.redis.UserResiInfoRedis;
 import com.epmet.service.RegisterRelationService;
 import com.epmet.service.UserResiInfoService;
 import com.epmet.service.UserResiRegisterVisitService;
+import com.epmet.service.UserRoleService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -67,6 +69,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	private UserResiInfoDao userResiInfoDao;
 	@Autowired
 	private RegisterRelationService registerRelationService;
+	@Autowired
+	private UserRoleService userRoleService;
 
 	@Override
 	public PageData<UserResiInfoDTO> page(Map<String, Object> params) {
@@ -205,20 +209,15 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 
 		//判断手机号是否可用
 		if (getResiInfoByMobile(userResiInfoDTO.getRegMobile())) {
-            UserResiRegisterVisitEntity visitEntity = new UserResiRegisterVisitEntity();
-            visitEntity.setCustomerId(userResiInfoDTO.getCustomerId());
-            visitEntity.setGridId(userResiInfoDTO.getGridId());
-            visitEntity.setUserId(userResiInfoDTO.getUserId());
-            visitEntity.setLastOperateVisit(UserResiRegisterConstant.SUCCESS);
-            //TODO
-            visitEntity.setVisitFrom("党员认证");
-            visitEntity.setVisitTime(new Date());
-            userResiRegisterVisitService.insert(visitEntity);
 			//数据存入居民注册表
-			userResiInfoDTO.setResiVisitId(visitEntity.getId());
 			saveUserResiInfo(userResiInfoDTO);
-            //4:居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
+			//居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
 			registerRelationService.saveRegisterRelation(userResiInfoDTO);
+			//将用户于居民角色关联
+			UserRoleDTO userRole = new UserRoleDTO();
+			userRole.setUserId(userResiInfoDTO.getUserId());
+			userRole.setRoleKey(UserConstant.ROLE_RESI);
+			userRoleService.saveUserRole(userRole);
 		}
 
 		return result;

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

@@ -24,12 +24,15 @@ 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.constant.UserConstant;
 import com.epmet.dao.UserRoleDao;
+import com.epmet.dto.RoleDTO;
 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.RoleService;
 import com.epmet.service.UserRoleService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +54,8 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
 
 	@Autowired
 	private UserRoleRedis userRoleRedis;
+	@Autowired
+	private RoleService roleService;
 
 	@Override
 	public PageData<UserRoleDTO> page(Map<String, Object> params) {
@@ -68,8 +73,8 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
 		return ConvertUtils.sourceToTarget(entityList, UserRoleDTO.class);
 	}
 
-    private QueryWrapper<UserRoleEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+	private QueryWrapper<UserRoleEntity> getWrapper(Map<String, Object> params) {
+		String id = (String) params.get(FieldConstant.ID_HUMP);
 
 		QueryWrapper<UserRoleEntity> wrapper = new QueryWrapper<>();
 		wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -105,9 +110,9 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
 	}
 
 	/**
+	 * @return UserRoleResultDTO
 	 * @Description 根据用户Id、来源app、客户Id查询用户角色
 	 * @Param userRoleFormDTO
-     * @return UserRoleResultDTO
 	 * @Author wangc
 	 * @Date 2020.03.30 15:35
 	 **/
@@ -116,4 +121,16 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
 		return new Result<List<UserRoleResultDTO>>().ok(baseDao.getUserRoleInfo(userRoleFormDTO));
 	}
 
+	@Override
+	public Result saveUserRole(UserRoleDTO userRoleDTO) {
+		//获取角色ID
+		RoleDTO roleDTO = new RoleDTO();
+		roleDTO.setApp(UserConstant.APP_RESI);
+		roleDTO.setRoleKey(userRoleDTO.getRoleKey());
+		RoleDTO role = roleService.getRoleByKey(roleDTO);
+		userRoleDTO.setRoleId(role.getId());
+		baseDao.insert(ConvertUtils.sourceToTarget(userRoleDTO, UserRoleEntity.class));
+		return new Result();
+	}
+
 }

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

@@ -15,6 +15,18 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="selectRoleByKey" resultType="com.epmet.entity.RoleEntity"
+            parameterType="com.epmet.entity.RoleEntity">
+        select
+               ID,
+               APP,
+               ROLE_NAME,
+               ROLE_KEY
+        from epmet_user.epmet_role
+        where APP = #{app}
+            and ROLE_KEY = #{roleKey}
+            and DEL_FLAG = 0
+    </select>
 
 
 </mapper>