居民端-居民注册添加角色信息

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java

@@ -59,6 +59,7 @@ public class ResiRegisterServiceImpl implements ResiRegisterService {
             return new Result<ResiRegisterResultDTO>().error(ModuleConstant.PARAMETER_EXCEPTION);
         }
         formDTO.setUserId(tokenDTO.getUserId());
+        formDTO.setApp(tokenDTO.getApp());
         return epmetUserFeignClient.submit(formDTO);
     }
 

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

@@ -33,6 +33,11 @@ public class UserResiInfoDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+	/**
+	 * 政府端:gov、居民端:resi、运营端:oper
+	 */
+	private String app;
+
 	/**
 	 * 唯一标识
 	 */

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

@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.RoleDTO;
 import com.epmet.entity.RoleEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -30,4 +31,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface RoleDao extends BaseDao<RoleEntity> {
 
+    RoleDTO selectRoleByKey(RoleDTO roleDTO);
 }

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

@@ -47,7 +47,7 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	 * @Author sun
 	 * @Description 用户居民端注册信息表新增数据
 	 **/
-	void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO);
+	boolean saveUserResiInfo(UserResiInfoDTO userResiInfoDTO);
 
 	/**
 	 * @Author sun

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

@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.entity.UserRoleEntity;
@@ -42,4 +43,6 @@ public interface UserRoleDao extends BaseDao<UserRoleEntity> {
      **/
     List<UserRoleResultDTO> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
 
+    boolean saveResiRole(UserRoleDTO userRoleDTO);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserResiInfoRedis.java

@@ -17,6 +17,7 @@
 
 package com.epmet.redis;
 
+import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -44,4 +45,14 @@ public class UserResiInfoRedis {
         return null;
     }
 
+    public void setUserResiMobileCode(String userId, String mobile, String verificationCode){
+        String key = RedisKeys.getUserMobileCodeKey(userId, mobile, verificationCode);
+        redisUtils.set(key, verificationCode);
+    }
+
+    public String getUserResiMobileCode(String userId, String mobile, String verificationCode){
+        String key = RedisKeys.getUserMobileCodeKey(userId, mobile, verificationCode);
+        return (String) redisUtils.get(key);
+    }
+
 }

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

@@ -19,6 +19,7 @@ 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.RoleDTO;
 import com.epmet.entity.RoleEntity;
 
@@ -92,4 +93,6 @@ public interface RoleService extends BaseService<RoleEntity> {
      * @date 2020-03-30
      */
     void delete(String[] ids);
+
+    Result<RoleDTO> getRoleByKey(RoleDTO roleDTO);
 }

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

@@ -20,6 +20,7 @@ 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.UserResiInfoDTO;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
@@ -97,12 +98,18 @@ 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);
 
+    /**
+     * @Description 居民注册成功添加居民角色
+     * @Author sun
+     **/
+    Result saveResiRole(UserResiInfoDTO userResiInfoDTO);
+
 }

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

@@ -23,6 +23,7 @@ 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.RoleDao;
 import com.epmet.dto.RoleDTO;
 import com.epmet.entity.RoleEntity;
@@ -48,6 +49,8 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleDao, RoleEntity> implem
 
     @Autowired
     private RoleRedis roleRedis;
+    @Autowired
+    private RoleDao roleDao;
 
     @Override
     public PageData<RoleDTO> page(Map<String, Object> params) {
@@ -101,4 +104,9 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleDao, RoleEntity> implem
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public Result<RoleDTO> getRoleByKey(RoleDTO roleDTO) {
+        return new Result<RoleDTO>().ok(roleDao.selectRoleByKey(roleDTO));
+    }
+
 }

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

@@ -37,6 +37,7 @@ 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 +68,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) {
@@ -149,7 +152,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
             result.setMsg(UserResiRegisterConstant.MOBILECODE_EXCEPTION);
             return result;
         }
-		//3:校验成功 数据存入居民注册表 更新行为记录表数据
+        //3:校验成功 数据存入居民注册表 新增角色 更新行为记录表数据
         saveUserResiInfo(userResiInfoDTO);
         userResiRegisterVisitService.updateResiRegisterVisit(true, userResiInfoDTO);
         //4:居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
@@ -158,13 +161,14 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
     }
 
     /**
-	 * 居民注册信息表新增数据
+     * 居民注册信息表新增数据,角色表新增角色
      *
      * @param userResiInfoDTO
      * @Author sun
      */
     @Transactional(rollbackFor = Exception.class)
-	public void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO) {
+    public Result saveUserResiInfo(UserResiInfoDTO userResiInfoDTO) {
+        //1:注册信息表新增数据
         Date date = new Date();
         userResiInfoDTO.setId(IdWorker.get32UUID());
         userResiInfoDTO.setDelFlag(NumConstant.ZERO);
@@ -174,6 +178,9 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
         userResiInfoDTO.setUpdatedBy(userResiInfoDTO.getUserId());
         userResiInfoDTO.setUpdatedTime(date);
         userResiInfoDao.saveUserResiInfo(userResiInfoDTO);
+        //2:角色表新增角色数据
+        userRoleService.saveResiRole(userResiInfoDTO);
+        return new Result();
     }
 
     /**
@@ -193,8 +200,10 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
             return result;
         }
         //3:调用短信服务 生成验证码发送短信 TODO
+        String verificationCode = "TODO";
 
         //4:将验证码存入redis TODO
+        userResiInfoRedis.setUserResiMobileCode(verificationCodeFormDTO.getUserId(), verificationCodeFormDTO.getMobile(), verificationCode);
 
         return result;
     }

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

@@ -19,24 +19,33 @@ package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
+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.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.UserRoleDao;
+import com.epmet.dto.RoleDTO;
+import com.epmet.dto.UserResiInfoDTO;
 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 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;
 
@@ -49,8 +58,13 @@ import java.util.Map;
 @Service
 public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEntity> implements UserRoleService {
 
+    private static final Logger log = LoggerFactory.getLogger(UserRoleServiceImpl.class);
     @Autowired
     private UserRoleRedis userRoleRedis;
+    @Autowired
+    private RoleService roleService;
+    @Autowired
+    private UserRoleDao userRoleDao;
 
     @Override
     public PageData<UserRoleDTO> page(Map<String, Object> params) {
@@ -68,8 +82,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 +119,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 +130,33 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
         return new Result<List<UserRoleResultDTO>>().ok(baseDao.getUserRoleInfo(userRoleFormDTO));
     }
 
+    /**
+     * @Description 居民注册成功添加居民角色
+     * @Author sun
+     **/
+    @Override
+    public Result saveResiRole(UserResiInfoDTO userResiInfoDTO) {
+        //1:查询角色Id
+        RoleDTO roleDTO = new RoleDTO();
+        roleDTO.setApp(userResiInfoDTO.getApp());
+        roleDTO.setRoleKey(EpmetRoleKeyConstant.REGISTERED_RESI);
+        Result<RoleDTO> result = roleService.getRoleByKey(roleDTO);
+        RoleDTO role = result.getData();
+        //2:新增角色数据
+        UserRoleDTO userRoleDTO = new UserRoleDTO();
+        userRoleDTO.setCustomerId(userResiInfoDTO.getCustomerId());
+        userRoleDTO.setUserId(userResiInfoDTO.getUserId());
+        userRoleDTO.setRoleId(role.getId());
+        Date date = new Date();
+        userRoleDTO.setId(IdWorker.get32UUID());
+        userRoleDTO.setDelFlag(NumConstant.ZERO);
+        userRoleDTO.setRevision(NumConstant.ZERO);
+        userRoleDTO.setCreatedBy(userResiInfoDTO.getUserId());
+        userRoleDTO.setCreatedTime(date);
+        userRoleDTO.setUpdatedBy(userResiInfoDTO.getUserId());
+        userRoleDTO.setUpdatedTime(date);
+        userRoleDao.saveResiRole(userRoleDTO);
+        return new Result();
+    }
+
 }

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

@@ -16,5 +16,26 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <sql id="sql">
+        er.id AS "id",
+        er.app AS "app",
+        er.role_name AS "roleName",
+        er.role_key AS "roleKey",
+        er.del_flag AS "delflag",
+        er.revision AS "revision",
+        er.created_by AS "createdby",
+        er.created_time AS "createdtime",
+        er.updated_by AS "updatedby",
+        er.updated_time AS "updatedtime"
+    </sql>
+
+    <select id="selectRoleByKey" parameterType="com.epmet.dto.RoleDTO" resultType="com.epmet.dto.RoleDTO">
+        SELECT
+        <include refid="sql"></include>
+        FROM epmet_role er
+        WHERE er.del_flag = '0'
+        AND er.app = #{app}
+        AND er.role_key = #{roleKey}
+    </select>
 
 </mapper>

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

@@ -16,9 +16,35 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <insert id="saveResiRole" parameterType="com.epmet.dto.UserRoleDTO">
+        INSERT INTO user_role (
+            id,
+            customer_id,
+            user_id,
+            role_id,
+            del_flag,
+            revision,
+            created_by,
+            created_time,
+            updated_by,
+            updated_time
+        )VALUES(
+            #{id},
+            #{customerId},
+            #{userId},
+            #{roleId},
+            #{delFlag},
+            #{revision},
+            #{createdBy},
+            #{createdTime},
+            #{updatedBy},
+            #{updatedTime}
+        )
+    </insert>
 
 
-    <select id="getUserRoleInfo" parameterType="com.epmet.dto.form.UserRoleFormDTO" resultType="com.epmet.dto.result.UserRoleResultDTO" >
+    <select id="getUserRoleInfo" parameterType="com.epmet.dto.form.UserRoleFormDTO"
+            resultType="com.epmet.dto.result.UserRoleResultDTO">
 
         SELECT
         DISTINCT