Browse Source

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

master
wangchao 5 years ago
parent
commit
0afa1ecd00
  1. 17
      epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java
  2. 33
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/user/LoginUserUtil.java
  3. 62
      epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
  4. 62
      epmet-gateway/src/main/java/com/epmet/filter/FeignRequestFilter.java
  5. 45
      epmet-gateway/src/main/java/com/epmet/filter/UserTokenFilter.java
  6. 4
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/SysSmsEntity.java
  7. 10
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java
  8. 6
      epmet-module/resi-mine/resi-mine-server/pom.xml
  9. 2
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberController.java
  10. 1
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberServiceImpl.java
  11. 1
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java
  12. 5
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberInfoDTO.java
  13. 6
      epmet-module/resi-partymember/resi-partymember-server/pom.xml
  14. 5
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
  15. 5
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java
  16. 5
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java
  17. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java
  18. 1
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java
  19. 11
      epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserResiInfoRedis.java
  20. 9
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
  21. 5
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java
  22. 1
      epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml
  23. 5
      epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml

17
epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java

@ -17,8 +17,10 @@ import com.epmet.commons.mybatis.enums.EpmetDelFlagEnum;
import com.epmet.commons.tools.constant.Constant;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.security.user.SecurityUser;
import com.epmet.commons.tools.security.user.UserDetail;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;
@ -40,21 +42,24 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
@Override
public void insertFill(MetaObject metaObject) {
UserDetail user = SecurityUser.getUser();
Date date = new Date();
if (metaObject.getOriginalObject() instanceof BaseEpmetEntity) {
String userId = user == null ? Constant.APP_USER_FLAG : String.valueOf(user.getId());
Long deptId = user == null ? null : user.getDeptId();
String loginUserId = LoginUserUtil.getLoginUserId();
// epmet项目新增的
loginUserId = StringUtils.isBlank(loginUserId) ? Constant.APP_USER_FLAG : loginUserId;
//Long deptId = user == null ? null : user.getDeptId();
setFieldValByName(FieldConstant.CREATED_TIME_HUMP, date, metaObject);
setFieldValByName(FieldConstant.CREATED_BY_HUMP, userId, metaObject);
setFieldValByName(FieldConstant.CREATED_BY_HUMP, loginUserId, metaObject);
setFieldValByName(FieldConstant.UPDATED_TIME_HUMP, date, metaObject);
setFieldValByName(FieldConstant.UPDATED_BY_HUMP, userId, metaObject);
setFieldValByName(FieldConstant.UPDATED_BY_HUMP, loginUserId, metaObject);
setFieldValByName(FieldConstant.REVISION_HUMP, NumConstant.ZERO, metaObject);
//删除标识
setFieldValByName(FieldConstant.DEL_FLAG_HUMP, EpmetDelFlagEnum.NORMAL.value(), metaObject);
// 数据权限标志
setInsertFieldValByName(DEPT_ID, deptId, metaObject);
//setInsertFieldValByName(DEPT_ID, deptId, metaObject);
} else {
UserDetail user = SecurityUser.getUser();
// renren自带的
if (user == null) {
return;
}

33
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/user/LoginUserUtil.java

@ -0,0 +1,33 @@
package com.epmet.commons.tools.security.user;
import com.epmet.commons.tools.constant.Constant;
import com.epmet.commons.tools.utils.HttpContextUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
/**
* 登录用户相关工具
*/
public class LoginUserUtil {
/**
* 查询登录用户的id
* @return
*/
public static String getLoginUserId() {
HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
if (request == null) {
return null;
}
String userId = request.getHeader(Constant.USER_KEY);
if (StringUtils.isBlank(userId)) {
return null;
}
return userId;
}
}

62
epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java

@ -38,7 +38,7 @@ import java.util.List;
* @since 1.0.0
*/
@Component("CpAuth")
public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpAuthGatewayFilterFactory.CpAuthConfig> {
public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpAuthGatewayFilterFactory.CpAuthConfig> implements UserTokenFilter {
private Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
private CpProperty cpProperty;
@ -90,7 +90,7 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
}
try {
//当前登录用户userId,添加到header中
TokenDto user = this.getLoginUserInfo(token);
TokenDto user = getLoginUserInfoByToken(token, jwtTokenUtils, cpUserDetailRedis);
if (user != null) {
String redisKey = user.getApp() + "-" + user.getClient() + "-" + user.getUserId();
logger.info("redisKey=" + redisKey);
@ -105,35 +105,35 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
};
}
public TokenDto getLoginUserInfo(String token) {
//是否过期
Claims claims = jwtTokenUtils.getClaimByToken(token);
if (claims == null || jwtTokenUtils.isTokenExpired(claims.getExpiration())) {
throw new RenException(ErrorCode.ERR401.getCode(),ErrorCode.ERR401.getMsg());
}
//获取用户ID
String app = (String) claims.get("app");
String client = (String) claims.get("client");
String userId = (String) claims.get("userId");
//查询Redis
TokenDto tokenDto = cpUserDetailRedis.get(app, client, userId);
if (null == tokenDto) {
//说明登录状态时效(超时)
throw new RenException(ErrorCode.ERR10006.getCode(),ErrorCode.ERR10006.getMsg());
}else{
//Redis中存在数据,取出token,进行比对
if(StringUtils.equals(tokenDto.getToken(),token)){
//用户携带token与Redis中一致
}else{
//用户携带token与Redis中不一致,说明当前用户此次会话失效,提示重新登陆
throw new RenException(ErrorCode.ERR10007.getCode(),ErrorCode.ERR10007.getMsg());
}
}
return tokenDto;
}
//public TokenDto getLoginUserInfo(String token) {
// //是否过期
// Claims claims = jwtTokenUtils.getClaimByToken(token);
// if (claims == null || jwtTokenUtils.isTokenExpired(claims.getExpiration())) {
// throw new RenException(ErrorCode.ERR401.getCode(),ErrorCode.ERR401.getMsg());
// }
// //获取用户ID
// String app = (String) claims.get("app");
// String client = (String) claims.get("client");
// String userId = (String) claims.get("userId");
// //查询Redis
// TokenDto tokenDto = cpUserDetailRedis.get(app, client, userId);
// if (null == tokenDto) {
// //说明登录状态时效(超时)
// throw new RenException(ErrorCode.ERR10006.getCode(),ErrorCode.ERR10006.getMsg());
// }else{
// //Redis中存在数据,取出token,进行比对
// if(StringUtils.equals(tokenDto.getToken(),token)){
// //用户携带token与Redis中一致
//
// }else{
// //用户携带token与Redis中不一致,说明当前用户此次会话失效,提示重新登陆
// throw new RenException(ErrorCode.ERR10007.getCode(),ErrorCode.ERR10007.getMsg());
// }
//
// }
//
// return tokenDto;
//}
private Mono<Void> response(ServerWebExchange exchange, Object object) {
String json = JSON.toJSONString(object);

62
epmet-gateway/src/main/java/com/epmet/filter/FeignRequestFilter.java

@ -0,0 +1,62 @@
package com.epmet.filter;
import com.epmet.commons.tools.constant.Constant;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.CpUserDetailRedis;
import com.epmet.jwt.JwtTokenUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.gateway.filter.GatewayFilterChain;
import org.springframework.cloud.gateway.filter.GlobalFilter;
import org.springframework.http.HttpHeaders;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.stereotype.Component;
import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono;
/**
* Feign调用发送请求的Filter
* 目前用于封装用户相关信息到request供上游微服务使用
*/
@Component
public class FeignRequestFilter implements GlobalFilter, UserTokenFilter {
private Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
private JwtTokenUtils jwtTokenUtils;
@Autowired
private CpUserDetailRedis cpUserDetailRedis;
@Override
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
ServerHttpRequest request = exchange.getRequest();
HttpHeaders headers = request.getHeaders();
String token = headers.getFirst(Constant.AUTHORIZATION_HEADER);
if (StringUtils.isBlank(token)) {
token = headers.getFirst(Constant.TOKEN_HEADER);
logger.info("token=" + token);
} else {
logger.info("authorization=" + token);
}
if (StringUtils.isBlank(token)) {
token = request.getQueryParams().getFirst(Constant.AUTHORIZATION_HEADER);
logger.info("params token:" + token);
}
if (StringUtils.isBlank(token)) {
return chain.filter(exchange);
}
TokenDto loginUserInfo = getLoginUserInfoByToken(token, jwtTokenUtils, cpUserDetailRedis);
if (loginUserInfo != null) {
ServerHttpRequest build = exchange.getRequest().mutate()
.header(Constant.USER_KEY, new String[]{loginUserInfo.getUserId()}).build();
return chain.filter(exchange.mutate().request(build).build());
}
return chain.filter(exchange);
}
}

45
epmet-gateway/src/main/java/com/epmet/filter/UserTokenFilter.java

@ -0,0 +1,45 @@
package com.epmet.filter;
import com.epmet.common.token.enums.ErrorCode;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.CpUserDetailRedis;
import com.epmet.jwt.JwtTokenUtils;
import io.jsonwebtoken.Claims;
/**
* 用户token的过滤器接口提供通用的默认方法
*/
public interface UserTokenFilter {
default TokenDto getLoginUserInfoByToken(String token, JwtTokenUtils jwtTokenUtils, CpUserDetailRedis cpUserDetailRedis) {
//是否过期
Claims claims = jwtTokenUtils.getClaimByToken(token);
if (claims == null || jwtTokenUtils.isTokenExpired(claims.getExpiration())) {
throw new RenException(ErrorCode.ERR401.getCode(),ErrorCode.ERR401.getMsg());
}
//获取用户ID
String app = (String) claims.get("app");
String client = (String) claims.get("client");
String userId = (String) claims.get("userId");
//查询Redis
TokenDto tokenDto = cpUserDetailRedis.get(app, client, userId);
//if (null == tokenDto) {
// //说明登录状态时效(超时)
// throw new RenException(ErrorCode.ERR10006.getCode(),ErrorCode.ERR10006.getMsg());
//}else{
// //Redis中存在数据,取出token,进行比对
// if(StringUtils.equals(tokenDto.getToken(),token)){
// //用户携带token与Redis中一致
//
// }else{
// //用户携带token与Redis中不一致,说明当前用户此次会话失效,提示重新登陆
// throw new RenException(ErrorCode.ERR10007.getCode(),ErrorCode.ERR10007.getMsg());
// }
//
//}
return tokenDto;
}
}

4
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/SysSmsEntity.java

@ -10,7 +10,7 @@ package com.epmet.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.epmet.commons.mybatis.entity.BaseEntity;
import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -22,7 +22,7 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("sys_sms")
public class SysSmsEntity extends BaseEntity {
public class SysSmsEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**

10
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java

@ -96,13 +96,7 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
}
sms.setStatus(status);
sms.setCreateDate(new Date());
baseDao.tempInsert(sms.getPlatform(),
sms.getMobile(),
sms.getParams1(),
sms.getParams2(),
sms.getParams3(),
sms.getParams4(),
sms.getStatus());
//sms.setCreateDate(new Date());
baseDao.insert(sms);
}
}

6
epmet-module/resi-mine/resi-mine-server/pom.xml

@ -82,12 +82,6 @@
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>resi-partymember-client</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>

2
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberController.java

@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
* @date 2020/3/30 16:11
*/
@RestController
@RequestMapping("partymemberbaseinfo")
@RequestMapping("partymember")
public class PartyMemberController {
@Autowired

1
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberServiceImpl.java

@ -42,6 +42,7 @@ public class PartyMemberServiceImpl implements PartyMemberService {
partyMemberInfo.setGridId(fromDTO.getGridId());
partyMemberInfo.setUserId(tokenDto.getUserId());
partyMemberInfo.setPartymemberVisitId(fromDTO.getVisitId());
partyMemberInfo.setApp(tokenDto.getApp());
return resiPartymemberFeignClient.submit(partyMemberInfo);
}

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

5
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberInfoDTO.java

@ -154,4 +154,9 @@ public class PartymemberInfoDTO implements Serializable {
*/
private String code;
/**
* 所属端
*/
private String app;
}

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

@ -81,12 +81,6 @@
<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>

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

@ -1,10 +1,10 @@
package com.epmet.modules.partymember.service.impl;
import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
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;
@ -157,7 +157,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
//添加用户党员角色关系
UserRoleDTO userRole = new UserRoleDTO();
userRole.setUserId(partyMemberInfoDTO.getUserId());
userRole.setRoleKey(UserConstant.ROLE_PARTYMEMBER);
userRole.setRoleKey(EpmetRoleKeyConstant.PARTYMEMBER);
userRole.setApp(partyMemberInfoDTO.getApp());
epmetUserFeignClient.saveUserRole(userRole);
//存入党员注册关系表 用于统计客户网格的认证党员数
saveRegisterRelation(partyMemberInfoDTO);

5
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;
/**
* 唯一标识
*/

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

@ -54,6 +54,11 @@ public class UserRoleDTO implements Serializable {
*/
private String roleId;
/**
* 所属端App
*/
private String app;
/**
* 角色Key值
*/

2
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

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

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

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

@ -21,6 +21,7 @@ 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.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
@ -169,6 +170,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
*/
@Transactional(rollbackFor = Exception.class)
public void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO) {
//1:注册信息表新增数据
Date date = new Date();
userResiInfoDTO.setId(IdWorker.get32UUID());
userResiInfoDTO.setDelFlag(NumConstant.ZERO);
@ -178,6 +180,13 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
userResiInfoDTO.setUpdatedBy(userResiInfoDTO.getUserId());
userResiInfoDTO.setUpdatedTime(date);
userResiInfoDao.saveUserResiInfo(userResiInfoDTO);
//2:角色表新增角色数据
UserRoleDTO userRoleDTO = new UserRoleDTO();
userRoleDTO.setCustomerId(userResiInfoDTO.getCustomerId());
userRoleDTO.setUserId(userResiInfoDTO.getUserId());
userRoleDTO.setApp(userResiInfoDTO.getApp());
userRoleDTO.setRoleKey(EpmetRoleKeyConstant.REGISTERED_RESI);
userRoleService.saveUserRole(userRoleDTO);
}
/**

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

@ -20,11 +20,10 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.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;
@ -122,10 +121,10 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
}
@Override
@Transactional(rollbackFor = Exception.class)
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());

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

@ -28,5 +28,4 @@
and DEL_FLAG = 0
</select>
</mapper>

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

@ -16,9 +16,8 @@
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<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

Loading…
Cancel
Save