添加对于检查级别设计的数据权限的筛选

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/PlanController.java

 package com.yeejoin.amos.supervision.business.controller;
 
+import static org.hamcrest.CoreMatchers.nullValue;
+
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
+import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.GroupModel;
 import com.yeejoin.amos.supervision.common.enums.CheckTypeSuEnum;
 import com.yeejoin.amos.supervision.common.enums.DangerCheckTypeLevelEnum;
 import com.yeejoin.amos.supervision.common.enums.PlanStatusEnum;
@@ -13,12 +19,14 @@ import com.yeejoin.amos.supervision.core.framework.PersonIdentify;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.supervision.business.param.PlanInfoPageParam;
 import com.yeejoin.amos.supervision.business.service.intfc.IPlanService;
 import com.yeejoin.amos.supervision.business.util.CommonResponse;
@@ -42,6 +50,12 @@ public class PlanController extends AbstractBaseController {
 	@Autowired
 	private IPlanService planService;
 	
+	@Value("${supervision.role.isIncludOrgAirRoleId}")
+	private Long isIncludOrgAirRoleId;
+	
+	@Value("${supervision.role.includOrgCompanyRoleId}")
+	private Long includOrgCompanyRoleId;
+
 	/**
 	 * 巡检计划查询
 	 *
@@ -53,7 +67,8 @@ public class PlanController extends AbstractBaseController {
 	@ApiOperation(value = "巡检计划查询", notes = "巡检计划查询")
 	@RequestMapping(value = "/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
 	@PersonIdentify
-    public CommonResponse qryCheckInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
+	public CommonResponse qryCheckInfoPage(
+			@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
 			@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
 //        ReginParams reginParams = getSelectedOrgInfo();
 //        String loginOrgCode = getOrgCode(reginParams);
@@ -74,7 +89,8 @@ public class PlanController extends AbstractBaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "业主单位维保计划查询", notes = "业主单位维保计划查询")
 	@RequestMapping(value = "/owner/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
-    public CommonResponse queryInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
+	public CommonResponse queryInfoPage(
+			@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
 			@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
 		HashMap<String, Object> paramMap = buildMybatisCriterias(null, null);
 //        buildRequestCxt();
@@ -103,7 +119,7 @@ public class PlanController extends AbstractBaseController {
 			map.put("user_id", user.getUserId());
 			map.put("user_name", user.getRealName());
 			map.put("param", param);
-            planService.addPlan(map,reginParams);
+			planService.addPlan(map, reginParams);
 			return CommonResponseUtil.success();
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
@@ -120,8 +136,7 @@ public class PlanController extends AbstractBaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "删除巡检计划", notes = "删除巡检计划")
 	@RequestMapping(value = "/deletePlanById", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
-    public CommonResponse deletePlanById(
-            @ApiParam(value = "巡检计划ID", required = true) @RequestBody String[] param) {
+	public CommonResponse deletePlanById(@ApiParam(value = "巡检计划ID", required = true) @RequestBody String[] param) {
 		try {
 			planService.delPlanById(param);
 			return CommonResponseUtil.success();
@@ -131,7 +146,6 @@ public class PlanController extends AbstractBaseController {
 		}
 	}
 
-
 	/**
 	 * 编辑巡检另存(支持批量)
 	 *
@@ -160,7 +174,8 @@ public class PlanController extends AbstractBaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "查询巡检计划明细", notes = "查询巡检计划明细")
 	@RequestMapping(value = "/detail/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-    public CommonResponse queryPointById(@ApiParam(value = "计划id", required = true) @PathVariable(name = "id") Long id) {
+	public CommonResponse queryPointById(
+			@ApiParam(value = "计划id", required = true) @PathVariable(name = "id") Long id) {
 
 		Plan plan = planService.queryPlanById(id);
 		return CommonResponseUtil.success(plan);
@@ -177,7 +192,8 @@ public class PlanController extends AbstractBaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "巡检计划查询", notes = "巡检计划查询")
 	@RequestMapping(value = "/queryPlanByOrgCode", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
-    public CommonResponse qryCheckInfo(@ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests) {
+	public CommonResponse qryCheckInfo(
+			@ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests) {
 		ReginParams reginParams = getSelectedOrgInfo();
 		String loginOrgCode = getOrgCode(reginParams);
 		HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, null);
@@ -198,6 +214,7 @@ public class PlanController extends AbstractBaseController {
 
 	/**
 	 * 计划启用停用
+	 * 
 	 * @param
 	 * @return
 	 */
@@ -206,13 +223,14 @@ public class PlanController extends AbstractBaseController {
 	@RequestMapping(value = "/setPlanStatus", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
 	public CommonResponse setPlanStatus(
 			@ApiParam(value = "计划id") @RequestParam(value = "planId", required = false) Long planId,
-            @ApiParam(value = "计划状态") @RequestParam(value = "status", required = false) Integer status ) {
+			@ApiParam(value = "计划状态") @RequestParam(value = "status", required = false) Integer status) {
 		planService.setplanstatus(planId, status);
 		return CommonResponseUtil.success();
 	}
 
 	/**
 	 * 获取计划详情
+	 * 
 	 * @param
 	 * @return
 	 */
@@ -220,7 +238,7 @@ public class PlanController extends AbstractBaseController {
 	@ApiOperation(value = "计划启用停用", notes = "计划启用停用")
 	@RequestMapping(value = "/getPlanDetails", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
 	public CommonResponse getPlanDetails(
-            @ApiParam(value = "计划id") @RequestParam(value = "planId", required = false) Long planId ) {
+			@ApiParam(value = "计划id") @RequestParam(value = "planId", required = false) Long planId) {
 		PlanPointRespone planRequest = planService.getplandetails(planId);
 		return CommonResponseUtil.success(planRequest);
 	}
@@ -243,6 +261,28 @@ public class PlanController extends AbstractBaseController {
 	@ApiOperation(httpMethod = "GET", value = "检查级别", notes = "检查级别")
 	@RequestMapping(value = "/checkTypeLevelEnum/list", method = RequestMethod.GET)
 	public ResponseModel getCheckTypeLevelEnumList() {
-        return ResponseHelper.buildResponse(DangerCheckTypeLevelEnum.getEnumList());
+		boolean includOrgAirRole = false;
+		boolean includOrgCompanyRole = false;
+		ReginParams reginParams = getSelectedOrgInfo();
+		String userId = reginParams.getUserModel().getUserId();
+		FeignClientResult<List<GroupModel>> groupList = Privilege.groupClient.queryByUserId(userId);
+		List<GroupModel> list = groupList.getResult();
+
+		for (GroupModel groupModel : list) {
+			if (groupModel.getSequenceNbr().equals(includOrgCompanyRoleId)) {// 单位管理员的对应主键值
+				includOrgCompanyRole = true;
+			}
+			if (groupModel.getSequenceNbr().equals(isIncludOrgAirRoleId)) {// 机场管理员的对应主键值
+				includOrgAirRole = true;
+			}
+		}
+
+		List<Map<String, Object>> getEnumList = DangerCheckTypeLevelEnum.getEnumList();
+		List<Map<String, Object>> resultList=null;
+		if (!includOrgAirRole && includOrgCompanyRole) {
+			resultList  = getEnumList.stream().filter(i -> i.get("code").toString().equals("1")).collect(Collectors.toList());
+			return ResponseHelper.buildResponse(resultList);
+		}
+		return ResponseHelper.buildResponse(getEnumList);
 	}
 }

amos-boot-system-supervision/src/main/resources/application-dev.properties

@@ -54,3 +54,8 @@ emqx.max-inflight=1000
 rule.definition.localIp=172.16.3.89
 file.url=http://39.98.45.134:9000/
 supervision.person.charger.role=Person_charge_unit_fire_protection_supervision_inspection
+
+
+#隐患治理模块用于对多角色判断时，在缺少唯一充足的判断下使用当前角色的主键id作为判断条件，
+supervision.role.isIncludOrgAirRoleId=1476527279111151618
+supervision.role.includOrgCompanyRoleId=1476527581793099777

pom.xml

@@ -25,7 +25,7 @@
 		<springcloud.version>Hoxton.SR8</springcloud.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 		<tyboot-version>1.1.20</tyboot-version>
-		<amos.version>1.6.6</amos.version>
+		<amos.version>1.7.1</amos.version>
 		<itext.version>7.1.1</itext.version>
 	</properties>