diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java index d4488e08de..de4cbcb0a6 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java +++ b/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().error(ModuleConstant.PARAMETER_EXCEPTION); } formDTO.setUserId(tokenDTO.getUserId()); + formDTO.setApp(tokenDTO.getApp()); return epmetUserFeignClient.submit(formDTO); } 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 b3d79d599e..eb38891968 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 @@ -33,6 +33,11 @@ public class UserResiInfoDTO implements Serializable { private static final long serialVersionUID = 1L; + /** + * 政府端:gov、居民端:resi、运营端:oper + */ + private String app; + /** * 唯一标识 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java index c6a70243e7..3cd8be4b76 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java +++ b/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; @@ -29,5 +30,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface RoleDao extends BaseDao { - + + RoleDTO selectRoleByKey(RoleDTO roleDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java index 478f58a4e4..401de633bd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java @@ -47,7 +47,7 @@ public interface UserResiInfoDao extends BaseDao { * @Author sun * @Description 用户居民端注册信息表新增数据 **/ - void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO); + boolean saveUserResiInfo(UserResiInfoDTO userResiInfoDTO); /** * @Author sun 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 0fac9314a9..33a3974f41 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,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 { **/ List getUserRoleInfo(UserRoleFormDTO userRoleFormDTO); + boolean saveResiRole(UserRoleDTO userRoleDTO); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserResiInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserResiInfoRedis.java index 5906451782..36a7846604 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserResiInfoRedis.java +++ b/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); + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RoleService.java index b68154234c..16a9bc1bc0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RoleService.java +++ b/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 { * @date 2020-03-30 */ void delete(String[] ids); + + Result getRoleByKey(RoleDTO roleDTO); } \ 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 525eda15a3..db55bb52ed 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 @@ -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; @@ -29,7 +30,7 @@ import java.util.List; import java.util.Map; /** - * 用户角色关系表 + * 用户角色关系表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-30 @@ -97,12 +98,18 @@ public interface UserRoleService extends BaseService { void delete(String[] ids); /** + * @return UserRoleResultDTO * @Description 根据用户Id、来源app、客户Id查询用户角色 * @Param userRoleFormDTO - * @return UserRoleResultDTO * @Author wangc * @Date 2020.03.30 15:35 **/ Result> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO); + /** + * @Description 居民注册成功添加居民角色 + * @Author sun + **/ + Result saveResiRole(UserResiInfoDTO userResiInfoDTO); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java index ad9366c4e9..f70677447d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java +++ b/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 implem @Autowired private RoleRedis roleRedis; + @Autowired + private RoleDao roleDao; @Override public PageData page(Map params) { @@ -101,4 +104,9 @@ public class RoleServiceImpl extends BaseServiceImpl implem baseDao.deleteBatchIds(Arrays.asList(ids)); } + @Override + public Result getRoleByKey(RoleDTO roleDTO) { + return new Result().ok(roleDao.selectRoleByKey(roleDTO)); + } + } \ 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 57e95af9ae..f37ff1ffd6 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 @@ -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; @@ -58,153 +59,161 @@ import java.util.Map; @Service public class UserResiInfoServiceImpl extends BaseServiceImpl implements UserResiInfoService { - private static final Logger log = LoggerFactory.getLogger(UserResiInfoServiceImpl.class); - @Autowired - private UserResiInfoRedis userResiInfoRedis; - @Autowired - private UserResiRegisterVisitService userResiRegisterVisitService; - @Autowired - private UserResiInfoDao userResiInfoDao; - @Autowired - private RegisterRelationService registerRelationService; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, UserResiInfoDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, UserResiInfoDTO.class); - } - - private QueryWrapper getWrapper(Map params) { - String id = (String) params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public UserResiInfoDTO get(String id) { - UserResiInfoEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, UserResiInfoDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(UserResiInfoDTO dto) { - UserResiInfoEntity entity = ConvertUtils.sourceToTarget(dto, UserResiInfoEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(UserResiInfoDTO dto) { - UserResiInfoEntity entity = ConvertUtils.sourceToTarget(dto, UserResiInfoEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - /** - * @param userResiInfoFormDTO - * @return com.epmet.commons.tools.utils.Result - * @Author yinzuomei - * @Description 查询用户注册信息 - * @Date 2020/3/30 11:07 - **/ - @Override - public Result getUserResiInfoDTO(UserResiInfoFormDTO 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); - } - - @Override - public Result submit(UserResiInfoDTO userResiInfoDTO) { - Result result = new Result(); - //1:手机验证码数据校验//TODO - - //2:验证码校验失败则更新行为记录表数据 返回前台结果 - if (false) { - userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO); - result.error(UserResiRegisterConstant.PARAMETER_ERROR); - result.setMsg(UserResiRegisterConstant.MOBILECODE_EXCEPTION); - return result; - } - //3:校验成功 数据存入居民注册表 更新行为记录表数据 - saveUserResiInfo(userResiInfoDTO); - userResiRegisterVisitService.updateResiRegisterVisit(true, userResiInfoDTO); - //4:居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一 - registerRelationService.saveRegisterRelation(userResiInfoDTO); - return result; - } - - /** - * 居民注册信息表新增数据 - * - * @param userResiInfoDTO - * @Author sun - */ - @Transactional(rollbackFor = Exception.class) - public void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO) { - Date date = new Date(); - userResiInfoDTO.setId(IdWorker.get32UUID()); - userResiInfoDTO.setDelFlag(NumConstant.ZERO); - userResiInfoDTO.setRevision(NumConstant.ZERO); - userResiInfoDTO.setCreatedBy(userResiInfoDTO.getUserId()); - userResiInfoDTO.setCreatedTime(date); - userResiInfoDTO.setUpdatedBy(userResiInfoDTO.getUserId()); - userResiInfoDTO.setUpdatedTime(date); - userResiInfoDao.saveUserResiInfo(userResiInfoDTO); - } - - /** - * @param verificationCodeFormDTO - * @Author sun - * @Description 居民端-居民注册根据手机号获取验证码 - **/ - @Override - public Result getVerificationCode(VerificationCodeFormDTO verificationCodeFormDTO) { - Result result = new Result(); - //1:更新居民注册访问记录表数据 - userResiRegisterVisitService.updateResiVisitOperate(verificationCodeFormDTO); - //2:判断手机号是否可用 - if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile())) { - result.error(UserResiRegisterConstant.PARAMETER_ERROR); - result.setMsg(UserResiRegisterConstant.MOBILE_EXIST); - return result; - } - //3:调用短信服务 生成验证码发送短信 TODO - - //4:将验证码存入redis TODO - - return result; - } - - @Override - public Result saveResiInfo(UserResiInfoDTO userResiInfoDTO) { - Result result = new Result(); - - //判断手机号是否可用 - if (getResiInfoByMobile(userResiInfoDTO.getRegMobile())) { + private static final Logger log = LoggerFactory.getLogger(UserResiInfoServiceImpl.class); + @Autowired + private UserResiInfoRedis userResiInfoRedis; + @Autowired + private UserResiRegisterVisitService userResiRegisterVisitService; + @Autowired + private UserResiInfoDao userResiInfoDao; + @Autowired + private RegisterRelationService registerRelationService; + @Autowired + private UserRoleService userRoleService; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, UserResiInfoDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, UserResiInfoDTO.class); + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public UserResiInfoDTO get(String id) { + UserResiInfoEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, UserResiInfoDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(UserResiInfoDTO dto) { + UserResiInfoEntity entity = ConvertUtils.sourceToTarget(dto, UserResiInfoEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(UserResiInfoDTO dto) { + UserResiInfoEntity entity = ConvertUtils.sourceToTarget(dto, UserResiInfoEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * @param userResiInfoFormDTO + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 查询用户注册信息 + * @Date 2020/3/30 11:07 + **/ + @Override + public Result getUserResiInfoDTO(UserResiInfoFormDTO 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); + } + + @Override + public Result submit(UserResiInfoDTO userResiInfoDTO) { + Result result = new Result(); + //1:手机验证码数据校验//TODO + + //2:验证码校验失败则更新行为记录表数据 返回前台结果 + if (false) { + userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO); + result.error(UserResiRegisterConstant.PARAMETER_ERROR); + result.setMsg(UserResiRegisterConstant.MOBILECODE_EXCEPTION); + return result; + } + //3:校验成功 数据存入居民注册表 新增角色 更新行为记录表数据 + saveUserResiInfo(userResiInfoDTO); + userResiRegisterVisitService.updateResiRegisterVisit(true, userResiInfoDTO); + //4:居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一 + registerRelationService.saveRegisterRelation(userResiInfoDTO); + return result; + } + + /** + * 居民注册信息表新增数据,角色表新增角色 + * + * @param userResiInfoDTO + * @Author sun + */ + @Transactional(rollbackFor = Exception.class) + public Result saveUserResiInfo(UserResiInfoDTO userResiInfoDTO) { + //1:注册信息表新增数据 + Date date = new Date(); + userResiInfoDTO.setId(IdWorker.get32UUID()); + userResiInfoDTO.setDelFlag(NumConstant.ZERO); + userResiInfoDTO.setRevision(NumConstant.ZERO); + userResiInfoDTO.setCreatedBy(userResiInfoDTO.getUserId()); + userResiInfoDTO.setCreatedTime(date); + userResiInfoDTO.setUpdatedBy(userResiInfoDTO.getUserId()); + userResiInfoDTO.setUpdatedTime(date); + userResiInfoDao.saveUserResiInfo(userResiInfoDTO); + //2:角色表新增角色数据 + userRoleService.saveResiRole(userResiInfoDTO); + return new Result(); + } + + /** + * @param verificationCodeFormDTO + * @Author sun + * @Description 居民端-居民注册根据手机号获取验证码 + **/ + @Override + public Result getVerificationCode(VerificationCodeFormDTO verificationCodeFormDTO) { + Result result = new Result(); + //1:更新居民注册访问记录表数据 + userResiRegisterVisitService.updateResiVisitOperate(verificationCodeFormDTO); + //2:判断手机号是否可用 + if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile())) { + result.error(UserResiRegisterConstant.PARAMETER_ERROR); + result.setMsg(UserResiRegisterConstant.MOBILE_EXIST); + return result; + } + //3:调用短信服务 生成验证码发送短信 TODO + String verificationCode = "TODO"; + + //4:将验证码存入redis TODO + userResiInfoRedis.setUserResiMobileCode(verificationCodeFormDTO.getUserId(), verificationCodeFormDTO.getMobile(), verificationCode); + + return result; + } + + @Override + public Result saveResiInfo(UserResiInfoDTO userResiInfoDTO) { + Result result = new Result(); + + //判断手机号是否可用 + if (getResiInfoByMobile(userResiInfoDTO.getRegMobile())) { UserResiRegisterVisitEntity visitEntity = new UserResiRegisterVisitEntity(); visitEntity.setCustomerId(userResiInfoDTO.getCustomerId()); visitEntity.setGridId(userResiInfoDTO.getGridId()); @@ -215,30 +224,30 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl list = userResiInfoDao.selectResiInfoByMobile(mobile); - if (list.size() > 0) { - bl = false; - } - return bl; - } + } + + return result; + } + + /** + * 判断手机号是否可用-根据手机号查询居民注册信息(user_resi_info)表数据 + * + * @param mobile + * @return + * @Author sun + */ + private Boolean getResiInfoByMobile(String mobile) { + Boolean bl = true; + + List list = userResiInfoDao.selectResiInfoByMobile(mobile); + if (list.size() > 0) { + bl = false; + } + return bl; + } } 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 c3926f71d0..066962ff65 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 @@ -19,29 +19,38 @@ 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; /** - * 用户角色关系表 + * 用户角色关系表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-30 @@ -49,8 +58,13 @@ import java.util.Map; @Service public class UserRoleServiceImpl extends BaseServiceImpl 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 page(Map params) { @@ -68,8 +82,8 @@ public class UserRoleServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -105,9 +119,9 @@ public class UserRoleServiceImpl extends BaseServiceImpl>().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 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(); + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml index 7dc2a737a2..5249bfce41 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml @@ -16,5 +16,26 @@ + + 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" + + + \ 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 b715cf1b32..78e05818a4 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 @@ -16,32 +16,58 @@ + + 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} + ) + - - SELECT + SELECT DISTINCT er.ROLE_NAME, er.ROLE_KEY - FROM + FROM USER_ROLE ur JOIN EPMET_ROLE er ON ur.ROLE_ID = er.ID - + er.DEL_FLAG = 0 AND ur.DEL_FLAG = 0 AND ur.USER_ID = #{userId} - - AND - er.APP = #{app} - - - AND - ur.CUSTOMER_ID = #{customerId} - - + + AND + er.APP = #{app} + + + AND + ur.CUSTOMER_ID = #{customerId} + +