Browse Source

Merge branch 'dev_question_naire' into develop

dev_shibei_match
wxz 4 years ago
parent
commit
0ba3819735
  1. 13
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
  2. 9
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java
  3. 9
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/PermissionValidateResultDTO.java
  4. 47
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
  5. 9
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/QuestionnaireService.java
  6. 10
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrPublishRangeService.java
  7. 10
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
  8. 7
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java
  9. 7
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
  10. 193
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/QuestionnaireServiceImpl.java

13
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@ -544,4 +544,17 @@ public class RedisKeys {
public static String getGridInfoKey(String gridId) {
return rootPrefix.concat("gov:grid:").concat(gridId);
}
/**
* @description 调查问卷accessKey
*
* @param userId
* @param qKey
* @return
* @author wxz
* @date 2021.09.23 17:38:37
*/
public static String getQuestionnaireAccessKey(String userId, String qKey) {
return rootPrefix.concat("questionnaire:accesskey:").concat(userId).concat(":").concat(qKey);
}
}

9
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java

@ -17,15 +17,22 @@ public class TDuckDetailFormDTO implements Serializable {
private static final long serialVersionUID = 3793280475377993346L;
public interface TDuckDetailForm{}
public interface PermissionValidate{}
/**
* 项目key
*/
@NotBlank(message = "项目key不能为空",groups = TDuckDetailForm.class)
@NotBlank(message = "项目key不能为空",groups = { TDuckDetailForm.class, PermissionValidate.class })
private String key;
/**
* 是否显示类型
*/
@NotNull(message = "是否显示类型不能为空",groups = TDuckDetailForm.class)
private Boolean displayType;
/** 当前操作人所在的组织的类型(grid:网格,agency:单位) */
private String orgType;
/** 当前操作人所在的组织的ID(当orgType为grid的时候必填,为agency的时候留空) */
private String orgId;
}

9
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/PermissionValidateResultDTO.java

@ -0,0 +1,9 @@
package com.epmet.dataaggre.dto.epmettduck.result;
import lombok.Data;
@Data
public class PermissionValidateResultDTO {
private Boolean permitted;
private String accessKey;
}

47
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java

@ -1,6 +1,10 @@
package com.epmet.dataaggre.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.exception.ValidateException;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -9,14 +13,15 @@ import com.epmet.dataaggre.dto.epmettduck.form.*;
import com.epmet.dataaggre.dto.epmettduck.result.*;
import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
import com.epmet.dataaggre.service.QuestionnaireService;
import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService;
import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import sun.tools.jstat.Token;
import javax.validation.constraints.NotBlank;
import java.util.List;
/**
@ -31,6 +36,8 @@ public class EpmetTDuckController {
private PrUserProjectService prUserProjectService;
@Autowired
private PrUserProjectItemService projectItemService;
@Autowired
private QuestionnaireService questionnaireService;
/**
@ -143,4 +150,36 @@ public class EpmetTDuckController {
public Result<RedPointResultDTO> redPoint(@LoginUser TokenDto tokenDto) {
return new Result<RedPointResultDTO>().ok(prUserProjectService.redPoint(tokenDto));
}
/**
* @description 校验权限并且获取accesskey
*
* @param input
* @return
* @author wxz
* @date 2021.09.23 15:13:53
*/
@PostMapping("/permission-validate")
public Result<PermissionValidateResultDTO> permissionValidate(@RequestBody TDuckDetailFormDTO input, @LoginUser TokenDto loginUserInfo, @RequestHeader("customerId") String customerId) {
ValidatorUtils.validateEntity(input, TDuckDetailFormDTO.PermissionValidate.class);
// 所用端的类型:gov:工作端,resi居民端
String app = loginUserInfo.getApp();
String orgId = input.getOrgId();
String projectKey = input.getKey();
String userId = loginUserInfo.getUserId();
PermissionValidateResultDTO r = null;
if (AppClientConstant.APP_RESI.equals(app)) {
if (StringUtils.isBlank(orgId) || !"grid".equals(input.getOrgType())) {
// 居民端,orgId是网格id,必填
throw new ValidateException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), "【调查问卷】校验访问权限-居民端 orgId不能为空,且orgType需要为[grid]");
}
r = questionnaireService.resiPermissionValidate(projectKey, userId, orgId);
} else if (AppClientConstant.APP_GOV.equals(app)) {
// 工作端
r = questionnaireService.govPermissionValidate(projectKey, userId, customerId);
}
return new Result<PermissionValidateResultDTO>().ok(r);
}
}

9
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/QuestionnaireService.java

@ -0,0 +1,9 @@
package com.epmet.dataaggre.service;
import com.epmet.dataaggre.dto.epmettduck.result.PermissionValidateResultDTO;
public interface QuestionnaireService {
PermissionValidateResultDTO resiPermissionValidate(String projectKey, String userId, String gridId);
PermissionValidateResultDTO govPermissionValidate(String projectKey, String staffId, String customerId);
}

10
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrPublishRangeService.java

@ -102,6 +102,16 @@ public interface PrPublishRangeService extends BaseService<PrPublishRangeEntity>
*/
List<String> getRangeOrgList(String projectKey);
/**
* @description 使用projectKey查询发布范围entity
*
* @param projectKey
* @return
* @author wxz
* @date 2021.09.23 23:04:23
*/
List<PrPublishRangeEntity> getPublishRangeEntity(String projectKey);
/**
* @Description 获取组织范围内的问卷
* @Param orgList

10
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java

@ -174,4 +174,14 @@ public interface PrUserProjectService extends BaseService<PrUserProjectEntity> {
* @Date 2021/9/23 10:05
*/
RedPointResultDTO redPoint(TokenDto tokenDto);
/**
* @description 根据key查询问卷
*
* @param key
* @return
* @author wxz
* @date 2021.09.23 22:25:57
*/
PrUserProjectEntity getProjectEntityBykey(String key);
}

7
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrPublishRangeServiceImpl.java

@ -125,6 +125,13 @@ public class PrPublishRangeServiceImpl extends BaseServiceImpl<PrPublishRangeDao
return list.stream().map(PrPublishRangeEntity::getOrgId).collect(Collectors.toList());
}
@Override
public List<PrPublishRangeEntity> getPublishRangeEntity(String projectKey) {
LambdaQueryWrapper<PrPublishRangeEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PrPublishRangeEntity::getProjectKey, projectKey);
return baseDao.selectList(wrapper);
}
/**
* @param orgList
* @Description 获取组织范围内的问卷

7
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java

@ -791,4 +791,11 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
}
return result;
}
@Override
public PrUserProjectEntity getProjectEntityBykey(String key) {
LambdaQueryWrapper<PrUserProjectEntity> query = new LambdaQueryWrapper<>();
query.eq(PrUserProjectEntity::getKey, key);
return baseDao.selectOne(query);
}
}

193
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/QuestionnaireServiceImpl.java

@ -0,0 +1,193 @@
package com.epmet.dataaggre.service.impl;
import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.dto.form.IdAndNameDTO;
import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.feign.ResultDataResolver;
import com.epmet.commons.tools.redis.RedisKeys;
import com.epmet.commons.tools.redis.RedisUtils;
import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dataaggre.dto.epmettduck.result.PermissionValidateResultDTO;
import com.epmet.dataaggre.entity.epmettduck.PrPublishRangeEntity;
import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
import com.epmet.dataaggre.service.QuestionnaireService;
import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService;
import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.feign.GovOrgOpenFeignClient;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
@Service
@Slf4j
public class QuestionnaireServiceImpl implements QuestionnaireService, ResultDataResolver {
/** 调查问卷有效期 15min */
public static final long QUESTIONNAIRE_EXPIRE_SECONDS = 15 * 60;
@Autowired
private PrUserProjectService prUserProjectService;
@Autowired
private PrPublishRangeService prPublishRangeService;
@Autowired
private GovOrgOpenFeignClient govOrgOpenFeignClient;
@Autowired
private RedisUtils redisUtils;
@Autowired
private CustomerStaffRedis customerStaffRedis;
/**
* @description 居民端调查问卷权限校验
*
* @param projectKey
* @param userId
* @param gridId
* @return
* @author wxz
* @date 2021.09.23 17:45:25
*/
public PermissionValidateResultDTO resiPermissionValidate(String projectKey, String userId, String gridId) {
PrUserProjectEntity project = prUserProjectService.getProjectEntityBykey(projectKey);
if (project == null || !AppClientConstant.APP_RESI.equals(project.getClient())) {
// 工作端只能看到发布到居民端的
log.warn("【调查问卷】居民端无法查看发布到工作端的调查问卷,staffId:{}, projectKey:{}", userId, projectKey);
return generateValidateResult(userId, projectKey, false);
}
CustomerGridFormDTO form = new CustomerGridFormDTO();
form.setGridId(gridId);
Result<CustomerGridDTO> gridInfoResult = govOrgOpenFeignClient.getGridBaseInfoByGridId(form);
CustomerGridDTO gridInfo = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【调查问卷】校验访问权限,查询网格信息失败");
// 网格父级ID列表:网格ID(拼接起来,冒号分割)
String gridIdPath = gridInfo.getPids().concat(":").concat(gridInfo.getId());
List<PrPublishRangeEntity> publishRangeEntity = prPublishRangeService.getPublishRangeEntity(projectKey);
PermissionValidateResultDTO r = new PermissionValidateResultDTO();
for (PrPublishRangeEntity rangeEntity : publishRangeEntity) {
if (gridIdPath.contains(rangeEntity.getOrgIds())) {
return generateValidateResult(userId, projectKey, true);
}
}
r.setPermitted(false);
return r;
}
@Override
public PermissionValidateResultDTO govPermissionValidate(String projectKey, String staffId, String customerId) {
PrUserProjectEntity project = prUserProjectService.getProjectEntityBykey(projectKey);
if (project == null || !"gov".equals(project.getClient())) {
// 工作端只能看到发布到工作端的
log.warn("【调查问卷】工作端无法查看发布到居民端的调查问卷,staffId:{}, projectKey:{}", staffId, projectKey);
return generateValidateResult(staffId, projectKey, false);
}
List<String> gridRangeOrgIds = new ArrayList<>();
List<String> agencyRangeOrgIds = new ArrayList<>();
List<String> deptRangeOrgIds = new ArrayList<>();
// 将发布范围分别放到3个不同的列表中
List<PrPublishRangeEntity> publishRangeEntitys = prPublishRangeService.getPublishRangeEntity(projectKey);
publishRangeEntitys.forEach(rangeEntity -> {
if ("grid".equals(rangeEntity.getOrgType())) {
gridRangeOrgIds.add(rangeEntity.getOrgIds());
} else if ("agency".equals(rangeEntity.getOrgType())) {
agencyRangeOrgIds.add(rangeEntity.getOrgIds());
} else if ("dept".equals(rangeEntity.getOrgType())) {
deptRangeOrgIds.add(rangeEntity.getOrgIds());
} else {
throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), String.format("【调查问卷】未知的发布范围类型:%s", rangeEntity.getOrgType()));
}
});
CustomerStaffInfoCacheResult staffInfo = customerStaffRedis.getStaffInfo(customerId, staffId);
PermissionValidateResultDTO r = null;
//if ("agency".equals(staffInfo.getFromOrgType())) {
// // 来自agency
//
//} else if ("grid".equals(staffInfo.getFromOrgType())) {
// List<IdAndNameDTO> belongGridList = staffInfo.getGridList();
//
//} else if ("dept".equals(staffInfo.getFromOrgType())) {
//
//}
String agencyId = staffInfo.getAgencyId();
String agencyPIds = staffInfo.getAgencyPIds();
// 网格范围内的权限判断
List<IdAndNameDTO> staffGridList = staffInfo.getGridList();
for (IdAndNameDTO gridIdAndName : staffGridList) {
// 工作人员所属的 父orgId路径:网格id
String staffGridIdPath = (StringUtils.isEmpty(agencyPIds) ? "" : agencyPIds.concat(":")).concat(agencyId).concat(":").concat(gridIdAndName.getId());
for (String gridRangeOrgId : gridRangeOrgIds) {
if (staffGridIdPath.contains(gridRangeOrgId)) {
r = generateValidateResult(staffId, projectKey, true);
return r;
}
}
}
// dept范围内的权限判断
List<IdAndNameDTO> staffDeptList = staffInfo.getDeptList();
for (IdAndNameDTO deptIdAndName : staffDeptList) {
// 工作人员所属的 父orgId路径:网格id
String staffDeptIdPath = (StringUtils.isEmpty(agencyPIds) ? "" : agencyPIds.concat(":")).concat(agencyId).concat(":").concat(deptIdAndName.getId());
for (String deptRangeOrgIdPath : deptRangeOrgIds) {
if (staffDeptIdPath.contains(deptRangeOrgIdPath)) {
r = generateValidateResult(staffId, projectKey, true);
return r;
}
}
}
// agency范围内的权限判断
String staffAgencyIdPath = (StringUtils.isEmpty(agencyPIds) ? "" : agencyPIds.concat(":")).concat(agencyId);
for (String agencyRangeOrgId : agencyRangeOrgIds) {
if (staffAgencyIdPath.contains(agencyRangeOrgId)) {
r = generateValidateResult(staffId, projectKey, true);
return r;
}
}
// 如果上述范围中都不能判断通过,那么返回一个不通过的结果给到前端
r = generateValidateResult(staffId, projectKey, false);
return r;
}
/**
* @description 生成权限允许的返回结果
*
* @param userId
* @param projectKey
* @param permitted 是否允许访问
* @return
* @author wxz
* @date 2021.09.23 23:19:17
*/
private PermissionValidateResultDTO generateValidateResult(String userId, String projectKey, Boolean permitted) {
PermissionValidateResultDTO d = new PermissionValidateResultDTO();
d.setPermitted(permitted);
if (permitted) {
String accessKey = UUID.randomUUID().toString().replace("-", "");
redisUtils.set(RedisKeys.getQuestionnaireAccessKey(userId, projectKey), accessKey, QUESTIONNAIRE_EXPIRE_SECONDS);
d.setAccessKey(accessKey);
}
return d;
}
}
Loading…
Cancel
Save