Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/controller/FireSourceController.java

@@ -139,13 +139,14 @@ public class FireSourceController extends AbstractBaseController {
             @ApiParam(value = "设备名称", required = false) @RequestParam(required = false) String fireEquipmentName,
             @ApiParam(value = "按保护对象名称", required = false) @RequestParam(required = false) String equipmentName,
             @ApiParam(value = "开始日期", required = false) @RequestParam(required = false) String startTime,
+            @ApiParam(value = "建筑id", required = false) @RequestParam(required = false) String buildId,
             @ApiParam(value = "结束日期", required = false) @RequestParam(required = false) String endTime, int pageNumber,
             int pageSize) {
 
         CommonPageable commonPageable = new CommonPageable(pageNumber, pageSize);
         return CommonResponseUtil.success(iFireEquipService.queryForFireEquipmentHistory(
                 StringUtils.trimToNull(fireEquipmentName), StringUtils.trimToNull(equipmentName),
-                StringUtils.trimToNull(startTime), StringUtils.trimToNull(endTime), commonPageable));
+                StringUtils.trimToNull(startTime), StringUtils.trimToNull(endTime),StringUtils.trimToNull(buildId), commonPageable));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/FireEquipMapper.java

@@ -27,7 +27,8 @@ public interface FireEquipMapper extends BaseMapper {
     long queryForFireEquipmentHistoryCount(@Param("fireEquipmentName") String fireEquipmentName,
                                            @Param("equipmentName") String equipmentName,
                                            @Param("startTime") String startTime,
-                                           @Param("endTime") String endTime);
+                                           @Param("endTime") String endTime,
+                                           @Param("buildId") String buildId);
 
     //查询 消防设备历史数据
     List<Map> queryForFireEquipmentHistory(
@@ -36,7 +37,8 @@ public interface FireEquipMapper extends BaseMapper {
             @Param("startTime") String startTime,
             @Param("endTime") String endTime,
             @Param("start") long start,
-            @Param("length") int length
+            @Param("length") int length,
+            @Param("buildId") String buildId
     );
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireEquipServiceImpl.java

@@ -14,10 +14,12 @@ import com.yeejoin.amos.fas.business.vo.FireStationVo;
 import com.yeejoin.amos.fas.common.enums.EquipClassifyEnum;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.response.CommonPage;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -90,18 +92,21 @@ public class FireEquipServiceImpl implements IFireEquipService {
                                              String equipmentName,
                                              String startTime,
                                              String endTime,
+                                             String buildId,
                                              CommonPageable commonPageable) {
 
         long total = fireEquipMapper.queryForFireEquipmentHistoryCount(fireEquipmentName, equipmentName,
                 startTime,
-                endTime);
+                endTime,
+                buildId);
 
         List<Map> content = fireEquipMapper.queryForFireEquipmentHistory(fireEquipmentName,
                 equipmentName,
                 startTime,
                 endTime,
                 commonPageable.getOffset(),
-                commonPageable.getPageSize());
+                commonPageable.getPageSize(),
+                buildId);
         Page result = new CommonPage(content, commonPageable, total);
         return result;
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IFireEquipService.java

@@ -30,6 +30,7 @@ public interface IFireEquipService {
 												  String equipmentName,
 												  String startTime,
 												  String endTime,
+												  String buildId,
 												  CommonPageable commonPageable);
 
 	Page queryForEquipmentList(String name, String code,String equipClassify,CommonPageable commonPageable,String bindStation);

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;
@@ -38,211 +46,243 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 @RequestMapping(value = "/api/plan")
 @Api(tags = "巡检计划api")
 public class PlanController extends AbstractBaseController {
-    private final Logger log = LoggerFactory.getLogger(PlanController.class);
-    @Autowired
-    private IPlanService planService;
-
-    /**
-     * 巡检计划查询
-     *
-     * @param
-     * @param
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @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,
-                                           @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
+	private final Logger log = LoggerFactory.getLogger(PlanController.class);
+	@Autowired
+	private IPlanService planService;
+	
+	@Value("${supervision.role.isIncludOrgAirRoleId}")
+	private Long isIncludOrgAirRoleId;
+	
+	@Value("${supervision.role.includOrgCompanyRoleId}")
+	private Long includOrgCompanyRoleId;
+
+	/**
+	 * 巡检计划查询
+	 *
+	 * @param
+	 * @param
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@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,
+			@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
 //        ReginParams reginParams = getSelectedOrgInfo();
 //        String loginOrgCode = getOrgCode(reginParams);
 //        HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, null);
 //        buildRequestCxt();
-        PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, commonPageable, new HashMap<>());
-        Page<HashMap<String, Object>> list = planService.getPlanInfo(param);
-        return CommonResponseUtil.success(list);
-    }
-
-    /**
-     * 业主单位维保计划查询
-     *
-     * @param
-     * @param
-     * @return
-     */
-    @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,
-                                           @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
-        HashMap<String, Object> paramMap = buildMybatisCriterias(null, null);
+		PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, commonPageable, new HashMap<>());
+		Page<HashMap<String, Object>> list = planService.getPlanInfo(param);
+		return CommonResponseUtil.success(list);
+	}
+
+	/**
+	 * 业主单位维保计划查询
+	 *
+	 * @param
+	 * @param
+	 * @return
+	 */
+	@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,
+			@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
+		HashMap<String, Object> paramMap = buildMybatisCriterias(null, null);
 //        buildRequestCxt();
-        PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, commonPageable, paramMap);
-        Page<HashMap<String, Object>> list = planService.getPlanInfo(param);
-        return CommonResponseUtil.success(list);
-    }
-
-    /**
-     * 巡检计划新增
-     *
-     * @param param
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PersonIdentify
-    @ApiOperation(value = "巡检计划新增及编辑", notes = "巡检计划新增及编辑")
-    @RequestMapping(value = "/addPlan", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
-    public CommonResponse checkPlanAdd(@ApiParam(value = "巡检计划", required = true) @RequestBody AddPlanRequest param) {
-        try {
-            AgencyUserModel user = getUserInfo();
-            ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getOrgCode(reginParams);
-            HashMap<String, Object> map = new HashMap<String, Object>();
-            map.put("org_code", loginOrgCode);
-            map.put("user_id", user.getUserId());
-            map.put("user_name", user.getRealName());
-            map.put("param", param);
-            planService.addPlan(map,reginParams);
-            return CommonResponseUtil.success();
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            return CommonResponseUtil.failure("巡检计划新增失败");
-        }
-    }
-
-    /**
-     * 巡检计划删除（支持批量）
-     *
-     * @param param
-     * @return
-     */
-    @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) {
-        try {
-            planService.delPlanById(param);
-            return CommonResponseUtil.success();
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            return CommonResponseUtil.failure("删除巡检计划失败" + ":" + e.getMessage());
-        }
-    }
-
-
-    /**
-     * 编辑巡检另存(支持批量)
-     *
-     * @param param
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "另存巡检计划", notes = "另存巡检计划")
-    @RequestMapping(value = "/saveAs", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
-    public CommonResponse planSaveAs(@ApiParam(value = "参数", required = true) @RequestBody String[] param) {
-        try {
-            planService.planSaveAs(param);
-            return CommonResponseUtil.success();
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            return CommonResponseUtil.failure("另存巡检计划失败");
-        }
-    }
-
-    /**
-     * 根据id查询巡检计划
-     *
-     * @param id
-     * @return
-     */
-    @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) {
-
-        Plan plan = planService.queryPlanById(id);
-        return CommonResponseUtil.success(plan);
-
-    }
-
-    /**
-     * 巡检计划查询
-     *
-     * @param
-     * @param param
-     * @return
-     */
-    @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) {
-        ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getOrgCode(reginParams);
-        HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, null);
-        PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, null, paramMap);
-        List<HashMap<String, Object>> list = planService.getPlanInfoNoPage(param);
-        return CommonResponseUtil.success(list);
-    }
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "查询计划列表(<font color='blue'>手机app</font>)", notes = "查询计划列表(<font color='blue'>手机app</font>)")
-    @RequestMapping(value = "/queryPlanList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-    public CommonResponse queryPlanList() {
-        ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getOrgCode(reginParams);
-        List<HashMap<String, Object>> list = planService.queryPlanListByOrgCode(loginOrgCode);
-        return CommonResponseUtil.success(list);
-    }
-
-    /**
-     * 计划启用停用
-     * @param
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "计划启用停用", notes = "计划启用停用")
-    @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 ) {
-        planService.setplanstatus(planId, status);
-        return CommonResponseUtil.success();
-    }
-
-    /**
-     * 获取计划详情
-     * @param
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @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 ) {
-        PlanPointRespone planRequest = planService.getplandetails(planId);
-        return CommonResponseUtil.success(planRequest);
-    }
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "计划状态", notes = "计划状态")
-    @RequestMapping(value = "/planStatus/list", method = RequestMethod.GET)
-    public ResponseModel getPlanStatusList() {
-        return ResponseHelper.buildResponse(PlanStatusEnum.getEnumList());
-    }
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "计划检查类型", notes = "计划检查类型")
-    @RequestMapping(value = "/checkTypeSuEnum/list", method = RequestMethod.GET)
-    public ResponseModel getCheckTypeSuEnumList() {
-        return ResponseHelper.buildResponse(CheckTypeSuEnum.getEnumList());
-    }
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "检查级别", notes = "检查级别")
-    @RequestMapping(value = "/checkTypeLevelEnum/list", method = RequestMethod.GET)
-    public ResponseModel getCheckTypeLevelEnumList() {
-        return ResponseHelper.buildResponse(DangerCheckTypeLevelEnum.getEnumList());
-    }
+		PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, commonPageable, paramMap);
+		Page<HashMap<String, Object>> list = planService.getPlanInfo(param);
+		return CommonResponseUtil.success(list);
+	}
+
+	/**
+	 * 巡检计划新增
+	 *
+	 * @param param
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PersonIdentify
+	@ApiOperation(value = "巡检计划新增及编辑", notes = "巡检计划新增及编辑")
+	@RequestMapping(value = "/addPlan", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
+	public CommonResponse checkPlanAdd(@ApiParam(value = "巡检计划", required = true) @RequestBody AddPlanRequest param) {
+		try {
+			AgencyUserModel user = getUserInfo();
+			ReginParams reginParams = getSelectedOrgInfo();
+			String loginOrgCode = getOrgCode(reginParams);
+			HashMap<String, Object> map = new HashMap<String, Object>();
+			map.put("org_code", loginOrgCode);
+			map.put("user_id", user.getUserId());
+			map.put("user_name", user.getRealName());
+			map.put("param", param);
+			planService.addPlan(map, reginParams);
+			return CommonResponseUtil.success();
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+			return CommonResponseUtil.failure("巡检计划新增失败");
+		}
+	}
+
+	/**
+	 * 巡检计划删除（支持批量）
+	 *
+	 * @param param
+	 * @return
+	 */
+	@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) {
+		try {
+			planService.delPlanById(param);
+			return CommonResponseUtil.success();
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+			return CommonResponseUtil.failure("删除巡检计划失败" + ":" + e.getMessage());
+		}
+	}
+
+	/**
+	 * 编辑巡检另存(支持批量)
+	 *
+	 * @param param
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(value = "另存巡检计划", notes = "另存巡检计划")
+	@RequestMapping(value = "/saveAs", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
+	public CommonResponse planSaveAs(@ApiParam(value = "参数", required = true) @RequestBody String[] param) {
+		try {
+			planService.planSaveAs(param);
+			return CommonResponseUtil.success();
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+			return CommonResponseUtil.failure("另存巡检计划失败");
+		}
+	}
+
+	/**
+	 * 根据id查询巡检计划
+	 *
+	 * @param id
+	 * @return
+	 */
+	@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) {
+
+		Plan plan = planService.queryPlanById(id);
+		return CommonResponseUtil.success(plan);
+
+	}
+
+	/**
+	 * 巡检计划查询
+	 *
+	 * @param
+	 * @param param
+	 * @return
+	 */
+	@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) {
+		ReginParams reginParams = getSelectedOrgInfo();
+		String loginOrgCode = getOrgCode(reginParams);
+		HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, null);
+		PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, null, paramMap);
+		List<HashMap<String, Object>> list = planService.getPlanInfoNoPage(param);
+		return CommonResponseUtil.success(list);
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(value = "查询计划列表(<font color='blue'>手机app</font>)", notes = "查询计划列表(<font color='blue'>手机app</font>)")
+	@RequestMapping(value = "/queryPlanList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+	public CommonResponse queryPlanList() {
+		ReginParams reginParams = getSelectedOrgInfo();
+		String loginOrgCode = getOrgCode(reginParams);
+		List<HashMap<String, Object>> list = planService.queryPlanListByOrgCode(loginOrgCode);
+		return CommonResponseUtil.success(list);
+	}
+
+	/**
+	 * 计划启用停用
+	 * 
+	 * @param
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(value = "计划启用停用", notes = "计划启用停用")
+	@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) {
+		planService.setplanstatus(planId, status);
+		return CommonResponseUtil.success();
+	}
+
+	/**
+	 * 获取计划详情
+	 * 
+	 * @param
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@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) {
+		PlanPointRespone planRequest = planService.getplandetails(planId);
+		return CommonResponseUtil.success(planRequest);
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "计划状态", notes = "计划状态")
+	@RequestMapping(value = "/planStatus/list", method = RequestMethod.GET)
+	public ResponseModel getPlanStatusList() {
+		return ResponseHelper.buildResponse(PlanStatusEnum.getEnumList());
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "计划检查类型", notes = "计划检查类型")
+	@RequestMapping(value = "/checkTypeSuEnum/list", method = RequestMethod.GET)
+	public ResponseModel getCheckTypeSuEnumList() {
+		return ResponseHelper.buildResponse(CheckTypeSuEnum.getEnumList());
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "检查级别", notes = "检查级别")
+	@RequestMapping(value = "/checkTypeLevelEnum/list", method = RequestMethod.GET)
+	public ResponseModel getCheckTypeLevelEnumList() {
+		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-fas/src/main/resources/db/mapper/dbTemplate_fire_equip.xml

@@ -130,7 +130,8 @@
         WHERE
         efe.fire_equipment_id = ind.equipment_specific_id
         ) equipmentName,
-        ind.update_date
+        ind.update_date,
+        spe.warehouse_structure_id buildId
         FROM
         wl_equipment_specific_index as ind
         left join wl_equipment_specific as spe on spe.id = ind.equipment_specific_id
@@ -147,6 +148,12 @@
 	        <if test="startTime!=null">
 	            AND d.update_date  BETWEEN '${startTime}' AND '${endTime}'
 	        </if>
+            <if test="buildId!=null">
+               AND d.buildId in
+                <foreach item="item" index="index"  collection="buildId" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
 
@@ -194,6 +201,12 @@
 	        <if test="startTime!=null">
 	            AND d.create_date BETWEEN '${startTime}' AND '${endTime}'
 	        </if>
+            <if test="buildId!=null">
+             AND d.buildId in
+           <foreach item="item" index="index"  collection="buildId" open="(" separator="," close=")">
+               #{item}
+          </foreach>
+      </if>
       </where>
         ORDER BY d.create_date desc
         LIMIT ${start},${length}

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

@@ -53,4 +53,9 @@ 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
+supervision.person.charger.role=Person_charge_unit_fire_protection_supervision_inspection
\ No newline at end of file
+
+
+#隐患治理模块用于对多角色判断时，在缺少唯一充足的判断下使用当前角色的主键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>