添加orgcode过滤

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizTableController.java

@@ -31,6 +31,13 @@ public class IdxBizTableController {
     public ResponseModel<Page<Map<String, Object>>> getTablePage(@RequestParam Map<String, Object> map) {
         return ResponseHelper.buildResponse(idxBizTableService.getPage(map));
     }
+    
+    @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 = "列表下拉框选项数据")

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/IIdxBizTableService.java

@@ -14,6 +14,13 @@ public interface IIdxBizTableService {
     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       表名

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/IPermissionServiceImpl.java

@@ -64,32 +64,40 @@ public class IPermissionServiceImpl implements IPermissionService {
         return result;
     }
 
-    @Override
-    public List<String> getCurrentUserProjectOrgCodes() {
-        List<String> result = new ArrayList<>();
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        String userId = reginParams.getUserModel().getUserId();
-        StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
-        if (ObjectUtils.isEmpty(stdUserEmpower)) {
-            return null;
-        } else {
-            String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
-            Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-            String companyLevel = companyInfo.get("level").toString();
-            if (companyLevel.equals("categroy_leve2")) {
-                return null;
-            }
-            if (companyLevel.equals("area")) {
-                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("station")) {
-                StationBasic stationBasic = stationBasicMapper.selectOne(new QueryWrapper<StationBasic>().eq("project_org_code", permissionOrgCode));
-                result.add(stationBasic.getProjectOrgCode());
-                return result;
-            }
-        }
-        return result;
-    }
+	@Override
+	public List<String> getCurrentUserProjectOrgCodes() {
+		List<String> result = new ArrayList<>();
+		ReginParams reginParams = JSONObject.parseObject(redisUtils
+				.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(),
+				ReginParams.class);
+		String userId = reginParams.getUserModel().getUserId();
+		StdUserEmpower stdUserEmpower = userEmpowerMapper
+				.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
+		if (ObjectUtils.isEmpty(stdUserEmpower)) {
+			return null;
+		} else {
+			String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
+			Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
+			String companyLevel = companyInfo.get("level");
+			if (companyLevel.equals("categroy_leve2")) {
+				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")) {
+				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("station")) {
+				StationBasic stationBasic = stationBasicMapper
+						.selectOne(new QueryWrapper<StationBasic>().eq("project_org_code", permissionOrgCode));
+				result.add(stationBasic.getProjectOrgCode());
+				return result;
+			}
+		}
+		return result;
+	}
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/IdxBizTableServiceImpl.java

@@ -46,6 +46,25 @@ public class IdxBizTableServiceImpl implements IIdxBizTableService {
         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();
+    }
+    
     /**
      * 获取下拉列表参数
      *

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IMcbWarningService.java

@@ -87,6 +87,6 @@ public interface IMcbWarningService {
      */
     Object getQuestionRecordStatistic(Map<String, Object> map);
 
-    Object getMapRouteInfoByCodes(String province, List<String> codes, String operator);
+    Object getMapRouteInfoByCodes(String province);
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/McbWarningController.java

@@ -146,10 +146,8 @@ public class McbWarningController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "任务总览地图数据", notes = "任务总览地图数据")
-    @GetMapping(value = "/monitor/overview/getMapRouteInfoByCodes")
-    public ResponseModel getMapRouteInfoByCodes(@RequestParam String province,
-                                                @RequestParam("codes") List<String> codes,
-                                                @RequestParam(value = "operator", defaultValue = "=") String operator) {
-        return ResponseHelper.buildResponse(mcbWarningService.getMapRouteInfoByCodes(province, codes, operator));
+    @GetMapping(value = "/getMapRouteInfoByCodes")
+    public ResponseModel<Object> getMapRouteInfoByCodes(@RequestParam String province) {
+        return ResponseHelper.buildResponse(mcbWarningService.getMapRouteInfoByCodes(province));
     }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/McbWarningServiceImpl.java

@@ -197,8 +197,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
 			return false;
 		}).collect(Collectors.toList());
 		List<RectificationUnitClassifyTreeDto> listDate = new ArrayList<>();
-		if(!targetList.isEmpty())
-		{
+		if (!targetList.isEmpty()) {
 			for (RectificationUnitClassifyTreeDto t : targetList) {
 				if (StringUtils.isBlank(t.getParentId()) || "0".equals(t.getParentId())
 						|| codes.get(0).equals(t.getCode())) {
@@ -245,9 +244,8 @@ public class McbWarningServiceImpl implements IMcbWarningService {
 	 *
 	 */
 	@Override
-	public Object getMapRouteInfoByCodes(String province, List<String> codes, String operator) {
-		FeignClientResult result = mcbWarningFeign.getMapRouteInfoByCodes(province, this.getProjectOrgCodes(),
-				operator);
+	public Object getMapRouteInfoByCodes(String province) {
+		FeignClientResult<Object> result = mcbWarningFeign.getMapRouteInfoByCodes(province, this.getProjectOrgCodes(), "in");
 		return result.getResult();
 	}