防火监督权限修改

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/annotations/DataAuth.java

+package com.yeejoin.amos.boot.biz.common.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author DELL
+ *
+ * 注解在mapper方法上
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DataAuth {
+
+	/**
+	 * 菜单组件
+	 * @return
+	 */
+	String interfacePath() default "";
+}
+

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/CommonUtils.java

+package com.yeejoin.amos.boot.biz.common.utils;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Objects;
+import java.util.function.BiConsumer;
+
+public class CommonUtils {
+
+    /**
+     * 带索引foreach
+     *
+     * @param <T>
+     * @param startIndex 开始遍历的索引
+     * @param elements   集合
+     * @param action
+     */
+    public static <T> void forEach(int startIndex, Iterable<? extends T> elements, BiConsumer<Integer, ? super T> action) {
+        Objects.requireNonNull(elements);
+        Objects.requireNonNull(action);
+        if (startIndex < 0) {
+            startIndex = 0;
+        }
+        int index = 0;
+        for (T element : elements) {
+            index++;
+            if (index <= startIndex) {
+                continue;
+            }
+
+            action.accept(index - 1, element);
+        }
+    }
+
+    public static Object getFiledValueByName(String filedName, Object o) throws InvocationTargetException, IllegalAccessException, NoSuchMethodException {
+        String firstLetter = filedName.substring(0, 1).toUpperCase();
+        String getterName = "get" + firstLetter + filedName.substring(1);
+        Method method;
+        method = o.getClass().getMethod(getterName, new Class[]{});
+        Object value = method.invoke(o, new Object[]{});
+        return value;
+    }
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MyBatisPlusConfig.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.biz.config;
 
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -26,4 +27,9 @@ public class MyBatisPlusConfig {
     public Sequence sequence(){
         return new Sequence();
     }
+
+    @Bean
+    public PermissionInterceptor permissionInterceptor() {
+        return new PermissionInterceptor();
+    }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/LatentDangerLevelEnum.java

@@ -25,9 +25,21 @@ public enum LatentDangerLevelEnum {
     重大隐患("重大隐患", "2", "2", 3);
 
     /**
+     * 巡检枚举缓存
+     */
+    public static Map<String, LatentDangerLevelEnum> patrolDangerLevelEnumMap = new HashMap<>();
+
+    static {
+        LatentDangerLevelEnum[] initEnum = LatentDangerLevelEnum.values();
+        for(LatentDangerLevelEnum _enum : initEnum) {
+            patrolDangerLevelEnumMap.put(_enum.getCode(), _enum);
+        }
+    }
+
+    /**
      * 枚举缓存
      */
-    public static Map<String, LatentDangerLevelEnum> enumMap = new HashMap<>();
+    public static Map<String, LatentDangerLevelEnum> supervisionDangerLevelEnumMap = new HashMap<>();
 
     public static final String dictCode = "_DANGER_LEVEL";
 
@@ -76,7 +88,7 @@ public enum LatentDangerLevelEnum {
     }
 
     public static LatentDangerLevelEnum getEnumByOrder(Integer order) {
-        for (LatentDangerLevelEnum l : enumMap.values()) {
+        for (LatentDangerLevelEnum l : supervisionDangerLevelEnumMap.values()) {
             if (order.equals(l.getOrder())) {
                 return l;
             }
@@ -91,7 +103,7 @@ public enum LatentDangerLevelEnum {
      */
     public static LatentDangerLevelEnum getEnumByCode(String code) {
         // 这里可以做一些修改  比如若从 enumMap 中没有取得 则加载配置动态添加
-        return enumMap.get(code);
+        return supervisionDangerLevelEnumMap.get(code);
     }
 
     public static LatentDangerLevelEnum addEnumDynamic(String enumName, String name, String code,
@@ -100,7 +112,7 @@ public enum LatentDangerLevelEnum {
                 new Class[]{String.class, String.class, String.class, Integer.class}, new Object[]{name, code,
                         riskSourceDangerLevelCode, order});
         if (!ValidationUtil.isEmpty(dangerLevelEnum)) {
-            enumMap.put(code, dangerLevelEnum);
+            supervisionDangerLevelEnumMap.put(code, dangerLevelEnum);
         }
         return dangerLevelEnum;
     }

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/LatentDangerReformTypeEnum.java

@@ -36,9 +36,21 @@ public enum LatentDangerReformTypeEnum {
     private String code;
 
     /**
-     * 枚举缓存
+     * 巡检枚举缓存
      */
-    public static Map<String, LatentDangerReformTypeEnum> enumMap = new HashMap<>();
+    public static Map<String, LatentDangerReformTypeEnum> patrolReformTypeEnumMap = new HashMap<>();
+
+    static {
+        LatentDangerReformTypeEnum[] initEnum = LatentDangerReformTypeEnum.values();
+        for(LatentDangerReformTypeEnum _enum : initEnum) {
+            patrolReformTypeEnumMap.put(_enum.getCode(), _enum);
+        }
+    }
+
+    /**
+     * 防火监督枚举缓存
+     */
+    public static Map<String, LatentDangerReformTypeEnum> supervisionReformTypeEnumMap = new HashMap<>();
 
     public static final String dictCode = "_GOVERNANCE";
 
@@ -70,14 +82,14 @@ public enum LatentDangerReformTypeEnum {
      */
     public static LatentDangerReformTypeEnum getEnumByCode(String code) {
         // 这里可以做一些修改  比如若从 enumMap 中没有取得 则加载配置动态添加
-        return enumMap.get(code);
+        return supervisionReformTypeEnumMap.get(code);
     }
 
     public static LatentDangerReformTypeEnum addEnumDynamic(String enumName, String name, String code) {
         LatentDangerReformTypeEnum dangerReformTypeEnum = DynamicEnumUtil.addEnum(LatentDangerReformTypeEnum.class, enumName,
                 new Class[]{String.class, String.class}, new Object[]{name, code});
         if (!ValidationUtil.isEmpty(dangerReformTypeEnum)) {
-            enumMap.put(code, dangerReformTypeEnum);
+            supervisionReformTypeEnumMap.put(code, dangerReformTypeEnum);
         }
         return dangerReformTypeEnum;
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/controller/LatentDangerController.java

@@ -19,7 +19,6 @@ import com.yeejoin.amos.latentdanger.business.util.CommonResponseUtil;
 import com.yeejoin.amos.latentdanger.business.util.FileHelper;
 import com.yeejoin.amos.latentdanger.business.vo.DangerTimeAxisVo;
 import com.yeejoin.amos.latentdanger.business.vo.LatentDangerDetailVo;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerLevelEnum;
 import com.yeejoin.amos.latentdanger.core.common.response.DangerListResponse;
 import com.yeejoin.amos.latentdanger.dao.entity.LatentDanger;
 import io.swagger.annotations.Api;
@@ -241,9 +240,6 @@ public class LatentDangerController extends BaseController {
     @PostMapping(value = "/page/list")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     public ResponseModel listDanger(@ApiParam(value = "查询条件", required = true) @RequestBody PageParam pageParam) throws Exception {
-        ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getOrgCode(reginParams);
-        pageParam.put("orgCode", loginOrgCode);
         IPage<LatentDanger> result = iLatentDangerService.pageListDanger(pageParam);
         return ResponseHelper.buildResponse(result);
     }
@@ -343,9 +339,6 @@ public class LatentDangerController extends BaseController {
     @PostMapping(value = "/supervision/page/reviewList")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     public ResponseModel reviewListDanger(@ApiParam(value = "查询条件", required = true) @RequestBody PageParam pageParam) throws Exception {
-        ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getOrgCode(reginParams);
-        pageParam.put("orgCode", loginOrgCode);
         IPage<LatentDanger> result = iLatentDangerService.reviewListDanger(pageParam);
         return ResponseHelper.buildResponse(result);
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/dao/mapper/LatentDangerMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.latentdanger.business.dao.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotations.DataAuth;
 import com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerBo;
 import com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerNoticeBo;
 import com.yeejoin.amos.latentdanger.business.param.LatentDangerListParam;
@@ -79,6 +80,7 @@ public interface LatentDangerMapper extends BaseMapper<LatentDanger> {
      * @param paramMap
      * @return
      */
+    @DataAuth(interfacePath = "latent/danger/page/list")
     IPage<LatentDanger> selectPageByParam(@Param("page") Page<LatentDanger> page, @Param("paramMap") Map<String, Object> paramMap);
 
     Integer selectUnFinishedCount(@Param("dangerState1") List<String> dangerState1, @Param("dangerState2") List<String> dangerState2);

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/feign/JcsFeignClient.java

 package com.yeejoin.amos.latentdanger.business.feign;
 
 import com.yeejoin.amos.boot.module.common.api.feign.MultipartSupportConfig;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -23,4 +25,11 @@ public interface JcsFeignClient {
      **/
     @RequestMapping(value = "/org-usr/amos/{orgUserId}", method = RequestMethod.GET)
     ResponseModel<AgencyUserModel> getAmosIdByUserId(@PathVariable String orgUserId);
+
+    /**
+     * 查询用户单位信息
+     * @return ResponseModel<ReginParams.PersonIdentity>
+     */
+    @GetMapping(value = "/org-usr/getLoginUserDetails")
+    FeignClientResult getJcsUser();
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/core/aop/EnumFillAop.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.latentdanger.core.aop;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
-import com.yeejoin.amos.latentdanger.business.constants.Constants;
 import com.yeejoin.amos.latentdanger.common.enums.LatentDangerLevelEnum;
 import com.yeejoin.amos.latentdanger.common.enums.LatentDangerReformTypeEnum;
 import org.aspectj.lang.JoinPoint;
@@ -17,7 +16,6 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -43,14 +41,14 @@ public class EnumFillAop {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         // 获取隐患等级枚举
         synchronized (this) {
-            if (ValidationUtil.isEmpty(LatentDangerLevelEnum.enumMap)) {
+            if (ValidationUtil.isEmpty(LatentDangerLevelEnum.supervisionDangerLevelEnumMap)) {
                 List<DictionarieValueModel> dicResult =
                         Systemctl.dictionarieClient.dictValues(bizType + LatentDangerLevelEnum.dictCode).getResult();
                 dicResult.forEach(dic -> LatentDangerLevelEnum.addEnumDynamic(dic.getDictDataDesc(), dic.getDictDataValue(), dic.getDictDataKey(),
                         "", dic.getOrderNum()));
             }
             // 获取治理方式枚举
-            if (ValidationUtil.isEmpty(LatentDangerReformTypeEnum.enumMap)) {
+            if (ValidationUtil.isEmpty(LatentDangerReformTypeEnum.supervisionReformTypeEnumMap)) {
                 List<DictionarieValueModel> dicResult =
                         Systemctl.dictionarieClient.dictValues(bizType + LatentDangerReformTypeEnum.dictCode).getResult();
                 dicResult.forEach(dic -> LatentDangerReformTypeEnum.addEnumDynamic(dic.getDictDataDesc(), dic.getDictDataValue(), dic.getDictDataKey()));

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

@@ -219,12 +219,9 @@ public class InputItemController extends AbstractBaseController {
     @ApiOperation(value = "分页查询检查项", notes = "分页查询检查项")
     @RequestMapping(value = "/queryItemByPage", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse queryItemByPage(
-            @ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests,
-            @ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) {
-        ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getOrgCode(reginParams);
-        HashMap<String, Object> paramMap = new HashMap<String, Object>();
-        paramMap.put("orgCode", loginOrgCode);
+            @ApiParam(value = "组合查询条件", defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests,
+            @ApiParam(value = "分页参数", defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) {
+        HashMap<String, Object> paramMap = new HashMap<>();
         InputItemPageParam criterias = InputItemParamUtil.fillInputItemPageParam(queryRequests, pageable, paramMap);
         Page<InputItemVo> page = inputItemService.queryInputItemByPage(criterias);
         return CommonResponseUtil.success(page);

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

@@ -52,13 +52,14 @@ public class PlanController extends AbstractBaseController {
     @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);
+//        ReginParams reginParams = getSelectedOrgInfo();
+//        String loginOrgCode = getOrgCode(reginParams);
+//        HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, null);
 //        buildRequestCxt();
-        PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, commonPageable, paramMap);
+        PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, commonPageable, new HashMap<>());
         Page<HashMap<String, Object>> list = planService.getPlanInfo(param);
         return CommonResponseUtil.success(list);
     }

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

@@ -15,6 +15,7 @@ import com.yeejoin.amos.supervision.business.vo.CodeOrderVo;
 import com.yeejoin.amos.supervision.business.vo.PlanTaskVo;
 import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
 import com.yeejoin.amos.supervision.common.enums.*;
+import com.yeejoin.amos.supervision.core.framework.PersonIdentify;
 import com.yeejoin.amos.supervision.exception.YeeException;
 import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
 import org.slf4j.Logger;
@@ -481,6 +482,7 @@ public class PlanTaskController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "消防监督任务查询-mobile", notes = "根据用户条件查询所有计划任务")
     @RequestMapping(value = "/queryPlanTask", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    @PersonIdentify
     public ResponseModel qryLoginUserPlanTask(
             @ApiParam(value = "人员") @RequestParam(value = "userId", required = false) Long userId,
             @ApiParam(value = "开始日期") @RequestParam(value = "startTime", required = false) String startTime,

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/CheckReportMapper.java

@@ -4,6 +4,7 @@ package com.yeejoin.amos.supervision.business.dao.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotations.DataAuth;
 import com.yeejoin.amos.supervision.business.dto.CheckReportMapperDto;
 import com.yeejoin.amos.supervision.core.common.dto.CheckReportCompanyDto;
 import com.yeejoin.amos.supervision.core.common.dto.CheckReportDto;
@@ -21,6 +22,7 @@ public interface CheckReportMapper extends BaseMapper<CheckReport> {
      */
     CheckReportMapperDto queryByPlanTaskId(long id);
 
+    @DataAuth(interfacePath = "supervision/check/report/page")
     IPage<CheckReportDto> selectPageList(Page page, @Param("queryParam") CheckReportParamDto queryParam);
 
     CheckReportDto selectDetailById(@Param("checkReportId") Long id);

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/InputItemMapper.java

 package com.yeejoin.amos.supervision.business.dao.mapper;
 
+import com.yeejoin.amos.boot.biz.common.annotations.DataAuth;
 import com.yeejoin.amos.supervision.business.param.InputItemPageParam;
 import com.yeejoin.amos.supervision.business.vo.InputItemVo;
 import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
@@ -17,8 +18,10 @@ public interface InputItemMapper {
 
     List<HashMap<String, Object>> countByCatalogId(HashMap<String, Object> paramMap);
 
+    @DataAuth(interfacePath = "api/inputItem/queryItemByPage")
     long countInputItemInfoData(InputItemPageParam param);
 
+    @DataAuth(interfacePath = "api/inputItem/queryItemByPage")
     List<InputItemVo> getInputItemInfo(InputItemPageParam param);
 
     List<InputItemVo> getInputItemListByNames(@Param("itemNames") String[] items, @Param("orgCode") String orgCode);

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/PlanMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.supervision.business.dao.mapper;
 import java.util.HashMap;
 import java.util.List;
 
+import com.yeejoin.amos.boot.biz.common.annotations.DataAuth;
 import org.apache.ibatis.annotations.Param;
 
 import com.yeejoin.amos.supervision.business.param.PlanInfoPageParam;
@@ -26,12 +27,14 @@ public interface PlanMapper extends BaseMapper {
 	 * @param param
 	 * @return
 	 */
+	@DataAuth(interfacePath = "supervision/api/plan/list")
 	long countPlanInfoData(PlanInfoPageParam param);
 	/**
 	 * 按照查询巡检计划概要列表
 	 * @param param
 	 * @return
 	 */
+	@DataAuth(interfacePath = "supervision/api/plan/list")
 	List<HashMap<String, Object>> getPlanInfo(PlanInfoPageParam param);
 	/**
 	 * 按照查询巡检计划概不分页

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/PlanTaskMapper.java

 package com.yeejoin.amos.supervision.business.dao.mapper;
 
+import com.yeejoin.amos.boot.biz.common.annotations.DataAuth;
 import com.yeejoin.amos.supervision.business.entity.mybatis.CheckChkExListBo;
 import com.yeejoin.amos.supervision.business.entity.mybatis.PlanTaskPointInputItemBo;
 import com.yeejoin.amos.supervision.business.entity.mybatis.PointCheckDetailBo;
@@ -77,6 +78,7 @@ public interface PlanTaskMapper extends BaseMapper {
      * @param params
      * @return
      */
+    @DataAuth(interfacePath = "api/planTask/queryPlanTask")
     List<HashMap<String, Object>> getPlanTasks(HashMap<String, Object> params);
 
     /**
@@ -153,6 +155,7 @@ public interface PlanTaskMapper extends BaseMapper {
      */
     List<CheckChkExListBo> getChkExList(CheckPtListPageParam param);
 
+    @DataAuth(interfacePath = "api/planTask/queryPlanTask")
     long getPlanTasksCount(HashMap<String, Object> params);
 
     Map<String, Object> getPlanTaskStatisticsForApp(HashMap<String, Object> params);

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/param/LatentDangerPatrolItemParam.java

@@ -5,9 +5,6 @@ import lombok.Data;
 /**
  * @author keyong
  * @title: LatentDangerPatrolItemParam
- * <pre>
- * @description: TODO
- * </pre>
  * @date 2021/1/26 14:48
  */
 @Data

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/param/PlanInfoPageParam.java

@@ -68,6 +68,11 @@ public class PlanInfoPageParam extends CommonPageable {
 	 */
 	private int finishStatus;
 
+	/**
+	 * 登录用户id
+	 */
+	private String loginUserId;
+
 	public String getOwnerId() {
 		return ownerId;
 	}
@@ -155,4 +160,12 @@ public class PlanInfoPageParam extends CommonPageable {
 	public void setFinishStatus(int finishStatus) {
 		this.finishStatus = finishStatus;
 	}
+
+	public String getLoginUserId() {
+		return loginUserId;
+	}
+
+	public void setLoginUserId(String loginUserId) {
+		this.loginUserId = loginUserId;
+	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java

@@ -12,7 +12,11 @@ import com.yeejoin.amos.boot.biz.common.excel.DataSources;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.supervision.business.dao.mapper.HiddenDangerMapper;
-import com.yeejoin.amos.supervision.business.dao.repository.*;
+import com.yeejoin.amos.supervision.business.dao.repository.ICheckInputDao;
+import com.yeejoin.amos.supervision.business.dao.repository.ICheckShotDao;
+import com.yeejoin.amos.supervision.business.dao.repository.IHiddenDangerDao;
+import com.yeejoin.amos.supervision.business.dao.repository.IPlanDao;
+import com.yeejoin.amos.supervision.business.dao.repository.IPointDao;
 import com.yeejoin.amos.supervision.business.dto.HiddenDangerDto;
 import com.yeejoin.amos.supervision.business.dto.HiddenDangerExportDataDto;
 import com.yeejoin.amos.supervision.business.dto.HiddenDangerImportDto;
@@ -23,7 +27,11 @@ import com.yeejoin.amos.supervision.common.enums.CheckTypeSuEnum;
 import com.yeejoin.amos.supervision.common.enums.DangerCheckTypeLevelEnum;
 import com.yeejoin.amos.supervision.common.enums.DangerHandleTypeEnum;
 import com.yeejoin.amos.supervision.core.common.dto.DangerDto;
-import com.yeejoin.amos.supervision.dao.entity.*;
+import com.yeejoin.amos.supervision.dao.entity.CheckInput;
+import com.yeejoin.amos.supervision.dao.entity.CheckShot;
+import com.yeejoin.amos.supervision.dao.entity.HiddenDanger;
+import com.yeejoin.amos.supervision.dao.entity.Plan;
+import com.yeejoin.amos.supervision.dao.entity.Point;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -33,7 +41,12 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -274,6 +287,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         result.put("accompanyingUserName", plan.getLeadPeopleNames());
         result.put("checkUnitId",plan.getCheckUnitId());
         result.put("checkUnitName",plan.getCheckUnitName());
+        result.put("leadPeopleId", plan.getLeadPeopleIds());
+        result.put("leadPeopleName", plan.getLeadPeopleNames());
         this.buildCheckInfo(result, hiddenDangerDto.getCheckInputId());
         return result;
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanServiceImpl.java

 package com.yeejoin.amos.supervision.business.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
@@ -7,6 +8,8 @@ import com.google.common.base.Joiner;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.enums.WorkFlowEnum;
 import com.yeejoin.amos.boot.biz.common.service.IWorkflowExcuteService;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.supervision.business.constants.XJConstant;
@@ -99,8 +102,14 @@ public class PlanServiceImpl implements IPlanService {
     @Autowired
     private IPlanAuditLogDao planAuditLogDao;
 
+    @Autowired
+    RedisUtils redisUtils;
+
     @Override
     public Page<HashMap<String, Object>> getPlanInfo(PlanInfoPageParam param) {
+        ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId()
+                , RequestContext.getToken())).toString(), ReginParams.class);
+        param.setLoginUserId(reginParam.getPersonIdentity().getPersonSeq());
         long total = planMapper.countPlanInfoData(param);
         Set<String> userIds = new HashSet<>();
         List<HashMap<String, Object>> content = planMapper.getPlanInfo(param);

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanTaskServiceImpl.java

 package com.yeejoin.amos.supervision.business.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.beust.jcommander.internal.Sets;
 import com.google.common.base.Joiner;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.supervision.business.constants.XJConstant;
@@ -54,6 +58,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.text.ParseException;
@@ -105,6 +110,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
     @Autowired
     private RulePlanService rulePlanService;
 
+    @Autowired
+    RedisUtils redisUtils;
+
     @Override
     public Page<HashMap<String, Object>> getPlanTaskInfo(PlanTaskPageParam params) {
         long total = planTaskMapper.countPlanTask(params);
@@ -592,6 +600,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
     @Override
     public Page<HashMap<String, Object>> getPlanTasks(HashMap<String, Object> params, CommonPageable pageParam) {
         List<HashMap<String, Object>> content = Lists.newArrayList();
+        ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId()
+                , RequestContext.getToken())).toString(), ReginParams.class);
+        params.put("loginUserId", reginParam.getPersonIdentity().getPersonSeq());
         long total = planTaskMapper.getPlanTasksCount(params);
         if (total == 0) {
             return new PageImpl<>(content, pageParam, total);

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/util/InputItemParamUtil.java

@@ -67,7 +67,6 @@ public class InputItemParamUtil {
                 }
             }
         }
-        param.setOrgCode(perMap.get("orgCode").toString());
         if (commonPageable != null) {
             param.setOffset(Integer.parseInt(String.valueOf(commonPageable.getOffset())));
             param.setPageNumber(commonPageable.getPageNumber());

amos-boot-system-latentdanger/src/main/resources/application.properties

@@ -60,4 +60,5 @@ pagehelper.support-methods-arguments=true
 feign.httpclient.connection-timeout=5000
 
 video.fegin.name=video
-latentDanger.feign.name=AMOS-LATENT-DANGER
+latentDanger.feign.name=AMOS-LATENT-DANGER
\ No newline at end of file
+Knowledgebase.fegin.name=AMOS-API-KNOWLEDGEBASE
\ No newline at end of file

amos-boot-system-latentdanger/src/main/resources/db/mapper/LatentDangerMapper.xml

@@ -963,10 +963,6 @@
         <where>
             deleted = 0
             <foreach collection="paramMap" index="key" item="value">
-                <if test="key == 'orgCode' and value != null and value != ''">
-                    and (a.org_code like concat(#{value}, "*%") or a.org_code like concat(#{value}, "-%") or
-                    a.org_code = #{value})
-                </if>
                 <if test="key == 'bizType' and value != null and value != ''">
                     and a.biz_type = #{value}
                 </if>
@@ -1021,6 +1017,12 @@
                 <if test="key == 'endDeadline' and value != null and value != ''">
                     and a.reform_limit_date <![CDATA[ <= ]]> #{value}
                 </if>
+                <if test="key == 'leadPeopleId' and value != null and value != ''">
+                    and ( 1=1 or a.biz_info->'$.leadPeopleId' = #{value})
+                </if>
+                <if test="key == 'reformLeaderId' and value != null and value != ''">
+                    and ( 1=1 or a.reform_json->'$.reformLeaderId' = #{value})
+                </if>
             </foreach>
         </where>
         <if test="paramMap.order != null and paramMap.order == 1">

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

@@ -46,9 +46,9 @@ linux.img.path = /
 ## emqx
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
-emqx.broker=tcp://172.16.11.33:1883
-emqx.user-name=admin
-emqx.password=public
+emqx.broker=tcp://172.16.10.85:1883
+emqx.user-name=super
+emqx.password=a123456
 emqx.max-inflight=1000
 
 file.url=http://39.98.45.134:9000/
\ No newline at end of file

amos-boot-system-supervision/src/main/resources/db/mapper/CheckReportMapper.xml

@@ -55,9 +55,6 @@
             <if test="queryParam != null and queryParam.checkUser != null and queryParam.checkUser != ''">
                 and cr.check_user like concat('%', #{queryParam.checkUser}, '%')
             </if>
-            <if test="queryParam != null and queryParam.orgCode != null and queryParam.orgCode != ''">
-                and cr.org_code like concat(#{queryParam.orgCode}, '%')
-            </if>
         </where>
         order by cr.create_date desc
     </select>

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_plan.xml

@@ -118,25 +118,24 @@
 		p_route b
 		WHERE
 		a.route_Id = b.id and a.is_delete = 0
-	<if test="planName!=null"> and a.name like concat(concat("%",#{planName}),"%")</if>
-	<if test="checkTypeId!=null and checkTypeId != '' "> and a.check_type_id = #{checkTypeId}</if>
-	<if test="leadPerson!=null and leadPerson != '' "> and a.lead_people_ids = #{leadPerson}</if>
-	<if test="routeId!=null"> and a.route_Id = #{routeId}</if>
-	<if test="remark!=null"> and a.remark1 like concat(concat("%",#{remark}),"%")</if>
-	<if test="userId!=null"> and FIND_IN_SET(#{userId},a.user_id)</if>
-	<if test="orgCode!=null"> and (a.org_Code like concat (#{orgCode},"*%") or a.org_Code like concat
-		(#{orgCode},"-%") or a.org_Code= #{orgCode})</if>
-	<if test="ownerId!=null"> and b.owner_id = #{ownerId}</if>
-	<if test="planStatus!=null and planStatus != '' "> and a.`status` = #{planStatus}</if>
+		<if test="planName!=null">and a.name like concat(concat("%",#{planName}),"%")</if>
+		<if test="checkTypeId!=null and checkTypeId != '' ">and a.check_type_id = #{checkTypeId}</if>
+		<if test="leadPerson!=null and leadPerson != '' ">and a.lead_people_ids = #{leadPerson}</if>
+		<if test="routeId!=null">and a.route_Id = #{routeId}</if>
+		<if test="remark!=null">and a.remark1 like concat(concat("%",#{remark}),"%")</if>
+		<if test="userId!=null">and FIND_IN_SET(#{userId},a.user_id)</if>
+		<!--	<if test="orgCode!=null"> and (a.org_Code like concat (#{orgCode},"*%") or a.org_Code like concat-->
+		<!--		(#{orgCode},"-%") or a.org_Code= #{orgCode})</if>-->
+		<if test="ownerId!=null">and b.owner_id = #{ownerId}</if>
+		<if test="planStatus!=null and planStatus != '' ">and a.`status` = #{planStatus}</if>
 	</select>
 	<!--巡检计划查询 -->
 	<select id="getPlanInfo" resultType="java.util.HashMap">
 	SELECT
 		a.id,a.name ,
-	    IFNULL(a.plan_begin,"") planBegin,
+		IFNULL(a.plan_begin,'') planBegin,
 	    a.`status`,
-	    IFNULL(a.plan_end,"") planEnd,
-	    a.plan_end planEnd,
+		IFNULL(a.plan_end,'') planEnd,
 	    a.plan_type planType,
 	    b.name routeName,
 	    a.route_id routeId,
@@ -174,8 +173,8 @@
 		<if test="routeId!=null"> and a.route_Id = #{routeId}</if>
 		<if test="remark!=null"> and a.remark1 like concat(concat("%",#{remark}),"%")</if>
 		<if test="userId!=null"> and FIND_IN_SET(#{userId},a.user_id)</if>
-		<if test="orgCode!=null"> and (a.org_Code like concat (#{orgCode},"*%") or a.org_Code like concat
-			(#{orgCode},"-%")or a.org_Code= #{orgCode})</if>
+		<!--		<if test="orgCode!=null"> and (a.org_Code like concat (#{orgCode},"*%") or a.org_Code like concat-->
+		<!--			(#{orgCode},"-%")or a.org_Code= #{orgCode})</if>-->
 		<if test="ownerId!=null"> and b.owner_id = #{ownerId}</if>
 		<if test="planStatus!=null and planStatus != '' "> and a.`status` = #{planStatus}</if>
 		order by a.id desc

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -187,24 +187,16 @@
         (SELECT
         pt.id planTaskId,
         pt.org_code orgCode,
+        pt.org_code,
         p.name taskName,
         p.check_type_name checkTypeName,
         P.check_type_id checkTypeId,
         p.id planId,
         pt.status,
         pt.user_id userId,
-        date_format(
-        pt.begin_time,
-        '%Y-%m-%d %H:%i:%s'
-        ) beginTime,
-        date_format(
-        pt.end_time,
-        '%Y-%m-%d %H:%i:%s'
-        ) endTime,
-        date_format(
-        pt.check_date,
-        '%Y-%m-%d %H:%i:%s'
-        ) checkDate,
+        date_format(pt.begin_time, '%Y-%m-%d %H:%i:%s') beginTime,
+        date_format(pt.end_time, '%Y-%m-%d %H:%i:%s') endTime,
+        date_format(pt.check_date,'%Y-%m-%d %H:%i:%s') checkDate,
         pt.point_num as taskPlanNum,
         pt.finish_num finishNum,
         (pt.point_num - pt.finish_num) as waitNum,

pom.xml

@@ -27,7 +27,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.5-SNAPSHOT</amos.version>
+		<amos.version>1.6.6-SNAPSHOT</amos.version>
 		<itext.version>7.1.1</itext.version>
 	</properties>