diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index 9321d14e60..5bf5f2404a 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/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;
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index 460f436997..c86652bf6b 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -81,6 +81,12 @@
RELEASE
compile
+
+ com.epmet
+ epmet-user-server
+ 2.0.0
+ compile
+
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
index 167118e581..69c93422a7 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
+++ b/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);
+
}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java
index 77735f4aad..257bbb295e 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java
+++ b/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);
+ }
}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
index 85b2c67d3b..ab94cf8369 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
+++ b/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 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 注册居民
}
}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java
index 12c4579ecb..f25d0ec9f6 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java
+++ b/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.已删除
*/
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java
index 8e1f9e5389..7c6d91c882 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java
@@ -8,29 +8,43 @@ package com.epmet.constant;
*/
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 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";
}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java
index 9ad160716a..f442da6e7f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java
@@ -39,7 +39,7 @@ import java.util.Map;
/**
- * 用户角色关系表
+ * 用户角色关系表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-30
@@ -47,65 +47,77 @@ import java.util.Map;
@RestController
@RequestMapping("userrole")
public class UserRoleController {
-
- @Autowired
- private UserRoleService userRoleService;
-
- @GetMapping("page")
- public Result> page(@RequestParam Map params){
- PageData page = userRoleService.page(params);
- return new Result>().ok(page);
- }
-
- @GetMapping("{id}")
- public Result get(@PathVariable("id") String id){
- UserRoleDTO data = userRoleService.get(id);
- return new Result().ok(data);
- }
-
- @PostMapping
- public Result save(@RequestBody UserRoleDTO dto){
- //效验数据
- ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
- userRoleService.save(dto);
- return new Result();
- }
-
- @PutMapping
- public Result update(@RequestBody UserRoleDTO dto){
- //效验数据
- ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
- userRoleService.update(dto);
- return new Result();
- }
-
- @DeleteMapping
- public Result delete(@RequestBody String[] ids){
- //效验数据
- AssertUtils.isArrayEmpty(ids, "id");
- userRoleService.delete(ids);
- return new Result();
- }
-
- @GetMapping("export")
- public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
- List list = userRoleService.list(params);
- 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> getUserRoleInfo(@RequestBody UserRoleFormDTO userRoleFormDTO){
-
- ValidatorUtils.validateEntity(userRoleFormDTO);
-
- return userRoleService.getUserRoleInfo(userRoleFormDTO);
- }
+
+ @Autowired
+ private UserRoleService userRoleService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params) {
+ PageData page = userRoleService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id) {
+ UserRoleDTO data = userRoleService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody UserRoleDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ userRoleService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody UserRoleDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ userRoleService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids) {
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ userRoleService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = userRoleService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, UserRoleExcel.class);
+ }
+
+ /**
+ * @return UserRoleResultDTO
+ * @Description 根据用户Id、来源app、客户Id查询用户角色
+ * @Param userRoleFormDTO
+ * @Author wangc
+ * @Date 2020.03.30 15:35
+ **/
+ @PostMapping("getuserroleinfo")
+ public Result> 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);
+ }
+
}
\ No newline at end of file
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..9acbe1fd88 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
@@ -22,12 +22,20 @@ import com.epmet.entity.RoleEntity;
import org.apache.ibatis.annotations.Mapper;
/**
- * 角色表
+ * 角色表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-30
*/
@Mapper
public interface RoleDao extends BaseDao {
-
+
+ /**
+ * 根据key值获取权限信息
+ *
+ * @param param 参数
+ * @return RoleEntity
+ */
+ RoleEntity selectRoleByKey(RoleEntity param);
+
}
\ 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..72e055c4b1 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
@@ -92,4 +92,11 @@ public interface RoleService extends BaseService {
* @date 2020-03-30
*/
void delete(String[] ids);
+
+ /**
+ * 根据key获取role信息
+ * @param role
+ * @return RoleDTO
+ */
+ RoleDTO getRoleByKey(RoleDTO role);
}
\ 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..a22191edb0 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
@@ -29,80 +29,88 @@ import java.util.List;
import java.util.Map;
/**
- * 用户角色关系表
+ * 用户角色关系表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-30
*/
public interface UserRoleService extends BaseService {
- /**
- * 默认分页
- *
- * @param params
- * @return PageData
- * @author generator
- * @date 2020-03-30
- */
- PageData page(Map params);
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2020-03-30
+ */
+ PageData page(Map params);
- /**
- * 默认查询
- *
- * @param params
- * @return java.util.List
- * @author generator
- * @date 2020-03-30
- */
- List list(Map params);
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2020-03-30
+ */
+ List list(Map params);
- /**
- * 单条查询
- *
- * @param id
- * @return UserRoleDTO
- * @author generator
- * @date 2020-03-30
- */
- UserRoleDTO get(String id);
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return UserRoleDTO
+ * @author generator
+ * @date 2020-03-30
+ */
+ UserRoleDTO get(String id);
- /**
- * 默认保存
- *
- * @param dto
- * @return void
- * @author generator
- * @date 2020-03-30
- */
- void save(UserRoleDTO dto);
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-03-30
+ */
+ void save(UserRoleDTO dto);
- /**
- * 默认更新
- *
- * @param dto
- * @return void
- * @author generator
- * @date 2020-03-30
- */
- void update(UserRoleDTO dto);
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-03-30
+ */
+ void update(UserRoleDTO dto);
- /**
- * 批量删除
- *
- * @param ids
- * @return void
- * @author generator
- * @date 2020-03-30
- */
- void delete(String[] ids);
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @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> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
+ /**
+ * @return UserRoleResultDTO
+ * @Description 根据用户Id、来源app、客户Id查询用户角色
+ * @Param userRoleFormDTO
+ * @Author wangc
+ * @Date 2020.03.30 15:35
+ **/
+ Result> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
+
+ /**
+ * 添加用户角色关系
+ *
+ * @param userRoleDTO 参数
+ * @return Result
+ */
+ Result saveUserRole(UserRoleDTO userRoleDTO);
}
\ 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..24914ad22e 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
@@ -101,4 +101,10 @@ public class RoleServiceImpl extends BaseServiceImpl 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);
+ }
+
}
\ 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..715dd1a58d 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
@@ -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 page(Map params) {
@@ -205,20 +209,15 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl implements UserRoleService {
- @Autowired
- private UserRoleRedis userRoleRedis;
-
- @Override
- public PageData page(Map params) {
- IPage page = baseDao.selectPage(
- getPage(params, FieldConstant.CREATED_TIME, false),
- getWrapper(params)
- );
- return getPageData(page, UserRoleDTO.class);
- }
-
- @Override
- public List list(Map params) {
- List entityList = baseDao.selectList(getWrapper(params));
-
- return ConvertUtils.sourceToTarget(entityList, UserRoleDTO.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 UserRoleDTO get(String id) {
- UserRoleEntity entity = baseDao.selectById(id);
- return ConvertUtils.sourceToTarget(entity, UserRoleDTO.class);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void save(UserRoleDTO dto) {
- UserRoleEntity entity = ConvertUtils.sourceToTarget(dto, UserRoleEntity.class);
- insert(entity);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void update(UserRoleDTO dto) {
- UserRoleEntity entity = ConvertUtils.sourceToTarget(dto, UserRoleEntity.class);
- updateById(entity);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delete(String[] ids) {
- // 逻辑删除（@TableLogic 注解）
- baseDao.deleteBatchIds(Arrays.asList(ids));
- }
-
- /**
- * @Description 根据用户Id、来源app、客户Id查询用户角色
- * @Param userRoleFormDTO
- * @return UserRoleResultDTO
- * @Author wangc
- * @Date 2020.03.30 15:35
- **/
- @Override
- public Result> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) {
- return new Result>().ok(baseDao.getUserRoleInfo(userRoleFormDTO));
- }
+ @Autowired
+ private UserRoleRedis userRoleRedis;
+ @Autowired
+ private RoleService roleService;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, UserRoleDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, UserRoleDTO.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 UserRoleDTO get(String id) {
+ UserRoleEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, UserRoleDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(UserRoleDTO dto) {
+ UserRoleEntity entity = ConvertUtils.sourceToTarget(dto, UserRoleEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(UserRoleDTO dto) {
+ UserRoleEntity entity = ConvertUtils.sourceToTarget(dto, UserRoleEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ /**
+ * @return UserRoleResultDTO
+ * @Description 根据用户Id、来源app、客户Id查询用户角色
+ * @Param userRoleFormDTO
+ * @Author wangc
+ * @Date 2020.03.30 15:35
+ **/
+ @Override
+ public Result> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) {
+ return new Result>().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();
+ }
}
\ 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..01a93dd9d9 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
@@ -15,6 +15,18 @@
+
\ No newline at end of file