修改扫描无用引用

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/CatalogTreeMapper.java

 package com.yeejoin.amos.patrol.business.dao.mapper;
 
-import java.util.HashMap;
-import java.util.List;
-
+import com.yeejoin.amos.patrol.business.param.CatalogTreePageParam;
 import org.apache.ibatis.annotations.Param;
 
-import com.yeejoin.amos.patrol.business.param.CatalogTreePageParam;
+import java.util.HashMap;
+import java.util.List;
 
 public interface CatalogTreeMapper extends BaseMapper {
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/CheckMapper.java

 package com.yeejoin.amos.patrol.business.dao.mapper;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeejoin.amos.patrol.business.entity.mybatis.CheckDetailBo;
-import com.yeejoin.amos.patrol.business.entity.mybatis.CheckInfoBo;
-import com.yeejoin.amos.patrol.business.entity.mybatis.CheckInputBo;
-import com.yeejoin.amos.patrol.business.entity.mybatis.CheckTraListBo;
-import com.yeejoin.amos.patrol.business.entity.mybatis.CheckUserBo;
-import com.yeejoin.amos.patrol.business.param.CheckInfoListPageParam;
-import com.yeejoin.amos.patrol.business.param.CheckInfoPageParam;
-import com.yeejoin.amos.patrol.business.param.CheckPtListPageParam;
-import com.yeejoin.amos.patrol.business.param.CheckRecordParam;
-import com.yeejoin.amos.patrol.business.param.CheckStatisticalParam;
+import com.yeejoin.amos.patrol.business.entity.mybatis.*;
+import com.yeejoin.amos.patrol.business.param.*;
 import com.yeejoin.amos.patrol.business.util.CheckDetailInputPageParam;
 import com.yeejoin.amos.patrol.business.vo.CheckAnalysisVo;
 import com.yeejoin.amos.patrol.business.vo.CheckInfoVo;
 import com.yeejoin.amos.patrol.core.common.response.PointCheckInfoBusinessRespone;
 import com.yeejoin.amos.patrol.core.common.response.PointCheckInfoRespone;
-import com.yeejoin.amos.patrol.business.entity.mybatis.PlanRoutePointBo;
-import com.yeejoin.amos.patrol.business.entity.mybatis.PointCheckDetailBo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public interface CheckMapper extends BaseMapper {
 

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

 package com.yeejoin.amos.patrol.business.dao.mapper;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
-import com.yeejoin.amos.patrol.dao.entity.PointInputItem;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
 import com.yeejoin.amos.patrol.business.param.InputItemPageParam;
 import com.yeejoin.amos.patrol.business.vo.InputItemVo;
+import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
 import com.yeejoin.amos.patrol.dao.entity.InputItem;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Repository
 @Mapper
 public interface InputItemMapper extends BaseMapper<InputItem> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PlanTaskDetailMapper.java

 package com.yeejoin.amos.patrol.business.dao.mapper;
 
-import java.util.Map;
-
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Map;
+
 public interface PlanTaskDetailMapper extends BaseMapper {
 	void finishTaskDetail(@Param(value="planTaskDetailId") long planTaskDetailId, @Param(value="pointId") long pointId, @Param(value="planTaskId") long planTaskId
 						, @Param(value="executorId") String executorId);

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

 package com.yeejoin.amos.patrol.business.dao.mapper;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.yeejoin.amos.patrol.dao.entity.Plan;
-import org.apache.ibatis.annotations.Param;
-
 import com.yeejoin.amos.patrol.business.entity.mybatis.CheckChkExListBo;
 import com.yeejoin.amos.patrol.business.entity.mybatis.PlanTaskPointInputItemBo;
 import com.yeejoin.amos.patrol.business.entity.mybatis.PointCheckDetailBo;
@@ -16,9 +8,15 @@ import com.yeejoin.amos.patrol.business.param.PlanTaskPageParam;
 import com.yeejoin.amos.patrol.business.vo.CodeOrderVo;
 import com.yeejoin.amos.patrol.business.vo.LeavePlanTaskVo;
 import com.yeejoin.amos.patrol.business.vo.PlanTaskVo;
+import com.yeejoin.amos.patrol.dao.entity.Plan;
 import com.yeejoin.amos.patrol.dao.entity.PlanTask;
 import com.yeejoin.amos.patrol.dao.entity.PointInputItem;
-import org.springframework.data.jpa.repository.Query;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public interface PlanTaskMapper extends BaseMapper {
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PointMapper.java

 package com.yeejoin.amos.patrol.business.dao.mapper;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.patrol.business.vo.*;
-import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
-import com.yeejoin.amos.patrol.dao.entity.Point;
-import org.apache.ibatis.annotations.Param;
-
 import com.yeejoin.amos.patrol.business.entity.mybatis.CheckPtListBo;
 import com.yeejoin.amos.patrol.business.param.CheckPtListPageParam;
 import com.yeejoin.amos.patrol.business.param.PointImportQueryParam;
+import com.yeejoin.amos.patrol.business.vo.*;
 import com.yeejoin.amos.patrol.core.common.response.PointResponse;
-import com.yeejoin.amos.patrol.dao.entity.PointConfig;
+import com.yeejoin.amos.patrol.dao.entity.Point;
 import com.yeejoin.amos.patrol.dao.entity.PointPhoto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public interface PointMapper extends BaseMapper {
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/QueryStatsMapper.java

 package com.yeejoin.amos.patrol.business.dao.mapper;
 
-import java.util.HashMap;
-import java.util.List;
-
 import com.yeejoin.amos.patrol.business.param.CheckStatsListPageParam;
 import com.yeejoin.amos.patrol.business.vo.CheckStatsVo;
 
+import java.util.List;
+
 public interface QueryStatsMapper extends BaseMapper {
 
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/RouteMapper.java

 package com.yeejoin.amos.patrol.business.dao.mapper;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.yeejoin.amos.patrol.business.param.RoutePageParam;
 import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
 import com.yeejoin.amos.patrol.core.common.request.RoutePointInputItemRequest;
 import com.yeejoin.amos.patrol.core.common.response.RoutePointRespone;
-import com.yeejoin.amos.patrol.core.common.response.RouteResponse;
-import com.yeejoin.amos.patrol.dao.entity.InputItem;
-import com.yeejoin.amos.patrol.dao.entity.Point;
 import com.yeejoin.amos.patrol.dao.entity.PointInputItem;
 import com.yeejoin.amos.patrol.dao.entity.Route;
 import com.yeejoin.amos.patrol.dao.entity.RoutePointItem;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public interface RouteMapper extends BaseMapper, com.baomidou.mybatisplus.core.mapper.BaseMapper<Route> {
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/AppVersionDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import org.springframework.data.jpa.repository.Query;
-
 import com.yeejoin.amos.patrol.dao.entity.AppVersion;
+import org.springframework.data.jpa.repository.Query;
 
 public interface AppVersionDao extends BaseDao<AppVersion, Long>{
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/BaseDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import java.io.Serializable;
-import java.util.List;
-
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
@@ -10,6 +7,9 @@ import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.NoRepositoryBean;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * 基础dao
  * 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/ICatalogTreeDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.patrol.dao.entity.CatalogTree;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.yeejoin.amos.patrol.dao.entity.CatalogTree;
+import java.util.List;
 @Repository("catalogTreeDao")
 public interface ICatalogTreeDao extends BaseDao<CatalogTree, Long> {
 	

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/ICheckDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
+import com.yeejoin.amos.patrol.dao.entity.Check;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.patrol.dao.entity.Check;
-
 import java.util.List;
 
 @Repository("checkDao")

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/ICheckInputDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import org.springframework.stereotype.Repository;
-
 import com.yeejoin.amos.patrol.dao.entity.CheckInput;
+import org.springframework.stereotype.Repository;
 
 @Repository("checkInput")
 public interface ICheckInputDao extends BaseDao<CheckInput, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/ICheckShotDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.patrol.dao.entity.CheckShot;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.patrol.dao.entity.CheckShot;
+import java.util.List;
 
 @Repository("checkShotDao")
 public interface ICheckShotDao extends BaseDao<CheckShot, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IConfigDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.patrol.dao.entity.Config;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.patrol.dao.entity.Config;
-import com.yeejoin.amos.patrol.dao.entity.Task;
+import java.util.List;
 
 @Repository("configDao")
 public interface IConfigDao extends BaseDao<Config, Long>{

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IMeasuresDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.patrol.dao.entity.Measure;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.patrol.dao.entity.Measure;
+import java.util.List;
 
 @Repository("measuresDao")
 public interface IMeasuresDao  extends BaseDao<Measure, Long>{

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IMsgDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.patrol.dao.entity.Msg;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.patrol.dao.entity.Msg;
+import java.util.List;
 @Repository("iMsgDao")
 public interface IMsgDao extends BaseDao<Msg, Long>{
 	@Query(value = "select  count(1) from p_msg where user_id = ?1 and is_read = 0", nativeQuery = true)

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IMsgSubscribeDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.patrol.dao.entity.MsgSubscribe;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.yeejoin.amos.patrol.dao.entity.MsgSubscribe;
+import java.util.List;
 
 @Repository("msgSubscribeDao")
 public interface IMsgSubscribeDao extends BaseDao<MsgSubscribe, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IPlanTaskDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
+import com.yeejoin.amos.patrol.dao.entity.PlanTask;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.yeejoin.amos.patrol.dao.entity.PlanTask;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
 
 @Repository("planTaskDao")
 public interface IPlanTaskDao extends BaseDao<PlanTask, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IPlanTaskDetailDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
+import java.util.List;
 @Repository("planTaskDetail")
 public interface IPlanTaskDetailDao extends BaseDao<PlanTaskDetail, Long> {
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IPointClassifyDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import java.util.List;
-
-import com.yeejoin.amos.patrol.dao.entity.RoutePoint;
+import com.yeejoin.amos.patrol.dao.entity.PointClassify;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.yeejoin.amos.patrol.dao.entity.PointClassify;
+import java.util.List;
 
 @Repository("iPointClassifyDao")
 public interface IPointClassifyDao extends BaseDao<PointClassify, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IPointInputItemDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.patrol.dao.entity.PointInputItem;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.yeejoin.amos.patrol.dao.entity.PointInputItem;
+import java.util.List;
 
 @Repository("iPointInputItemDao")
 public interface IPointInputItemDao extends BaseDao<PointInputItem, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IPointPhotoDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.patrol.dao.entity.PointPhoto;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.yeejoin.amos.patrol.dao.entity.PointPhoto;
+import java.util.List;
 
 @Repository("iPointPhotoDao")
 public interface IPointPhotoDao extends BaseDao<PointPhoto, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IRoutePointItemDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.patrol.dao.entity.RoutePointItem;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.yeejoin.amos.patrol.dao.entity.RoutePointItem;
+import java.util.List;
 
 public interface IRoutePointItemDao extends BaseDao<RoutePointItem, Long> {
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/ITaskDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import java.util.List;
-import java.util.Optional;
-
+import com.yeejoin.amos.patrol.dao.entity.Task;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.patrol.dao.entity.Task;
+import java.util.List;
+import java.util.Optional;
 
 @Repository("taskDao")
 public interface ITaskDao extends BaseDao<Task, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/ITaskDetailDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.patrol.dao.entity.TaskDetail;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.patrol.dao.entity.TaskDetail;
+import java.util.List;
 
 @Repository("taskDetailDao")
 public interface ITaskDetailDao extends BaseDao<TaskDetail, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/ITaskFeedbackDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.patrol.dao.entity.TaskFeedback;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.patrol.dao.entity.TaskFeedback;
+import java.util.List;
 
 @Repository("taskFeedbackDao")
 public interface ITaskFeedbackDao extends BaseDao<TaskFeedback, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/ITaskForwardLogDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.patrol.dao.entity.TaskForwardLog;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.patrol.dao.entity.TaskForwardLog;
+import java.util.List;
 
 @Repository("taskForwardLogDao")
 public interface ITaskForwardLogDao extends BaseDao<TaskForwardLog, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/ITaskPictureDao.java

 package com.yeejoin.amos.patrol.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.patrol.dao.entity.TaskPicture;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.patrol.dao.entity.TaskPicture;
+import java.util.List;
 
 @Repository("taskPictureDao")
 public interface ITaskPictureDao extends BaseDao<TaskPicture, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/entity/mybatis/EquipmentInputItem.java

 package com.yeejoin.amos.patrol.business.entity.mybatis;
 
-import com.yeejoin.amos.component.rule.Label;
-import com.yeejoin.amos.component.rule.RuleFact;
-
 import java.io.Serializable;
 
 public class EquipmentInputItem implements Serializable {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/entity/mybatis/PointBo.java

 package com.yeejoin.amos.patrol.business.entity.mybatis;
 
-import java.util.List;
-
 import com.yeejoin.amos.patrol.dao.entity.InputItem;
 import com.yeejoin.amos.patrol.dao.entity.Point;
 import com.yeejoin.amos.patrol.dao.entity.PointClassify;
 
+import java.util.List;
+
 public class PointBo {
 
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/entity/mybatis/RouteBo.java

 package com.yeejoin.amos.patrol.business.entity.mybatis;
 
-import java.util.List;
-
 import com.yeejoin.amos.patrol.dao.entity.Point;
 import com.yeejoin.amos.patrol.dao.entity.Route;
 
+import java.util.List;
+
 public class RouteBo {
 	
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/entity/mybatis/TaskBo.java

 package com.yeejoin.amos.patrol.business.entity.mybatis;
 
-import java.util.List;
-
 import com.yeejoin.amos.patrol.business.vo.TaskDetailVo;
 import com.yeejoin.amos.patrol.dao.entity.Task;
-import com.yeejoin.amos.patrol.dao.entity.TaskDetail;
+
+import java.util.List;
 
 public class TaskBo {
 	private Task taskInfo; // 任务信息

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/entity/mybatis/TaskworkBo.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.patrol.business.entity.mybatis;
 
 import com.yeejoin.amos.patrol.business.entity.mybatis.extend.TaskworkExtend;
 import lombok.Data;
+
 import java.util.Date;
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/action/AcceptEquipmentRules.java

@@ -13,7 +13,6 @@ import com.yeejoin.amos.patrol.common.enums.CheckStatusEnum;
 import com.yeejoin.amos.patrol.common.enums.YesOrNoEnum;
 import com.yeejoin.amos.patrol.dao.entity.CheckInput;
 import com.yeejoin.amos.patrol.dao.entity.InputItem;
-import com.yeejoin.amos.patrol.mqtt.WebMqttComponent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/AppServiceImpl.java

 package com.yeejoin.amos.patrol.business.service.impl;
 
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.patrol.business.dao.mapper.LatentDangerMapper;
-import com.yeejoin.amos.patrol.common.enums.YesOrNoEnum;
-import com.yeejoin.amos.patrol.common.remote.RemoteWorkFlowService;
-
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.yeejoin.amos.patrol.business.dao.mapper.PlanTaskMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.RiskJudgmentTaskMapper;
 import com.yeejoin.amos.patrol.business.dao.repository.AppVersionDao;
@@ -19,8 +10,12 @@ import com.yeejoin.amos.patrol.business.param.UserMsgInitParam;
 import com.yeejoin.amos.patrol.business.service.intfc.IAppService;
 import com.yeejoin.amos.patrol.business.service.intfc.IMsgSubscribeService;
 import com.yeejoin.amos.patrol.common.enums.MsgSubscribeTypeEnum;
+import com.yeejoin.amos.patrol.common.remote.RemoteWorkFlowService;
 import com.yeejoin.amos.patrol.dao.entity.AppVersion;
 import com.yeejoin.amos.patrol.dao.entity.MsgSubscribe;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CatalogTreeServiceImpl.java

 package com.yeejoin.amos.patrol.business.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-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.springframework.util.ObjectUtils;
-
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.dao.mapper.CatalogTreeMapper;
@@ -24,8 +11,14 @@ import com.yeejoin.amos.patrol.business.service.intfc.ICatalogTreeService;
 import com.yeejoin.amos.patrol.dao.entity.CatalogTree;
 import com.yeejoin.amos.patrol.exception.YeeException;
 import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
-
 import net.sf.json.JSONObject;
+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.springframework.util.ObjectUtils;
+
+import java.util.*;
 
 @Service("catalogTreeService")
 public class CatalogTreeServiceImpl implements ICatalogTreeService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

 
 package com.yeejoin.amos.patrol.business.service.impl;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-import javax.transaction.Transactional;
-
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
-import com.yeejoin.amos.feign.systemctl.model.MessageModel;
-import com.yeejoin.amos.patrol.business.bo.CheckInputSyncBo;
-import com.yeejoin.amos.patrol.business.dao.mapper.*;
-import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
-import com.yeejoin.amos.patrol.business.service.intfc.IPatrolDataSyncService;
-import com.yeejoin.amos.patrol.dao.entity.Plan;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.assertj.core.util.Sets;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cglib.beans.BeanMap;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.support.TransactionSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-import org.springframework.util.ObjectUtils;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -43,36 +7,24 @@ import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.MessageModel;
+import com.yeejoin.amos.patrol.business.bo.CheckInputSyncBo;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
-import com.yeejoin.amos.patrol.business.dao.repository.ICatalogTreeDao;
-import com.yeejoin.amos.patrol.business.dao.repository.ICheckDao;
-import com.yeejoin.amos.patrol.business.dao.repository.ICheckInputDao;
-import com.yeejoin.amos.patrol.business.dao.repository.ICheckShotDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IInputItemDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IPlanTaskDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IPlanTaskDetailDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IPointClassifyDao;
+import com.yeejoin.amos.patrol.business.dao.mapper.*;
+import com.yeejoin.amos.patrol.business.dao.repository.*;
 import com.yeejoin.amos.patrol.business.dto.CheckDto;
-import com.yeejoin.amos.patrol.business.entity.mybatis.CheckDetailBo;
-import com.yeejoin.amos.patrol.business.entity.mybatis.CheckInfoBo;
-import com.yeejoin.amos.patrol.business.entity.mybatis.CheckInputBo;
-import com.yeejoin.amos.patrol.business.entity.mybatis.CheckTraListBo;
-import com.yeejoin.amos.patrol.business.entity.mybatis.CheckUserBo;
-import com.yeejoin.amos.patrol.business.entity.mybatis.EquipmentInputItemRo;
-import com.yeejoin.amos.patrol.business.entity.mybatis.PlanRoutePointBo;
-import com.yeejoin.amos.patrol.business.entity.mybatis.PointCheckDetailBo;
+import com.yeejoin.amos.patrol.business.entity.mybatis.*;
 import com.yeejoin.amos.patrol.business.feign.EquipFeign;
-import com.yeejoin.amos.patrol.business.param.CheckInfoListPageParam;
-import com.yeejoin.amos.patrol.business.param.CheckInfoPageParam;
-import com.yeejoin.amos.patrol.business.param.CheckInputParam;
-import com.yeejoin.amos.patrol.business.param.CheckPtListPageParam;
-import com.yeejoin.amos.patrol.business.param.CheckRecordParam;
-import com.yeejoin.amos.patrol.business.param.CheckStatisticalParam;
+import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
+import com.yeejoin.amos.patrol.business.param.*;
 import com.yeejoin.amos.patrol.business.service.intfc.ICheckService;
 import com.yeejoin.amos.patrol.business.service.intfc.IEquipmentHandlerService;
+import com.yeejoin.amos.patrol.business.service.intfc.IPatrolDataSyncService;
 import com.yeejoin.amos.patrol.business.service.intfc.IPointService;
 import com.yeejoin.amos.patrol.business.util.CheckDetailInputPageParam;
 import com.yeejoin.amos.patrol.business.util.Toke;
@@ -82,27 +34,30 @@ import com.yeejoin.amos.patrol.common.enums.CheckStatusEnum;
 import com.yeejoin.amos.patrol.common.enums.PointLevelEnum;
 import com.yeejoin.amos.patrol.common.enums.PointStatusEnum;
 import com.yeejoin.amos.patrol.common.enums.RuleTypeEnum;
-import com.yeejoin.amos.patrol.core.common.response.AppCheckInputRespone;
-import com.yeejoin.amos.patrol.core.common.response.AppPointCheckRespone;
-import com.yeejoin.amos.patrol.core.common.response.CalendarStatusCountRespone;
-import com.yeejoin.amos.patrol.core.common.response.CommonPage;
-import com.yeejoin.amos.patrol.core.common.response.GraphInitDataResponse;
-import com.yeejoin.amos.patrol.core.common.response.PatrolUserRespone;
-import com.yeejoin.amos.patrol.core.common.response.PointInfoResponse;
-import com.yeejoin.amos.patrol.core.common.response.PointPositionInfoSyn3DRespone;
-import com.yeejoin.amos.patrol.core.common.response.QueryCriteriaRespone;
-import com.yeejoin.amos.patrol.core.common.response.RouteResponse;
+import com.yeejoin.amos.patrol.core.common.response.*;
 import com.yeejoin.amos.patrol.core.util.DateUtil;
 import com.yeejoin.amos.patrol.core.util.StringUtil;
-import com.yeejoin.amos.patrol.dao.entity.Check;
-import com.yeejoin.amos.patrol.dao.entity.CheckInput;
-import com.yeejoin.amos.patrol.dao.entity.CheckShot;
-import com.yeejoin.amos.patrol.dao.entity.InputItem;
-import com.yeejoin.amos.patrol.dao.entity.PlanTask;
-import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
-import com.yeejoin.amos.patrol.dao.entity.Point;
-import com.yeejoin.amos.patrol.dao.entity.PointClassify;
+import com.yeejoin.amos.patrol.dao.entity.*;
 import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.assertj.core.util.Sets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanMap;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.support.TransactionSynchronization;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
+import javax.transaction.Transactional;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service("checkService")
 public class CheckServiceImpl implements ICheckService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/EquipmentHandlerServiceImpl.java

@@ -3,14 +3,10 @@ package com.yeejoin.amos.patrol.business.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-
 import com.yeejoin.amos.component.rule.RuleTrigger;
-import com.yeejoin.amos.patrol.business.dao.mapper.InputItemMapper;
 import com.yeejoin.amos.patrol.business.dao.repository.IInputItemDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IPointClassifyDao;
 import com.yeejoin.amos.patrol.business.entity.mybatis.EquipmentInputItemRo;
 import com.yeejoin.amos.patrol.business.service.intfc.IEquipmentHandlerService;
-import com.yeejoin.amos.patrol.business.util.HttpUtil;
 import com.yeejoin.amos.patrol.business.util.StringUtil;
 import com.yeejoin.amos.patrol.business.util.Toke;
 import com.yeejoin.amos.patrol.common.enums.RuleTypeEnum;
@@ -19,15 +15,12 @@ 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.core.io.support.PropertiesLoaderUtils;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.foundation.context.SpringContextHelper;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * @author keyong

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/InputItemServiceImpl.java

 package com.yeejoin.amos.patrol.business.service.impl;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.patrol.business.dao.mapper.InputItemMapper;
+import com.yeejoin.amos.patrol.business.dao.mapper.RouteMapper;
+import com.yeejoin.amos.patrol.business.dao.repository.IInputItemDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IPointInputItemDao;
+import com.yeejoin.amos.patrol.business.param.InputItemPageParam;
 import com.yeejoin.amos.patrol.business.service.intfc.ICatalogTreeService;
+import com.yeejoin.amos.patrol.business.service.intfc.IInputItemService;
+import com.yeejoin.amos.patrol.business.util.DaoCriteria;
+import com.yeejoin.amos.patrol.business.vo.InputItemVo;
 import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
+import com.yeejoin.amos.patrol.core.util.query.BaseQuerySpecification;
 import com.yeejoin.amos.patrol.dao.entity.CatalogTree;
+import com.yeejoin.amos.patrol.dao.entity.InputItem;
 import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -19,17 +26,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
-import com.yeejoin.amos.patrol.business.dao.mapper.InputItemMapper;
-import com.yeejoin.amos.patrol.business.dao.mapper.RouteMapper;
-import com.yeejoin.amos.patrol.business.dao.repository.IInputItemDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IPointInputItemDao;
-import com.yeejoin.amos.patrol.business.param.InputItemPageParam;
-import com.yeejoin.amos.patrol.business.service.intfc.IInputItemService;
-import com.yeejoin.amos.patrol.business.util.DaoCriteria;
-import com.yeejoin.amos.patrol.business.vo.InputItemVo;
-import com.yeejoin.amos.patrol.core.util.query.BaseQuerySpecification;
-import com.yeejoin.amos.patrol.dao.entity.InputItem;
-import com.yeejoin.amos.patrol.dao.entity.Point;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service("inputItemService")
 public class InputItemServiceImpl implements IInputItemService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java

@@ -7,7 +7,6 @@ import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
 import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
 import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
 import com.yeejoin.amos.boot.biz.common.service.impl.WorkflowExcuteServiceImpl;
@@ -15,13 +14,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.patrol.business.bo.CheckInputSyncBo;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
-import com.yeejoin.amos.patrol.business.dao.mapper.CheckInputMapper;
-import com.yeejoin.amos.patrol.business.dao.mapper.LatentDangerFlowRecordMapper;
-import com.yeejoin.amos.patrol.business.dao.mapper.LatentDangerMapper;
-import com.yeejoin.amos.patrol.business.dao.mapper.LatentDangerPatrolMapper;
-import com.yeejoin.amos.patrol.business.dao.mapper.RiskFactorCmMapper;
-import com.yeejoin.amos.patrol.business.dao.mapper.RiskFactorMapper;
-import com.yeejoin.amos.patrol.business.dao.mapper.RiskSourceMapper;
+import com.yeejoin.amos.patrol.business.dao.mapper.*;
 import com.yeejoin.amos.patrol.business.dao.repository.ICheckDao;
 import com.yeejoin.amos.patrol.business.dao.repository.ICheckShotDao;
 import com.yeejoin.amos.patrol.business.dao.repository.IInputItemDao;
@@ -39,12 +32,7 @@ import com.yeejoin.amos.patrol.business.entity.mybatis.extend.LatentDangerPatrol
 import com.yeejoin.amos.patrol.business.feign.Business;
 import com.yeejoin.amos.patrol.business.feign.EquipFeign;
 import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
-import com.yeejoin.amos.patrol.business.param.LatentDangerExcuteParam;
-import com.yeejoin.amos.patrol.business.param.LatentDangerListParam;
-import com.yeejoin.amos.patrol.business.param.LatentDangerNormalParam;
-import com.yeejoin.amos.patrol.business.param.LatentDangerPatrolItemParam;
-import com.yeejoin.amos.patrol.business.param.LatentDangerPatrolParam;
-import com.yeejoin.amos.patrol.business.param.PageParam;
+import com.yeejoin.amos.patrol.business.param.*;
 import com.yeejoin.amos.patrol.business.service.intfc.ILatentDangerService;
 import com.yeejoin.amos.patrol.business.service.intfc.IPatrolDataSyncService;
 import com.yeejoin.amos.patrol.business.service.intfc.IRiskJudgmentTaskService;
@@ -56,18 +44,7 @@ import com.yeejoin.amos.patrol.business.vo.DangerTimeAxisVo;
 import com.yeejoin.amos.patrol.business.vo.LatentDangerDetailRiskVo;
 import com.yeejoin.amos.patrol.business.vo.LatentDangerDetailVo;
 import com.yeejoin.amos.patrol.business.vo.LatentDangerListVo;
-import com.yeejoin.amos.patrol.common.enums.CheckModeEnum;
-import com.yeejoin.amos.patrol.common.enums.DangerHandleStateEnum;
-import com.yeejoin.amos.patrol.common.enums.DictTypeEnum;
-import com.yeejoin.amos.patrol.common.enums.ExecuteStateEnum;
-import com.yeejoin.amos.patrol.common.enums.InstanceKeyEnum;
-import com.yeejoin.amos.patrol.common.enums.LatentDangerExcuteTypeEnum;
-import com.yeejoin.amos.patrol.common.enums.LatentDangerLevelEnum;
-import com.yeejoin.amos.patrol.common.enums.LatentDangerOvertimeStateEnum;
-import com.yeejoin.amos.patrol.common.enums.LatentDangerReformTypeEnum;
-import com.yeejoin.amos.patrol.common.enums.LatentDangerStateEnum;
-import com.yeejoin.amos.patrol.common.enums.LatentDangerTypeEnum;
-import com.yeejoin.amos.patrol.common.enums.RiskFactorsCmStatusEnum;
+import com.yeejoin.amos.patrol.common.enums.*;
 import com.yeejoin.amos.patrol.common.remote.RemoteSpcService;
 import com.yeejoin.amos.patrol.common.remote.RemoteWebSocketServer;
 import com.yeejoin.amos.patrol.common.remote.RemoteWorkFlowService;
@@ -79,7 +56,6 @@ import com.yeejoin.amos.patrol.dao.entity.*;
 import com.yeejoin.amos.patrol.exception.YeeException;
 import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
 import com.yeejoin.amos.patrol.mqtt.WebMqttComponent;
-
 import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -99,19 +75,9 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
-import static org.hamcrest.CoreMatchers.nullValue;
 import static org.typroject.tyboot.core.foundation.context.RequestContext.getProduct;
 
 @Service("latentDangerService")

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/MeasuresServiceImpl.java

 package com.yeejoin.amos.patrol.business.service.impl;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.yeejoin.amos.patrol.business.dao.repository.IMeasuresDao;
 import com.yeejoin.amos.patrol.business.service.intfc.IMeasuresService;
 import com.yeejoin.amos.patrol.dao.entity.Measure;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 @Service("measuresService")
 public class MeasuresServiceImpl implements IMeasuresService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/MessageServiceImpl.java

 package com.yeejoin.amos.patrol.business.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
-
-import javax.transaction.Transactional;
-
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.patrol.business.feign.EquipFeign;
-import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
-import com.google.common.base.Joiner;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.dao.mapper.MsgMapper;
@@ -42,31 +11,35 @@ import com.yeejoin.amos.patrol.business.dao.repository.IRouteDao;
 import com.yeejoin.amos.patrol.business.entity.mybatis.CheckMsgBo;
 import com.yeejoin.amos.patrol.business.entity.mybatis.PushTargetBo;
 import com.yeejoin.amos.patrol.business.entity.mybatis.TaskMsgBo;
+import com.yeejoin.amos.patrol.business.feign.EquipFeign;
+import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
 import com.yeejoin.amos.patrol.business.param.MsgInfoPageParam;
 import com.yeejoin.amos.patrol.business.param.NoticePublishParam;
 import com.yeejoin.amos.patrol.business.param.PushMsgParam;
 import com.yeejoin.amos.patrol.business.service.intfc.IMessageService;
 import com.yeejoin.amos.patrol.business.util.StringUtil;
-import com.yeejoin.amos.patrol.business.util.ToolUtils;
 import com.yeejoin.amos.patrol.business.vo.MsgVo;
-import com.yeejoin.amos.patrol.common.enums.CheckEmailEnum;
-import com.yeejoin.amos.patrol.common.enums.CheckStatusEnum;
-import com.yeejoin.amos.patrol.common.enums.CheckTypeEnum;
-import com.yeejoin.amos.patrol.common.enums.JPushTypeEnum;
-import com.yeejoin.amos.patrol.common.enums.MsgTypeEnum;
-import com.yeejoin.amos.patrol.common.enums.PlanTaskDetailIsFinishEnum;
-import com.yeejoin.amos.patrol.common.enums.PlanTaskFinishStatusEnum;
-import com.yeejoin.amos.patrol.dao.entity.Msg;
-import com.yeejoin.amos.patrol.dao.entity.PlanTask;
-import com.yeejoin.amos.patrol.dao.entity.Point;
-import com.yeejoin.amos.patrol.dao.entity.Route;
-import com.yeejoin.amos.patrol.dao.entity.Task;
+import com.yeejoin.amos.patrol.common.enums.*;
+import com.yeejoin.amos.patrol.dao.entity.*;
 import com.yeejoin.amos.patrol.email.IEmailService;
 import com.yeejoin.amos.patrol.feign.PushFeignServer;
 import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
 import com.yeejoin.amos.patrol.jpush.AppMessagePushService;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.foundation.utils.Bean;
+
+import javax.transaction.Transactional;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/MsgSubscribeServiceImpl.java

 package com.yeejoin.amos.patrol.business.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.transaction.Transactional;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.domain.Sort.Order;
-import org.springframework.stereotype.Service;
-
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.dao.repository.IMsgDao;
 import com.yeejoin.amos.patrol.business.dao.repository.IMsgSubscribeDao;
@@ -23,6 +9,17 @@ import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.core.util.query.BaseQuerySpecification;
 import com.yeejoin.amos.patrol.dao.entity.Msg;
 import com.yeejoin.amos.patrol.dao.entity.MsgSubscribe;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.domain.Sort.Order;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.util.ArrayList;
+import java.util.List;
 
 @Service("msgSubscribeService")
 public class MsgSubscribeServiceImpl implements IMsgSubscribeService{

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

 package com.yeejoin.amos.patrol.business.service.impl;
 
-import java.util.*;
-
-import com.yeejoin.amos.patrol.core.util.StringUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-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.springframework.transaction.annotation.Transactional;
-
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.dao.mapper.PlanMapper;
 import com.yeejoin.amos.patrol.business.dao.repository.IPlanDao;
@@ -19,7 +8,17 @@ import com.yeejoin.amos.patrol.business.dao.repository.IPlanTaskDetailDao;
 import com.yeejoin.amos.patrol.business.param.PlanInfoPageParam;
 import com.yeejoin.amos.patrol.business.service.intfc.IPlanService;
 import com.yeejoin.amos.patrol.core.util.DateUtil;
+import com.yeejoin.amos.patrol.core.util.StringUtil;
 import com.yeejoin.amos.patrol.dao.entity.Plan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
 
 @Service("planService")
 public class PlanServiceImpl implements IPlanService {

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

@@ -11,16 +11,11 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.rule.RuleTrigger;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
-import com.yeejoin.amos.patrol.business.bo.CheckInputSyncBo;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.dao.mapper.PlanMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.PlanTaskDetailMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.PlanTaskMapper;
-import com.yeejoin.amos.patrol.business.dao.repository.ICheckDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IPlanDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IPlanTaskDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IPlanTaskDetailDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IRoutePointDao;
+import com.yeejoin.amos.patrol.business.dao.repository.*;
 import com.yeejoin.amos.patrol.business.dto.MsgRo;
 import com.yeejoin.amos.patrol.business.entity.mybatis.CheckChkExListBo;
 import com.yeejoin.amos.patrol.business.entity.mybatis.PointCheckDetailBo;
@@ -57,7 +52,6 @@ import org.apache.commons.compress.utils.Sets;
 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.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
@@ -72,17 +66,7 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PointServiceImpl.java

@@ -37,7 +37,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.*;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/QueryStatsServiceImpl.java

 package com.yeejoin.amos.patrol.business.service.impl;
 
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.stereotype.Service;
-
 import com.yeejoin.amos.patrol.business.dao.mapper.QueryStatsMapper;
 import com.yeejoin.amos.patrol.business.param.CheckStatsListPageParam;
 import com.yeejoin.amos.patrol.business.service.intfc.IQueryStatsService;
 import com.yeejoin.amos.patrol.business.vo.CheckStatsVo;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 @Service("queryStatsService")
 public class QueryStatsServiceImpl implements IQueryStatsService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/RiskJudgmentTaskServiceImpl.java

 package com.yeejoin.amos.patrol.business.service.impl;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.assertj.core.util.Sets;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Joiner;
@@ -25,13 +10,7 @@ import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
-import com.yeejoin.amos.patrol.business.dao.mapper.LatentDangerMapper;
-import com.yeejoin.amos.patrol.business.dao.mapper.RiskFactorMapper;
-import com.yeejoin.amos.patrol.business.dao.mapper.RiskJudgmentFillRecordMapper;
-import com.yeejoin.amos.patrol.business.dao.mapper.RiskJudgmentItemMapper;
-import com.yeejoin.amos.patrol.business.dao.mapper.RiskJudgmentTaskMapper;
-import com.yeejoin.amos.patrol.business.dao.mapper.RiskSourceMapper;
-import com.yeejoin.amos.patrol.business.dao.mapper.TaskworkMapper;
+import com.yeejoin.amos.patrol.business.dao.mapper.*;
 import com.yeejoin.amos.patrol.business.entity.mybatis.RiskJudgmentFillRecordBo;
 import com.yeejoin.amos.patrol.business.entity.mybatis.RiskJudgmentItemBo;
 import com.yeejoin.amos.patrol.business.entity.mybatis.RiskJudgmentTaskBo;
@@ -39,18 +18,20 @@ import com.yeejoin.amos.patrol.business.entity.mybatis.RiskSourceBo;
 import com.yeejoin.amos.patrol.business.service.intfc.IRiskJudgmentTaskService;
 import com.yeejoin.amos.patrol.business.util.RandomUtil;
 import com.yeejoin.amos.patrol.business.util.StringUtil;
-import com.yeejoin.amos.patrol.common.enums.BooleanEnum;
-import com.yeejoin.amos.patrol.common.enums.RiskJudgeTaskworkTypeEnum;
-import com.yeejoin.amos.patrol.common.enums.RiskJudgmentSelectStatusEnum;
-import com.yeejoin.amos.patrol.common.enums.RiskJudgmentStatusEnum;
-import com.yeejoin.amos.patrol.common.enums.RiskJudgmentTaskStatusEnum;
-import com.yeejoin.amos.patrol.common.enums.RiskLevelEnum;
-import com.yeejoin.amos.patrol.common.enums.TaskworkTypeEnum;
-import com.yeejoin.amos.patrol.common.enums.WorkFlowDefinitionKeyEnum;
+import com.yeejoin.amos.patrol.common.enums.*;
 import com.yeejoin.amos.patrol.common.remote.RemoteWorkFlowService;
 import com.yeejoin.amos.patrol.core.async.AsyncTask;
 import com.yeejoin.amos.patrol.core.util.DateUtil;
 import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
+import org.assertj.core.util.Sets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+
+import java.util.*;
 
 @Service("iSpcRiskJudgmentTaskService")
 public class RiskJudgmentTaskServiceImpl implements IRiskJudgmentTaskService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/RouteServiceImpl.java

 package com.yeejoin.amos.patrol.business.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.dao.mapper.InputItemMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.PointMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.RouteMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.RoutePointItemMapper;
-import com.yeejoin.amos.patrol.business.dao.repository.IInputItemDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IPlanDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IPointClassifyDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IPointDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IPointInputItemDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IRouteDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IRoutePointDao;
-import com.yeejoin.amos.patrol.business.dao.repository.IRoutePointItemDao;
-import com.yeejoin.amos.patrol.business.param.LoginUserParam;
+import com.yeejoin.amos.patrol.business.dao.repository.*;
 import com.yeejoin.amos.patrol.business.param.RoutePageParam;
-import com.yeejoin.amos.patrol.business.param.SynRouteInfoParam;
-import com.yeejoin.amos.patrol.business.param.SynRouteParam;
 import com.yeejoin.amos.patrol.business.service.intfc.IPlanService;
 import com.yeejoin.amos.patrol.business.service.intfc.IPlanTaskService;
 import com.yeejoin.amos.patrol.business.service.intfc.IRouteService;
 import com.yeejoin.amos.patrol.business.util.DaoCriteria;
-import com.yeejoin.amos.patrol.business.vo.InputItemVo;
 import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
-import com.yeejoin.amos.patrol.business.vo.PointVo;
 import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.core.common.request.RoutePointInputItemRequest;
 import com.yeejoin.amos.patrol.core.common.response.RoutePointRespone;
 import com.yeejoin.amos.patrol.core.enums.QueryOperatorEnum;
 import com.yeejoin.amos.patrol.core.util.query.BaseQuerySpecification;
-import com.yeejoin.amos.patrol.dao.entity.InputItem;
-import com.yeejoin.amos.patrol.dao.entity.Plan;
-import com.yeejoin.amos.patrol.dao.entity.Point;
-import com.yeejoin.amos.patrol.dao.entity.PointClassify;
-import com.yeejoin.amos.patrol.dao.entity.PointInputItem;
-import com.yeejoin.amos.patrol.dao.entity.Route;
-import com.yeejoin.amos.patrol.dao.entity.RoutePoint;
-import com.yeejoin.amos.patrol.dao.entity.RoutePointItem;
+import com.yeejoin.amos.patrol.dao.entity.*;
 import com.yeejoin.amos.patrol.exception.YeeException;
-import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
-
 import org.apache.commons.lang.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.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.*;
 
 @Service("routeService")
 public class RouteServiceImpl  extends ServiceImpl<RouteMapper, Route> implements IRouteService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/Safety3DDataSendServiceImpl.java

 package com.yeejoin.amos.patrol.business.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
 import com.google.common.base.Joiner;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.dao.mapper.CheckMapper;
@@ -25,18 +10,18 @@ import com.yeejoin.amos.patrol.business.feign.Business;
 import com.yeejoin.amos.patrol.business.service.intfc.ISafety3DDataSendService;
 import com.yeejoin.amos.patrol.business.util.CommonResponse;
 import com.yeejoin.amos.patrol.common.remote.RemoteServer;
-import com.yeejoin.amos.patrol.core.common.response.CheckInputResponse;
-import com.yeejoin.amos.patrol.core.common.response.PatrolUserRespone;
-import com.yeejoin.amos.patrol.core.common.response.PointCheckInfoBusinessRespone;
-import com.yeejoin.amos.patrol.core.common.response.PointCheckInfoRespone;
-import com.yeejoin.amos.patrol.core.common.response.PointInfoSyn3DRespone;
-import com.yeejoin.amos.patrol.core.common.response.PointPositionInfoSyn3DRespone;
-import com.yeejoin.amos.patrol.core.common.response.PointUserSyn3DRespone;
-import com.yeejoin.amos.patrol.core.common.response.RouteResponse;
-import com.yeejoin.amos.patrol.core.common.response.TaskInfoBusinessRespone;
-import com.yeejoin.amos.patrol.core.common.response.TaskInfoRespone;
+import com.yeejoin.amos.patrol.core.common.response.*;
 import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
 import com.yeejoin.amos.safety.common.cache.PointStatusCache;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
 @Service("safety3DDataSend")
 public class Safety3DDataSendServiceImpl implements ISafety3DDataSendService {
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/TaskReportService.java

@@ -5,12 +5,10 @@ import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.patrol.business.dao.mapper.TaskReportMapper;
 import com.yeejoin.amos.patrol.business.util.Toke;
 import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Component
 public class TaskReportService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/TaskServiceImpl.java

 package com.yeejoin.amos.patrol.business.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import javax.annotation.Resource;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.transaction.Transactional;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.quartz.JobDataMap;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.dao.mapper.CheckMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.TaskMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.TaskPictureMapper;
-import com.yeejoin.amos.patrol.business.dao.repository.ICheckShotDao;
-import com.yeejoin.amos.patrol.business.dao.repository.ITaskDao;
-import com.yeejoin.amos.patrol.business.dao.repository.ITaskDetailDao;
-import com.yeejoin.amos.patrol.business.dao.repository.ITaskFeedbackDao;
-import com.yeejoin.amos.patrol.business.dao.repository.ITaskForwardLogDao;
-import com.yeejoin.amos.patrol.business.dao.repository.ITaskPictureDao;
+import com.yeejoin.amos.patrol.business.dao.repository.*;
 import com.yeejoin.amos.patrol.business.entity.mybatis.PointCheckDetailBo;
 import com.yeejoin.amos.patrol.business.entity.mybatis.TaskBo;
 import com.yeejoin.amos.patrol.business.entity.mybatis.TaskFeedbackBo;
-import com.yeejoin.amos.patrol.business.param.TaskDetailParam;
-import com.yeejoin.amos.patrol.business.param.TaskInfoParam;
-import com.yeejoin.amos.patrol.business.param.TaskPageParam;
-import com.yeejoin.amos.patrol.business.param.TaskParam;
-import com.yeejoin.amos.patrol.business.param.TaskStatisticsParam;
+import com.yeejoin.amos.patrol.business.param.*;
 import com.yeejoin.amos.patrol.business.service.intfc.ITaskService;
 import com.yeejoin.amos.patrol.business.util.DaoCriteria;
 import com.yeejoin.amos.patrol.business.util.ToolUtils;
@@ -59,18 +20,31 @@ import com.yeejoin.amos.patrol.common.enums.TaskFeedbackType;
 import com.yeejoin.amos.patrol.common.enums.TaskStatusEnum;
 import com.yeejoin.amos.patrol.core.common.response.AppPointCheckRespone;
 import com.yeejoin.amos.patrol.core.util.query.BaseQuerySpecification;
-import com.yeejoin.amos.patrol.dao.entity.CheckShot;
-import com.yeejoin.amos.patrol.dao.entity.Task;
-import com.yeejoin.amos.patrol.dao.entity.TaskDetail;
-import com.yeejoin.amos.patrol.dao.entity.TaskFeedback;
-import com.yeejoin.amos.patrol.dao.entity.TaskForwardLog;
-import com.yeejoin.amos.patrol.dao.entity.TaskPicture;
+import com.yeejoin.amos.patrol.dao.entity.*;
 import com.yeejoin.amos.patrol.exception.YeeException;
 import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
 import com.yeejoin.amos.patrol.quartz.IJobService;
-
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+import org.apache.commons.collections.CollectionUtils;
+import org.quartz.JobDataMap;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.transaction.Transactional;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.regex.Pattern;
 
 
 @Service("taskService")

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IAppService.java

 package com.yeejoin.amos.patrol.business.service.intfc;
 
 
-
-import java.util.List;
-
 import com.yeejoin.amos.patrol.business.param.UserMsgInitParam;
 import com.yeejoin.amos.patrol.dao.entity.AppVersion;
 import com.yeejoin.amos.patrol.dao.entity.MsgSubscribe;
 
+import java.util.List;
+
 
 public interface IAppService {
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/ICatalogTreeService.java

 package com.yeejoin.amos.patrol.business.service.intfc;
 
-import java.util.HashMap;
-import java.util.List;
-
-import org.springframework.data.domain.Page;
-
 import com.yeejoin.amos.patrol.business.param.CatalogTreePageParam;
 import com.yeejoin.amos.patrol.dao.entity.CatalogTree;
+import org.springframework.data.domain.Page;
+
+import java.util.HashMap;
+import java.util.List;
 
 public interface ICatalogTreeService {
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/ICheckService.java

 package com.yeejoin.amos.patrol.business.service.intfc;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.data.domain.Page;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.dto.CheckDto;
-import com.yeejoin.amos.patrol.business.entity.mybatis.CheckDetailBo;
-import com.yeejoin.amos.patrol.business.entity.mybatis.CheckInfoBo;
-import com.yeejoin.amos.patrol.business.entity.mybatis.CheckInputBo;
-import com.yeejoin.amos.patrol.business.entity.mybatis.CheckTraListBo;
-import com.yeejoin.amos.patrol.business.entity.mybatis.CheckUserBo;
-import com.yeejoin.amos.patrol.business.entity.mybatis.PlanRoutePointBo;
-import com.yeejoin.amos.patrol.business.param.CheckInfoListPageParam;
-import com.yeejoin.amos.patrol.business.param.CheckInfoPageParam;
-import com.yeejoin.amos.patrol.business.param.CheckPtListPageParam;
-import com.yeejoin.amos.patrol.business.param.CheckRecordParam;
-import com.yeejoin.amos.patrol.business.param.CheckStatisticalParam;
+import com.yeejoin.amos.patrol.business.entity.mybatis.*;
+import com.yeejoin.amos.patrol.business.param.*;
 import com.yeejoin.amos.patrol.business.util.CheckDetailInputPageParam;
 import com.yeejoin.amos.patrol.business.util.Toke;
 import com.yeejoin.amos.patrol.business.vo.CheckAnalysisVo;
@@ -31,6 +15,12 @@ import com.yeejoin.amos.patrol.core.common.response.GraphInitDataResponse;
 import com.yeejoin.amos.patrol.core.common.response.QueryCriteriaRespone;
 import com.yeejoin.amos.patrol.dao.entity.CheckShot;
 import com.yeejoin.amos.patrol.exception.YeeException;
+import org.springframework.data.domain.Page;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public interface ICheckService {
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IInputItemService.java

 package com.yeejoin.amos.patrol.business.service.intfc;
 
-import java.util.HashMap;
-import java.util.List;
-
-import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
-import org.springframework.data.domain.Page;
-
 import com.yeejoin.amos.patrol.business.param.InputItemPageParam;
 import com.yeejoin.amos.patrol.business.util.DaoCriteria;
 import com.yeejoin.amos.patrol.business.vo.InputItemVo;
+import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
 import com.yeejoin.amos.patrol.dao.entity.InputItem;
+import org.springframework.data.domain.Page;
+
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * 	检查项业务处理实体

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/ILatentDangerService.java

 package com.yeejoin.amos.patrol.business.service.intfc;
 
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.data.domain.Page;
-
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.dto.DangerExecuteSubmitDto;
-import com.yeejoin.amos.patrol.business.param.LatentDangerExcuteParam;
-import com.yeejoin.amos.patrol.business.param.LatentDangerListParam;
-import com.yeejoin.amos.patrol.business.param.LatentDangerNormalParam;
-import com.yeejoin.amos.patrol.business.param.LatentDangerPatrolParam;
-import com.yeejoin.amos.patrol.business.param.PageParam;
+import com.yeejoin.amos.patrol.business.param.*;
 import com.yeejoin.amos.patrol.business.util.CommonResponse;
 import com.yeejoin.amos.patrol.business.vo.DangerTimeAxisVo;
 import com.yeejoin.amos.patrol.core.common.response.DangerListResponse;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author keyong

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IMeasuresService.java

 package com.yeejoin.amos.patrol.business.service.intfc;
 
-import java.util.List;
-
 import com.yeejoin.amos.patrol.dao.entity.Measure;
 
+import java.util.List;
+
 public interface IMeasuresService {
 
 	List<Measure> queryMeasuresByPointID(int pointID);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IMessageService.java

 package com.yeejoin.amos.patrol.business.service.intfc;
 
 
-import java.util.List;
-
-import org.springframework.data.domain.Page;
-
 import com.yeejoin.amos.patrol.business.param.MsgInfoPageParam;
 import com.yeejoin.amos.patrol.business.param.NoticePublishParam;
 import com.yeejoin.amos.patrol.business.param.PushMsgParam;
 import com.yeejoin.amos.patrol.business.vo.MsgVo;
-import com.yeejoin.amos.patrol.dao.entity.Check;
 import com.yeejoin.amos.patrol.dao.entity.Msg;
 import com.yeejoin.amos.patrol.dao.entity.PlanTask;
 import com.yeejoin.amos.patrol.dao.entity.Task;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
 
 public interface IMessageService {
 	

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IMsgSubscribeService.java

 package com.yeejoin.amos.patrol.business.service.intfc;
 
-import java.util.List;
-
-import org.springframework.data.domain.Page;
-
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.util.DaoCriteria;
 import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.dao.entity.Msg;
 import com.yeejoin.amos.patrol.dao.entity.MsgSubscribe;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
 
 public interface IMsgSubscribeService {
 	public List<MsgSubscribe> queryMsgSubscribes(String orgCode, String userId);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IPlanService.java

 package com.yeejoin.amos.patrol.business.service.intfc;
 
-import java.util.HashMap;
-import java.util.List;
-
-import org.springframework.data.domain.Page;
-
 import com.yeejoin.amos.patrol.business.param.PlanInfoPageParam;
 import com.yeejoin.amos.patrol.dao.entity.Plan;
+import org.springframework.data.domain.Page;
+
+import java.util.HashMap;
+import java.util.List;
 
 public interface IPlanService {
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IPlanTaskService.java

 package com.yeejoin.amos.patrol.business.service.intfc;
 
-import java.text.ParseException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.yeejoin.amos.patrol.business.util.Toke;
-import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
-import org.springframework.data.domain.Page;
-
 import com.yeejoin.amos.patrol.business.entity.mybatis.CheckChkExListBo;
 import com.yeejoin.amos.patrol.business.param.CheckPtListPageParam;
 import com.yeejoin.amos.patrol.business.param.PlanTaskPageParam;
 import com.yeejoin.amos.patrol.business.vo.CodeOrderVo;
 import com.yeejoin.amos.patrol.business.vo.LeavePlanTaskVo;
 import com.yeejoin.amos.patrol.business.vo.PlanTaskVo;
+import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.core.common.response.AppPointCheckRespone;
 import com.yeejoin.amos.patrol.dao.entity.PlanTask;
+import org.springframework.data.domain.Page;
+
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public interface IPlanTaskService {
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IQueryStatsService.java

 package com.yeejoin.amos.patrol.business.service.intfc;
 
-import org.springframework.data.domain.Page;
-
 import com.yeejoin.amos.patrol.business.param.CheckStatsListPageParam;
 import com.yeejoin.amos.patrol.business.vo.CheckStatsVo;
+import org.springframework.data.domain.Page;
 
 public interface IQueryStatsService {
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IRouteService.java

 package com.yeejoin.amos.patrol.business.service.intfc;
 
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yeejoin.amos.patrol.business.param.LoginUserParam;
-import com.yeejoin.amos.patrol.business.param.SynRouteParam;
-import com.yeejoin.amos.patrol.business.util.DaoCriteria;
-
-import org.springframework.data.domain.Page;
-
 import com.yeejoin.amos.patrol.business.param.RoutePageParam;
+import com.yeejoin.amos.patrol.business.util.DaoCriteria;
 import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
 import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.core.common.request.RoutePointInputItemRequest;
 import com.yeejoin.amos.patrol.core.common.response.RoutePointRespone;
-import com.yeejoin.amos.patrol.dao.entity.InputItem;
-import com.yeejoin.amos.patrol.dao.entity.Plan;
-import com.yeejoin.amos.patrol.dao.entity.Point;
-import com.yeejoin.amos.patrol.dao.entity.Route;
-import com.yeejoin.amos.patrol.dao.entity.RoutePoint;
+import com.yeejoin.amos.patrol.dao.entity.*;
+import org.springframework.data.domain.Page;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 public interface IRouteService extends IService<Route> {
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/ISafety3DDataSendService.java

 package com.yeejoin.amos.patrol.business.service.intfc;
 
-import java.util.List;
+import com.yeejoin.amos.patrol.core.common.response.*;
 
-import com.yeejoin.amos.patrol.core.common.response.PointCheckInfoBusinessRespone;
-import com.yeejoin.amos.patrol.core.common.response.PointCheckInfoRespone;
-import com.yeejoin.amos.patrol.core.common.response.PointInfoSyn3DRespone;
-import com.yeejoin.amos.patrol.core.common.response.RouteResponse;
-import com.yeejoin.amos.patrol.core.common.response.TaskInfoRespone;
+import java.util.List;
 
 public interface ISafety3DDataSendService {
 	

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/ITaskService.java

 package com.yeejoin.amos.patrol.business.service.intfc;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.quartz.JobDataMap;
-import org.springframework.data.domain.Page;
-
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.entity.mybatis.TaskBo;
@@ -18,6 +11,12 @@ import com.yeejoin.amos.patrol.business.vo.TaskStatisticsVo;
 import com.yeejoin.amos.patrol.dao.entity.Task;
 import com.yeejoin.amos.patrol.dao.entity.TaskFeedback;
 import com.yeejoin.amos.patrol.dao.entity.TaskPicture;
+import org.quartz.JobDataMap;
+import org.springframework.data.domain.Page;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 	巡检任务业务处理接口

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

 package com.yeejoin.amos.supervision.business.dao.mapper;
 
-import java.util.HashMap;
-import java.util.List;
-
 import com.yeejoin.amos.supervision.business.param.CatalogTreePageParam;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
+import java.util.List;
+
 public interface CatalogTreeMapper extends BaseMapper {
 
 	long countCatalogTreeData(CatalogTreePageParam param);

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.supervision.business.dto.HiddenDangerDto;
 import com.yeejoin.amos.supervision.dao.entity.HiddenDanger;
 import org.apache.ibatis.annotations.Param;
-import sun.awt.SunHints;
 
 import java.util.List;
 

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

 package com.yeejoin.amos.supervision.business.dao.mapper;
 
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.yeejoin.amos.supervision.business.entity.mybatis.CheckMsgBo;
 import com.yeejoin.amos.supervision.business.entity.mybatis.PushTargetBo;
 import com.yeejoin.amos.supervision.business.entity.mybatis.TaskMsgBo;
 import com.yeejoin.amos.supervision.business.param.MsgConfigParam;
 import com.yeejoin.amos.supervision.business.param.MsgInfoPageParam;
 import com.yeejoin.amos.supervision.business.vo.MsgVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 public interface MsgMapper extends BaseMapper{
 	

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

 package com.yeejoin.amos.supervision.business.dao.mapper;
 
-import java.util.HashMap;
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.biz.common.annotations.DataAuth;
-import org.apache.ibatis.annotations.Param;
-
 import com.yeejoin.amos.supervision.business.param.PlanInfoPageParam;
 import com.yeejoin.amos.supervision.dao.entity.Plan;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
 
 public interface PlanMapper extends BaseMapper<Plan>, com.yeejoin.amos.supervision.business.dao.mapper.BaseMapper {
 

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

 package com.yeejoin.amos.supervision.business.dao.mapper;
 
-import java.util.List;
-import java.util.Map;
-
 import com.yeejoin.amos.supervision.dao.entity.PlanTask;
 import com.yeejoin.amos.supervision.dao.entity.PlanTaskDetail;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 public interface PlanTaskDetailMapper extends BaseMapper {
 	void finishTaskDetail(@Param(value="planTaskDetailId") long planTaskDetailId, @Param(value="pointId") long pointId, @Param(value="planTaskId") long planTaskId
 						, @Param(value="executorId") String executorId , @Param(value="executorName") String executorName , @Param(value="size") int size,@Param(value="planTaskStatus") String planTaskStatus );

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

 package com.yeejoin.amos.supervision.business.dao.mapper;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.supervision.business.vo.PointInputItemNewVo;
 import com.yeejoin.amos.supervision.business.entity.mybatis.CheckPtListBo;
 import com.yeejoin.amos.supervision.business.param.CheckPtListPageParam;
 import com.yeejoin.amos.supervision.business.param.PointImportQueryParam;
 import com.yeejoin.amos.supervision.business.vo.LeavelMovePointVo;
+import com.yeejoin.amos.supervision.business.vo.PointInputItemNewVo;
 import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
 import com.yeejoin.amos.supervision.business.vo.PointVo;
+import com.yeejoin.amos.supervision.core.common.response.PointResponse;
 import com.yeejoin.amos.supervision.dao.entity.Point;
 import com.yeejoin.amos.supervision.dao.entity.PointInputItem;
+import com.yeejoin.amos.supervision.dao.entity.PointPhoto;
 import org.apache.ibatis.annotations.Param;
 
-import com.yeejoin.amos.supervision.core.common.response.PointResponse;
-import com.yeejoin.amos.supervision.dao.entity.PointPhoto;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public interface PointMapper extends BaseMapper<Point>, com.yeejoin.amos.supervision.business.dao.mapper.BaseMapper {
 

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

 package com.yeejoin.amos.supervision.business.dao.mapper;
 
-import java.util.List;
-
 import com.yeejoin.amos.supervision.business.param.CheckStatsListPageParam;
 import com.yeejoin.amos.supervision.business.vo.CheckStatsVo;
 
+import java.util.List;
+
 public interface QueryStatsMapper extends BaseMapper {
 
 	/**

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

 package com.yeejoin.amos.supervision.business.dao.mapper;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.yeejoin.amos.supervision.business.param.TaskPageParam;
-import org.apache.ibatis.annotations.Param;
-
 import com.yeejoin.amos.supervision.business.param.TaskDetailParam;
+import com.yeejoin.amos.supervision.business.param.TaskPageParam;
 import com.yeejoin.amos.supervision.business.param.TaskStatisticsParam;
 import com.yeejoin.amos.supervision.business.vo.CheckTaskDetailVo;
 import com.yeejoin.amos.supervision.business.vo.TaskDetailVo;
 import com.yeejoin.amos.supervision.business.vo.TaskStatisticsVo;
 import com.yeejoin.amos.supervision.core.common.response.TaskInfoRespone;
 import com.yeejoin.amos.supervision.dao.entity.Task;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 
 public interface TaskMapper extends BaseMapper{

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/AppVersionDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import org.springframework.data.jpa.repository.Query;
-
 import com.yeejoin.amos.supervision.dao.entity.AppVersion;
+import org.springframework.data.jpa.repository.Query;
 
 public interface AppVersionDao extends BaseDao<AppVersion, Long>{
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/BaseDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import java.io.Serializable;
-import java.util.List;
-
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
@@ -10,6 +7,9 @@ import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.NoRepositoryBean;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * 基础dao
  * 

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/ICatalogTreeDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.supervision.dao.entity.CatalogTree;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.yeejoin.amos.supervision.dao.entity.CatalogTree;
+import java.util.List;
 @Repository("catalogTreeDao")
 public interface ICatalogTreeDao extends BaseDao<CatalogTree, Long> {
 	

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/ICheckDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
+import com.yeejoin.amos.supervision.dao.entity.Check;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.supervision.dao.entity.Check;
-
 import java.util.List;
 
 @Repository("checkDao")

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/ICheckInputDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import org.springframework.stereotype.Repository;
-
 import com.yeejoin.amos.supervision.dao.entity.CheckInput;
+import org.springframework.stereotype.Repository;
 
 @Repository("checkInput")
 public interface ICheckInputDao extends BaseDao<CheckInput, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/ICheckShotDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.supervision.dao.entity.CheckShot;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.supervision.dao.entity.CheckShot;
-import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
 
 @Repository("checkShotDao")
 public interface ICheckShotDao extends BaseDao<CheckShot, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IConfigDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.supervision.dao.entity.Config;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.supervision.dao.entity.Config;
+import java.util.List;
 
 @Repository("configDao")
 public interface IConfigDao extends BaseDao<Config, Long>{

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IMeasuresDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.supervision.dao.entity.Measure;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.supervision.dao.entity.Measure;
+import java.util.List;
 
 @Repository("measuresDao")
 public interface IMeasuresDao  extends BaseDao<Measure, Long>{

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IMsgDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.supervision.dao.entity.Msg;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.supervision.dao.entity.Msg;
+import java.util.List;
 @Repository("iMsgDao")
 public interface IMsgDao extends BaseDao<Msg, Long>{
 	@Query(value = "select  count(1) from p_msg where user_id = ?1 and is_read = 0", nativeQuery = true)

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IMsgSubscribeDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.supervision.dao.entity.MsgSubscribe;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.yeejoin.amos.supervision.dao.entity.MsgSubscribe;
+import java.util.List;
 
 @Repository("msgSubscribeDao")
 public interface IMsgSubscribeDao extends BaseDao<MsgSubscribe, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IPlanTaskDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
-
+import com.yeejoin.amos.supervision.dao.entity.PlanTask;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.yeejoin.amos.supervision.dao.entity.PlanTask;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
 
 @Repository("planTaskDao")
 public interface IPlanTaskDao extends BaseDao<PlanTask, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IPlanTaskDetailDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.supervision.dao.entity.PlanTaskDetail;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.yeejoin.amos.supervision.dao.entity.PlanTaskDetail;
+import java.util.List;
 @Repository("planTaskDetail")
 public interface IPlanTaskDetailDao extends BaseDao<PlanTaskDetail, Long> {
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IPointClassifyDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.supervision.dao.entity.PointClassify;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.yeejoin.amos.supervision.dao.entity.PointClassify;
+import java.util.List;
 
 @Repository("iPointClassifyDao")
 public interface IPointClassifyDao extends BaseDao<PointClassify, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IPointInputItemDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.supervision.dao.entity.PointInputItem;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.yeejoin.amos.supervision.dao.entity.PointInputItem;
+import java.util.List;
 
 @Repository("iPointInputItemDao")
 public interface IPointInputItemDao extends BaseDao<PointInputItem, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IPointPhotoDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.supervision.dao.entity.PointPhoto;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.yeejoin.amos.supervision.dao.entity.PointPhoto;
+import java.util.List;
 
 @Repository("iPointPhotoDao")
 public interface IPointPhotoDao extends BaseDao<PointPhoto, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/ITaskDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import java.util.List;
-import java.util.Optional;
-
+import com.yeejoin.amos.supervision.dao.entity.Task;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.supervision.dao.entity.Task;
+import java.util.List;
+import java.util.Optional;
 
 @Repository("taskDao")
 public interface ITaskDao extends BaseDao<Task, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/ITaskDetailDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.supervision.dao.entity.TaskDetail;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.supervision.dao.entity.TaskDetail;
+import java.util.List;
 
 @Repository("taskDetailDao")
 public interface ITaskDetailDao extends BaseDao<TaskDetail, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/ITaskFeedbackDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.supervision.dao.entity.TaskFeedback;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.supervision.dao.entity.TaskFeedback;
+import java.util.List;
 
 @Repository("taskFeedbackDao")
 public interface ITaskFeedbackDao extends BaseDao<TaskFeedback, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/ITaskForwardLogDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.supervision.dao.entity.TaskForwardLog;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.supervision.dao.entity.TaskForwardLog;
+import java.util.List;
 
 @Repository("taskForwardLogDao")
 public interface ITaskForwardLogDao extends BaseDao<TaskForwardLog, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/ITaskPictureDao.java

 package com.yeejoin.amos.supervision.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.supervision.dao.entity.TaskPicture;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.supervision.dao.entity.TaskPicture;
+import java.util.List;
 
 @Repository("taskPictureDao")
 public interface ITaskPictureDao extends BaseDao<TaskPicture, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/entity/mybatis/PointBo.java

 package com.yeejoin.amos.supervision.business.entity.mybatis;
 
-import java.util.List;
-
 import com.yeejoin.amos.supervision.dao.entity.InputItem;
 import com.yeejoin.amos.supervision.dao.entity.Point;
 import com.yeejoin.amos.supervision.dao.entity.PointClassify;
 
+import java.util.List;
+
 public class PointBo {
 
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/entity/mybatis/RouteBo.java

 package com.yeejoin.amos.supervision.business.entity.mybatis;
 
-import java.util.List;
-
 import com.yeejoin.amos.supervision.dao.entity.Point;
 import com.yeejoin.amos.supervision.dao.entity.Route;
 
+import java.util.List;
+
 public class RouteBo {
 	
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/entity/mybatis/TaskBo.java

 package com.yeejoin.amos.supervision.business.entity.mybatis;
 
-import java.util.List;
-
 import com.yeejoin.amos.supervision.business.vo.TaskDetailVo;
 import com.yeejoin.amos.supervision.dao.entity.Task;
 
+import java.util.List;
+
 public class TaskBo {
 	private Task taskInfo; // 任务信息
 	private List<TaskDetailVo> taskDetails; // 任务检查项信息列表

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/entity/mybatis/TaskworkBo.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.supervision.business.entity.mybatis;
 
 import com.yeejoin.amos.supervision.business.entity.mybatis.extend.TaskworkExtend;
 import lombok.Data;
+
 import java.util.Date;
 
 /**

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

@@ -8,19 +8,18 @@ import com.yeejoin.amos.supervision.business.dao.mapper.PlanTaskMapper;
 import com.yeejoin.amos.supervision.business.dao.mapper.RiskJudgmentTaskMapper;
 import com.yeejoin.amos.supervision.business.dao.repository.AppVersionDao;
 import com.yeejoin.amos.supervision.business.dao.repository.IMsgSubscribeDao;
+import com.yeejoin.amos.supervision.business.param.UserMsgInitParam;
 import com.yeejoin.amos.supervision.business.service.intfc.IAppService;
 import com.yeejoin.amos.supervision.business.service.intfc.IMsgSubscribeService;
-import com.yeejoin.amos.supervision.common.remote.RemoteWorkFlowService;
+import com.yeejoin.amos.supervision.common.enums.MsgSubscribeTypeEnum;
 import com.yeejoin.amos.supervision.common.enums.YesOrNoEnum;
+import com.yeejoin.amos.supervision.common.remote.RemoteWorkFlowService;
+import com.yeejoin.amos.supervision.dao.entity.AppVersion;
+import com.yeejoin.amos.supervision.dao.entity.MsgSubscribe;
 import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.yeejoin.amos.supervision.business.param.UserMsgInitParam;
-import com.yeejoin.amos.supervision.common.enums.MsgSubscribeTypeEnum;
-import com.yeejoin.amos.supervision.dao.entity.AppVersion;
-import com.yeejoin.amos.supervision.dao.entity.MsgSubscribe;
-
 import java.util.ArrayList;
 import java.util.List;