Commit 41815dc9 authored by wujiang's avatar wujiang

添加orgcode过滤

parent 4ef9011d
...@@ -33,6 +33,13 @@ public class IdxBizTableController { ...@@ -33,6 +33,13 @@ public class IdxBizTableController {
} }
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "分页查询业务事实表的数据", notes = "分页查询业务事实表的数据-IDX前置接口")
@GetMapping(value = "/table/getPageO")
public ResponseModel<Page<Map<String, Object>>> getPageO(@RequestParam Map<String, Object> map) {
return ResponseHelper.buildResponse(idxBizTableService.getPageO(map));
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "列表下拉框选项数据", notes = "列表下拉框选项数据") @ApiOperation(httpMethod = "GET", value = "列表下拉框选项数据", notes = "列表下拉框选项数据")
@GetMapping(value = "/select-options") @GetMapping(value = "/select-options")
public ResponseModel<List<Map<String, Object>>> getSelectOptions( public ResponseModel<List<Map<String, Object>>> getSelectOptions(
......
...@@ -14,6 +14,13 @@ public interface IIdxBizTableService { ...@@ -14,6 +14,13 @@ public interface IIdxBizTableService {
Page<Map<String, Object>> getPage(Map<String, Object> map); Page<Map<String, Object>> getPage(Map<String, Object> map);
/** /**
* 分页查询业务事实表的数据-IDX(/idx/table/getPage)前置接口, 增加权限控制
*
* @param map 查询参数
*/
Page<Map<String, Object>> getPageO(Map<String, Object> map);
/**
* 获取下拉列表参数 * 获取下拉列表参数
* *
* @param tableName 表名 * @param tableName 表名
......
...@@ -67,25 +67,33 @@ public class IPermissionServiceImpl implements IPermissionService { ...@@ -67,25 +67,33 @@ public class IPermissionServiceImpl implements IPermissionService {
@Override @Override
public List<String> getCurrentUserProjectOrgCodes() { public List<String> getCurrentUserProjectOrgCodes() {
List<String> result = new ArrayList<>(); List<String> result = new ArrayList<>();
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class); ReginParams reginParams = JSONObject.parseObject(redisUtils
.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(),
ReginParams.class);
String userId = reginParams.getUserModel().getUserId(); String userId = reginParams.getUserModel().getUserId();
StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH")); StdUserEmpower stdUserEmpower = userEmpowerMapper
.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
if (ObjectUtils.isEmpty(stdUserEmpower)) { if (ObjectUtils.isEmpty(stdUserEmpower)) {
return null; return null;
} else { } else {
String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0); String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode); Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
String companyLevel = companyInfo.get("level").toString(); String companyLevel = companyInfo.get("level");
if (companyLevel.equals("categroy_leve2")) { if (companyLevel.equals("categroy_leve2")) {
return null; List<StationBasic> stationBasics = stationBasicMapper
.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
result = stationBasics.stream().map(StationBasic::getProjectOrgCode).collect(Collectors.toList());
return result;
} }
if (companyLevel.equals("area")) { if (companyLevel.equals("area")) {
List<StationBasic> stationBasics = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode)); List<StationBasic> stationBasics = stationBasicMapper
.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
result = stationBasics.stream().map(StationBasic::getProjectOrgCode).collect(Collectors.toList()); result = stationBasics.stream().map(StationBasic::getProjectOrgCode).collect(Collectors.toList());
return result; return result;
} }
if (companyLevel.equals("station")) { if (companyLevel.equals("station")) {
StationBasic stationBasic = stationBasicMapper.selectOne(new QueryWrapper<StationBasic>().eq("project_org_code", permissionOrgCode)); StationBasic stationBasic = stationBasicMapper
.selectOne(new QueryWrapper<StationBasic>().eq("project_org_code", permissionOrgCode));
result.add(stationBasic.getProjectOrgCode()); result.add(stationBasic.getProjectOrgCode());
return result; return result;
} }
......
...@@ -46,6 +46,25 @@ public class IdxBizTableServiceImpl implements IIdxBizTableService { ...@@ -46,6 +46,25 @@ public class IdxBizTableServiceImpl implements IIdxBizTableService {
return page.getResult(); return page.getResult();
} }
/**
* 分页查询业务事实表的数据-IDX(/idx/table/getPage)前置接口, 增加权限控制
*
* @param map 查询参数
*/
public Page<Map<String, Object>> getPageO(Map<String, Object> map) {
List<String> currentUserPermissions = permissionService.getCurrentUserProjectOrgCodes();
if (Objects.isNull(currentUserPermissions)) {
currentUserPermissions = new ArrayList<>();
}
String orgcodes = String.join(",", currentUserPermissions);
if (!orgcodes.isEmpty()) {
map.put("ORG_CODE", String.format("[%s]", orgcodes));
}
FeignClientResult<Page<Map<String, Object>>> page = idxFeign.getPage(map);
return page.getResult();
}
/** /**
* 获取下拉列表参数 * 获取下拉列表参数
* *
......
...@@ -87,6 +87,6 @@ public interface IMcbWarningService { ...@@ -87,6 +87,6 @@ public interface IMcbWarningService {
*/ */
Object getQuestionRecordStatistic(Map<String, Object> map); Object getQuestionRecordStatistic(Map<String, Object> map);
Object getMapRouteInfoByCodes(String province, List<String> codes, String operator); Object getMapRouteInfoByCodes(String province);
} }
...@@ -146,10 +146,8 @@ public class McbWarningController { ...@@ -146,10 +146,8 @@ public class McbWarningController {
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "任务总览地图数据", notes = "任务总览地图数据") @ApiOperation(httpMethod = "GET", value = "任务总览地图数据", notes = "任务总览地图数据")
@GetMapping(value = "/monitor/overview/getMapRouteInfoByCodes") @GetMapping(value = "/getMapRouteInfoByCodes")
public ResponseModel getMapRouteInfoByCodes(@RequestParam String province, public ResponseModel<Object> getMapRouteInfoByCodes(@RequestParam String province) {
@RequestParam("codes") List<String> codes, return ResponseHelper.buildResponse(mcbWarningService.getMapRouteInfoByCodes(province));
@RequestParam(value = "operator", defaultValue = "=") String operator) {
return ResponseHelper.buildResponse(mcbWarningService.getMapRouteInfoByCodes(province, codes, operator));
} }
} }
...@@ -197,8 +197,7 @@ public class McbWarningServiceImpl implements IMcbWarningService { ...@@ -197,8 +197,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
return false; return false;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
List<RectificationUnitClassifyTreeDto> listDate = new ArrayList<>(); List<RectificationUnitClassifyTreeDto> listDate = new ArrayList<>();
if(!targetList.isEmpty()) if (!targetList.isEmpty()) {
{
for (RectificationUnitClassifyTreeDto t : targetList) { for (RectificationUnitClassifyTreeDto t : targetList) {
if (StringUtils.isBlank(t.getParentId()) || "0".equals(t.getParentId()) if (StringUtils.isBlank(t.getParentId()) || "0".equals(t.getParentId())
|| codes.get(0).equals(t.getCode())) { || codes.get(0).equals(t.getCode())) {
...@@ -245,9 +244,8 @@ public class McbWarningServiceImpl implements IMcbWarningService { ...@@ -245,9 +244,8 @@ public class McbWarningServiceImpl implements IMcbWarningService {
* *
*/ */
@Override @Override
public Object getMapRouteInfoByCodes(String province, List<String> codes, String operator) { public Object getMapRouteInfoByCodes(String province) {
FeignClientResult result = mcbWarningFeign.getMapRouteInfoByCodes(province, this.getProjectOrgCodes(), FeignClientResult<Object> result = mcbWarningFeign.getMapRouteInfoByCodes(province, this.getProjectOrgCodes(), "in");
operator);
return result.getResult(); return result.getResult();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment