修复扫描问题，去掉无用引用

amos-boot-module/amos-boot-module-api/amos-boot-module-avic-api/src/main/java/com/yeejoin/amos/avic/face/orm/dao/AvicCustomPathMapper.java

 package com.yeejoin.amos.avic.face.orm.dao;
 
-import org.apache.ibatis.annotations.Mapper;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.avic.face.orm.entity.AvicCustomPath;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-api/amos-boot-module-avic-api/src/main/java/com/yeejoin/amos/avic/face/orm/dao/AvicEMailMapper.java

 package com.yeejoin.amos.avic.face.orm.dao;
 
-import org.apache.ibatis.annotations.Mapper;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.avic.face.orm.entity.AvicCustomPath;
 import com.yeejoin.amos.avic.face.orm.entity.AvicEMail;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-api/amos-boot-module-avic-api/src/main/java/com/yeejoin/amos/avic/face/orm/dao/AvicSendRecodelMapper.java

 package com.yeejoin.amos.avic.face.orm.dao;
 
-import org.apache.ibatis.annotations.Mapper;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.avic.face.orm.entity.AvicSenderRecord;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-api/amos-boot-module-avic-api/src/main/java/com/yeejoin/amos/avic/face/orm/entity/AvicCustomPath.java

@@ -2,9 +2,9 @@ package com.yeejoin.amos.avic.face.orm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-api/amos-boot-module-avic-api/src/main/java/com/yeejoin/amos/avic/face/orm/entity/AvicEMail.java

@@ -2,9 +2,7 @@ package com.yeejoin.amos.avic.face.orm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-api/amos-boot-module-avic-api/src/main/java/com/yeejoin/amos/avic/face/orm/entity/AvicSenderRecord.java

@@ -2,9 +2,7 @@ package com.yeejoin.amos.avic.face.orm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-api/amos-boot-module-fas-api/src/main/java/com/yeejoin/amos/fas/core/common/request/DateUtil.java

 package com.yeejoin.amos.fas.core.common.request;
 
+import org.apache.commons.lang.StringUtils;
+
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.ParsePosition;
@@ -8,8 +10,6 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
-import org.apache.commons.lang.StringUtils;
-
 /**
  * 日期工具类
  * 

amos-boot-module/amos-boot-module-api/amos-boot-module-fas-api/src/main/java/com/yeejoin/amos/fas/core/common/response/CommonPage.java

@@ -4,11 +4,11 @@
  */
 package com.yeejoin.amos.fas.core.common.response;
 
-import java.util.List;
-
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 
+import java.util.List;
+
 /**
  * <pre>
  * 分页数据

amos-boot-module/amos-boot-module-api/amos-boot-module-fas-api/src/main/java/com/yeejoin/amos/fas/core/common/response/RegionTreeResponse.java

 package com.yeejoin.amos.fas.core.common.response;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import org.apache.commons.lang.StringUtils;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.StringUtils;
-
 //import com.alibaba.druid.util.StringUtils;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 
 public class RegionTreeResponse {
 	

amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api/src/main/java/com/yeejoin/amos/knowledgebase/face/orm/dao/ESDocRepository.java

 package com.yeejoin.amos.knowledgebase.face.orm.dao;
 
 import com.yeejoin.amos.knowledgebase.face.orm.entity.ESDocEntity;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.elasticsearch.annotations.Query;
 import org.springframework.data.elasticsearch.repository.ElasticsearchCrudRepository;
 
 public interface ESDocRepository extends ElasticsearchCrudRepository<ESDocEntity, Long> {

amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api/src/main/java/com/yeejoin/amos/knowledgebase/face/orm/dao/TagValueMapper.java

 package com.yeejoin.amos.knowledgebase.face.orm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.knowledgebase.face.model.KnowledgeTagValueModel;
 import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeTagValue;
 import org.apache.ibatis.annotations.Param;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api/src/main/java/com/yeejoin/amos/knowledgebase/face/orm/entity/KnowledgeDocAnnotate.java

@@ -2,9 +2,9 @@ package com.yeejoin.amos.knowledgebase.face.orm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 import java.util.Date;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api/src/main/java/com/yeejoin/amos/knowledgebase/face/orm/entity/KnowledgeDocCategory.java

@@ -2,9 +2,9 @@ package com.yeejoin.amos.knowledgebase.face.orm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api/src/main/java/com/yeejoin/amos/knowledgebase/face/orm/entity/KnowledgeDocComments.java

@@ -2,9 +2,9 @@ package com.yeejoin.amos.knowledgebase.face.orm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api/src/main/java/com/yeejoin/amos/knowledgebase/face/orm/entity/KnowledgeDynamicsGroup.java

@@ -2,9 +2,9 @@ package com.yeejoin.amos.knowledgebase.face.orm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api/src/main/java/com/yeejoin/amos/knowledgebase/face/orm/entity/KnowledgeDynamicsOption.java

@@ -2,9 +2,9 @@ package com.yeejoin.amos.knowledgebase.face.orm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api/src/main/java/com/yeejoin/amos/knowledgebase/face/orm/entity/KnowledgeDynamicsValue.java

@@ -2,9 +2,9 @@ package com.yeejoin.amos.knowledgebase.face.orm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api/src/main/java/com/yeejoin/amos/knowledgebase/face/orm/entity/KnowledgeInteractionCount.java

@@ -2,9 +2,9 @@ package com.yeejoin.amos.knowledgebase.face.orm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api/src/main/java/com/yeejoin/amos/knowledgebase/face/orm/entity/KnowledgeInteractionRecord.java

@@ -2,9 +2,9 @@ package com.yeejoin.amos.knowledgebase.face.orm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api/src/main/java/com/yeejoin/amos/knowledgebase/face/orm/entity/KnowledgeTag.java

@@ -2,9 +2,9 @@ package com.yeejoin.amos.knowledgebase.face.orm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api/src/main/java/com/yeejoin/amos/knowledgebase/face/orm/entity/KnowledgeTagGroup.java

@@ -2,9 +2,9 @@ package com.yeejoin.amos.knowledgebase.face.orm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api/src/main/java/com/yeejoin/amos/knowledgebase/face/orm/entity/KnowledgeTagInstance.java

@@ -2,9 +2,9 @@ package com.yeejoin.amos.knowledgebase.face.orm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api/src/main/java/com/yeejoin/amos/knowledgebase/face/orm/entity/KnowledgeTagValue.java

@@ -2,9 +2,9 @@ package com.yeejoin.amos.knowledgebase.face.orm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api/src/main/java/com/yeejoin/amos/knowledgebase/face/util/pdf/PdfBuilder.java

@@ -11,23 +11,16 @@ import com.itextpdf.layout.element.IBlockElement;
 import com.itextpdf.layout.element.IElement;
 import com.itextpdf.layout.font.FontProvider;
 import com.yeejoin.amos.knowledgebase.face.util.IOConfig;
-import org.apache.commons.io.FileUtils;
-import org.apache.xmlbeans.impl.validator.ValidatorUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 import org.jsoup.nodes.TextNode;
 import org.jsoup.select.Elements;
-import org.springframework.core.io.ClassPathResource;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URISyntaxException;
 import java.util.List;
 
-import static com.yeejoin.amos.knowledgebase.face.util.DataTransformator.file2Bytes;
 import static com.yeejoin.amos.knowledgebase.face.util.DataTransformator.inputStream2Bytes;
 
 /**

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/core/common/response/CommonPage.java

@@ -4,11 +4,11 @@
  */
 package com.yeejoin.amos.latentdanger.core.common.response;
 
-import java.util.List;
-
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 
+import java.util.List;
+
 /**
  * <pre>
  * 分页数据

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/core/common/request/RouteInfoRequest.java

 package com.yeejoin.amos.maintenance.core.common.request;
 
-import java.util.List;
-
 import com.yeejoin.amos.maintenance.dao.entity.Route;
 import com.yeejoin.amos.maintenance.dao.entity.RoutePoint;
 import com.yeejoin.amos.maintenance.dao.entity.RoutePointItem;
 
+import java.util.List;
+
 public class RouteInfoRequest {
 	
 	private Route route;

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/core/common/response/AppPointCheckRespone.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 public class AppPointCheckRespone {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/core/common/response/CommonPage.java

@@ -4,11 +4,11 @@
  */
 package com.yeejoin.amos.maintenance.core.common.response;
 
-import java.util.List;
-
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 
+import java.util.List;
+
 /**
  * <pre>
  * 分页数据

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/core/common/response/PointResponse.java

 package com.yeejoin.amos.maintenance.core.common.response;
 
-import java.util.List;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import com.yeejoin.amos.maintenance.dao.entity.PointConfig;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-import com.yeejoin.amos.maintenance.dao.entity.PointConfig;
+import java.util.List;
 
 @XmlRootElement
 public class PointResponse {

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/core/common/response/QueryCriteriaRespone.java

 package com.yeejoin.amos.maintenance.core.common.response;
 
-import java.util.List;
-import java.util.Map;
-
 import com.yeejoin.amos.maintenance.dao.entity.CatalogTree;
 import com.yeejoin.amos.maintenance.dao.entity.Point;
 
+import java.util.List;
+import java.util.Map;
+
 
 public class QueryCriteriaRespone {
 	

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/core/common/request/RouteInfoRequest.java

 package com.yeejoin.amos.patrol.core.common.request;
 
-import java.util.List;
-
 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 java.util.List;
+
 public class RouteInfoRequest {
 	
 	private Route route;

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/core/common/response/AppPointCheckRespone.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 public class AppPointCheckRespone {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/core/common/response/CommonPage.java

@@ -4,11 +4,11 @@
  */
 package com.yeejoin.amos.patrol.core.common.response;
 
-import java.util.List;
-
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 
+import java.util.List;
+
 /**
  * <pre>
  * 分页数据

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/core/common/response/PointResponse.java

 package com.yeejoin.amos.patrol.core.common.response;
 
-import java.util.List;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import com.yeejoin.amos.patrol.dao.entity.PointConfig;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-import com.yeejoin.amos.patrol.dao.entity.PointConfig;
+import java.util.List;
 
 @XmlRootElement
 public class PointResponse {

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/core/common/response/QueryCriteriaRespone.java

 package com.yeejoin.amos.patrol.core.common.response;
 
-import java.util.List;
-import java.util.Map;
-
 import com.yeejoin.amos.patrol.dao.entity.CatalogTree;
 import com.yeejoin.amos.patrol.dao.entity.Point;
 
+import java.util.List;
+import java.util.Map;
+
 
 public class QueryCriteriaRespone {
 	

amos-boot-module/amos-boot-module-api/amos-boot-module-precontrol-api/src/main/java/com/yeejoin/precontrol/common/listener/event/listener/MessageEventListener.java

@@ -3,11 +3,8 @@ package com.yeejoin.precontrol.common.listener.event.listener;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
-import com.yeejoin.precontrol.common.entity.Person;
 import com.yeejoin.precontrol.common.entity.PersonMessage;
 import com.yeejoin.precontrol.common.enums.MessageAttributeEnum;
-import com.yeejoin.precontrol.common.enums.MessageSubTypeEnum;
-import com.yeejoin.precontrol.common.enums.MessageTypeEnum;
 import com.yeejoin.precontrol.common.listener.event.MessageEvent;
 import com.yeejoin.precontrol.common.service.IPersonMessageService;
 import lombok.SneakyThrows;
@@ -16,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
 import java.util.List;

amos-boot-module/amos-boot-module-api/amos-boot-module-precontrol-api/src/main/java/com/yeejoin/precontrol/common/service/hk/impl/HkPlatFormServiceImpl.java

@@ -23,7 +23,6 @@ import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @Author: songLei

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/request/RouteInfoRequest.java

 package com.yeejoin.amos.supervision.core.common.request;
 
-import java.util.List;
-
 import com.yeejoin.amos.supervision.dao.entity.Route;
 import com.yeejoin.amos.supervision.dao.entity.RoutePoint;
 import com.yeejoin.amos.supervision.dao.entity.RoutePointItem;
 
+import java.util.List;
+
 public class RouteInfoRequest {
 	
 	private Route route;

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/response/CommonPage.java

@@ -4,11 +4,11 @@
  */
 package com.yeejoin.amos.supervision.core.common.response;
 
-import java.util.List;
-
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 
+import java.util.List;
+
 /**
  * <pre>
  * 分页数据

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/response/PointResponse.java

 package com.yeejoin.amos.supervision.core.common.response;
 
-import java.util.List;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import com.yeejoin.amos.supervision.dao.entity.PointConfig;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-import com.yeejoin.amos.supervision.dao.entity.PointConfig;
+import java.util.List;
 
 @XmlRootElement
 public class PointResponse {

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/response/QueryCriteriaRespone.java

 package com.yeejoin.amos.supervision.core.common.response;
 
-import java.util.List;
-import java.util.Map;
-
 import com.yeejoin.amos.supervision.dao.entity.CatalogTree;
 import com.yeejoin.amos.supervision.dao.entity.Point;
 
+import java.util.List;
+import java.util.Map;
+
 
 public class QueryCriteriaRespone {
 	

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/el/ELEvaluationContext.java

 package com.yeejoin.amos.fas.business.action.el;
 
-import java.util.Map;
-
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 
+import java.util.Map;
+
 public class ELEvaluationContext
 {
 	private static EvaluationContext instance = new StandardEvaluationContext();

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/model/CheckInputItemRo.java

 package com.yeejoin.amos.fas.business.action.model;
 
-import java.io.Serializable;
-
 import com.yeejoin.amos.component.rule.RuleFact;
-
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author DELL
  */

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/model/ContingencyEvent.java

 package com.yeejoin.amos.fas.business.action.model;
 
-import org.springframework.context.ApplicationEvent;
-
 import lombok.Data;
+import org.springframework.context.ApplicationEvent;
 
 @Data
 public class ContingencyEvent extends ApplicationEvent{

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/model/DeviceRo.java

 package com.yeejoin.amos.fas.business.action.model;
 
-import java.io.Serializable;
-
 import com.yeejoin.amos.component.rule.Label;
 import com.yeejoin.amos.component.rule.RuleFact;
-
 import lombok.Data;
 
+import java.io.Serializable;
+
 @RuleFact(value = "设备数据",project = "换流站消防专项预案")
 @Data
 public class DeviceRo implements Serializable{

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/model/FireEquimentDataRo.java

@@ -2,11 +2,8 @@ package com.yeejoin.amos.fas.business.action.model;
 
 import com.yeejoin.amos.component.rule.Label;
 import com.yeejoin.amos.component.rule.RuleFact;
-
 import lombok.Data;
 
-import java.security.acl.LastOwnerException;
-
 @RuleFact(value = "消防设备",project = "风险管控")
 @Data
 public class FireEquimentDataRo extends BasicsRo

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/model/ProtalDataRo.java

 package com.yeejoin.amos.fas.business.action.model;
-import java.util.List;
 
 import com.yeejoin.amos.component.rule.Label;
 import com.yeejoin.amos.component.rule.RuleFact;
-
 import lombok.Data;
 
+import java.util.List;
+
 
 @RuleFact(value = "巡检点",project = "风险管控")
 @Data

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/model/RiskSourceRo.java

 package com.yeejoin.amos.fas.business.action.model;
 
-import java.math.BigDecimal;
-import java.util.List;
-
 import com.yeejoin.amos.component.rule.Label;
 import com.yeejoin.amos.component.rule.RuleFact;
-
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 @RuleFact(value = "风险点",project = "风险管控")
 @Data
 public class RiskSourceRo extends BasicsRo {

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/model/RiskSourceRuleRo.java

 package com.yeejoin.amos.fas.business.action.model;
 
-import java.math.BigDecimal;
-
 import com.yeejoin.amos.component.rule.Label;
 import com.yeejoin.amos.component.rule.RuleFact;
-
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @RuleFact(value = "风险点-关联巡检点",project = "风险管控")
 @Data
 public class RiskSourceRuleRo extends BasicsRo {

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/result/ActionResult.java

 package com.yeejoin.amos.fas.business.action.result;
 
-import java.util.List;
-
 import com.alibaba.fastjson.JSON;
 
+import java.util.List;
+
 public interface ActionResult
 {
 	public JSON toJson();

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/result/BubbleTipResult.java

 package com.yeejoin.amos.fas.business.action.result;
 
+import com.alibaba.fastjson.JSON;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import com.alibaba.fastjson.JSON;
-
 public class BubbleTipResult  extends SimpleResult{
 
 	@Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/result/RiskSituationResult.java

 package com.yeejoin.amos.fas.business.action.result;
 
+import com.alibaba.fastjson.JSON;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import com.alibaba.fastjson.JSON;
-
 public class RiskSituationResult  extends SimpleResult{
 
 	@Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/result/SafteyPlanResult.java

 package com.yeejoin.amos.fas.business.action.result;
 
+import com.alibaba.fastjson.JSON;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.alibaba.fastjson.JSON;
-
 public class SafteyPlanResult implements ActionResult{
 	
 	Map<String, Object> data = new HashMap<>();

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/result/SimpleResult.java

 package com.yeejoin.amos.fas.business.action.result;
 
+import com.alibaba.fastjson.JSON;
+import com.yeejoin.amos.fas.business.util.JSONUtil;
+
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.alibaba.fastjson.JSON;
-import com.yeejoin.amos.fas.business.util.JSONUtil;
-
 public class SimpleResult  extends AbstractActionResult  implements ActionResult
 {
 	List<Map<String, Object>> data = new ArrayList<>();

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/result/TipResult.java

 package com.yeejoin.amos.fas.business.action.result;
 
+import com.alibaba.fastjson.JSON;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import com.alibaba.fastjson.JSON;
-
 public class TipResult  extends SimpleResult{
 
 	@Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/util/ContingencyLogPublisher.java

 package com.yeejoin.amos.fas.business.action.util;
 
+import com.yeejoin.amos.fas.business.action.model.ContingencyEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 
-import com.yeejoin.amos.fas.business.action.model.ContingencyEvent;
-
 @Component
 public class ContingencyLogPublisher {
 	@Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/util/DataItemUtil.java

 package com.yeejoin.amos.fas.business.action.util;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.fas.business.action.el.ELEvaluationContext;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class DataItemUtil
 {
 	public static boolean getEnable(JSONObject jsonObject)

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/util/ReflectUtil.java

 package com.yeejoin.amos.fas.business.action.util;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
@@ -8,9 +11,6 @@ import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * 
  * <pre>

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/websocket/RuleWebSocket.java

 package com.yeejoin.amos.fas.business.action.websocket;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.websocket.*;
+import javax.websocket.server.ServerEndpoint;
 import java.io.IOException;
 import java.util.Observable;
 import java.util.Observer;
 import java.util.concurrent.CopyOnWriteArraySet;
-
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
 /**
  * 
  * <pre>

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/websocket/WebSocketConfig.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.fas.business.action.websocket;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.socket.config.annotation.EnableWebSocket;
 import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 @Configuration

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

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

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

 package com.yeejoin.amos.fas.business.dao.mapper;
 
+import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
+
 import java.util.HashMap;
 import java.util.List;
 
-import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
-
 public interface AlarmMapper extends BaseMapper {
 
 	long countPageData(CommonPageInfoParam param);

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

@@ -4,7 +4,6 @@ import com.yeejoin.amos.fas.dao.entity.NodeMessageView;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 public interface BizMessageMapper extends BaseMapper {
     List<NodeMessageView> queryForPage(

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

 package com.yeejoin.amos.fas.business.dao.mapper;
 
+import com.yeejoin.amos.fas.business.param.PointListParam;
+
 import java.util.HashMap;
 import java.util.List;
 
-import com.yeejoin.amos.fas.business.param.PointListParam;
-
 public interface CommonMapper extends BaseMapper{
 
 	long countPoint(PointListParam params);

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

 package com.yeejoin.amos.fas.business.dao.mapper;
 
-import java.util.List;
-
 import com.yeejoin.amos.fas.dao.entity.Dict;
 
+import java.util.List;
+
 public interface DictMapper {
 
 	long countDict(Dict dict);

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

 package com.yeejoin.amos.fas.business.dao.mapper;
 
+import com.yeejoin.amos.fas.dao.dto.EquipmentDTO;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.yeejoin.amos.fas.dao.dto.EquipmentDTO;
-import org.apache.ibatis.annotations.Param;
-
 public interface ImpEquipMapper extends BaseMapper {
 
 

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

 package com.yeejoin.amos.fas.business.dao.mapper;
 
-import java.util.List;
-
 import com.yeejoin.amos.fas.dao.entity.Message;
 
+import java.util.List;
+
 public interface MessageMapper extends BaseMapper {
 	
 	void save(Message msg);

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

@@ -4,7 +4,6 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <h1><h1>

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

 package com.yeejoin.amos.fas.business.dao.mapper;
 
-import com.yeejoin.amos.fas.business.vo.PlanDetailVo;
 import org.springframework.stereotype.Repository;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

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

 package com.yeejoin.amos.fas.business.dao.mapper;
 
-import java.util.HashMap;
-import java.util.List;
-
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.dao.entity.RiskFactor;
 
+import java.util.HashMap;
+import java.util.List;
+
 public interface RiskFactorMapper extends BaseMapper {
    /**
     * 危险因素查询，分页查询统计用

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

 package com.yeejoin.amos.fas.business.dao.mapper;
 
-import java.util.HashMap;
-import java.util.List;
-
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.dao.entity.RiskLevel;
 
+import java.util.HashMap;
+import java.util.List;
+
 public interface RiskLevelMapper extends BaseMapper {
 
 	long countPageData(CommonPageInfoParam param);

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

 package com.yeejoin.amos.fas.business.dao.mapper;
 
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.yeejoin.amos.fas.business.bo.BindRegionBo;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.core.common.response.RegionTreeResponse;
 import com.yeejoin.amos.fas.core.common.response.RiskSourceTreeResponse;
 import com.yeejoin.amos.fas.dao.entity.RiskSource;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public interface RiskSourceMapper extends BaseMapper {
 

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

 package com.yeejoin.amos.fas.business.dao.mapper;
 
-import java.util.List;
-
 import com.yeejoin.amos.fas.business.service.model.RuleRuningSnapshot;
 
+import java.util.List;
+
 public interface RuleRuningSnapshotMapper extends BaseMapper{
 	
 	 RuleRuningSnapshot querForObject(String batchNo);

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

 package com.yeejoin.amos.fas.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-fas-biz/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IAccidentTypeDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.yeejoin.amos.fas.dao.entity.AccidentType;
 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.fas.dao.entity.AccidentType;
+import java.util.HashMap;
+import java.util.List;
 
 @Repository("iAccidentTypeDao")
 public interface IAccidentTypeDao extends BaseDao<AccidentType, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IContingencyOriginalDataDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
 import com.yeejoin.amos.fas.dao.entity.ContingencyOriginalData;
-//import com.yeejoin.amos.fas.dao.entity.FireStrength;
 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.fas.dao.entity.FireStrength;
+
 /**
  * <pre>
  *

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IDictDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
-import org.springframework.stereotype.Repository;
-
 import com.yeejoin.amos.fas.dao.entity.Dict;
+import org.springframework.stereotype.Repository;
 
 @Repository("dictDao")
 public interface IDictDao extends BaseDao<Dict, Long>{

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IEquipmentDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
-import java.util.List;
-import java.util.Optional;
-
-import com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo;
+import com.yeejoin.amos.fas.dao.entity.Equipment;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.fas.business.vo.EquipCommunicationData;
-import com.yeejoin.amos.fas.dao.entity.Equipment;
+import java.util.List;
+import java.util.Optional;
 
 @Repository("iEquipmentDao")
 public interface IEquipmentDao extends BaseDao<Equipment, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IEvaluationModelDao.java

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

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IFmeaDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
-import java.util.List;
-import java.util.Optional;
-
+import com.yeejoin.amos.fas.dao.entity.Fmea;
 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.fas.dao.entity.Fmea;
+import java.util.List;
+import java.util.Optional;
 
 @Repository("iFmeaDao")
 public interface IFmeaDao extends BaseDao<Fmea, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IPPointDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
 import com.yeejoin.amos.fas.dao.entity.PPoint;
-import com.yeejoin.amos.fas.dao.entity.RiskSource;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
 import java.util.Optional;
 
 @Repository("iPPointDao")

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IRiskFactorDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
-import java.util.List;
-import java.util.Optional;
-
+import com.yeejoin.amos.fas.dao.entity.RiskFactor;
 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.fas.dao.entity.RiskFactor;
+import java.util.List;
+import java.util.Optional;
 
 @Repository("iRiskFactorDao")
 public interface IRiskFactorDao extends BaseDao<RiskFactor, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IRiskLevelDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
-import java.util.List;
-import java.util.Optional;
-
+import com.yeejoin.amos.fas.dao.entity.RiskLevel;
 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.fas.dao.entity.RiskLevel;
+import java.util.List;
+import java.util.Optional;
 
 @Repository("iRiskLevelDao")
 public interface IRiskLevelDao extends BaseDao<RiskLevel, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IRiskSourceDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
+import com.yeejoin.amos.fas.dao.entity.RiskSource;
 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.fas.dao.entity.RiskSource;
+import java.util.List;
+import java.util.Optional;
 
 @Repository("iRiskSourceDao")
 public interface IRiskSourceDao extends BaseDao<RiskSource, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IRpnChangeLogDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
-import org.springframework.stereotype.Repository;
-
 import com.yeejoin.amos.fas.dao.entity.RpnChangeLog;
+import org.springframework.stereotype.Repository;
 
 @Repository("iRpnChangeLogDao")
 public interface IRpnChangeLogDao extends BaseDao<RpnChangeLog, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IRuleRuningSnapshotDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
-import org.springframework.stereotype.Repository;
-
 import com.yeejoin.amos.fas.business.service.model.RuleRuningSnapshot;
+import org.springframework.stereotype.Repository;
 
 @Repository
 public interface IRuleRuningSnapshotDao extends BaseDao<RuleRuningSnapshot, String>{

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/dao/repository/ISafetyIndexChangeLogDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
-import org.springframework.stereotype.Repository;
-
 import com.yeejoin.amos.fas.dao.entity.SafetyIndexChangeLog;
+import org.springframework.stereotype.Repository;
 
 @Repository("iSafetyIndexChangeLogDao")
 public interface ISafetyIndexChangeLogDao extends BaseDao<SafetyIndexChangeLog, Long>{

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/dao/repository/ITopographyLineDao.java

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

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/dao/repository/ITopographyNodeDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
-import java.util.List;
-
+import com.yeejoin.amos.fas.dao.entity.TopographyNode;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.fas.dao.entity.TopographyNode;
+import java.util.List;
 
 @Repository("iTopographyNodeDao")
 public interface ITopographyNodeDao extends BaseDao<TopographyNode, Long> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/dao/repository/ITopographyNodeDetailDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
-import org.springframework.stereotype.Repository;
-
 import com.yeejoin.amos.fas.dao.entity.TopographyNodeDetail;
+import org.springframework.stereotype.Repository;
 
 @Repository("iTopographyNodeDetailDao")
 public interface ITopographyNodeDetailDao extends BaseDao<TopographyNodeDetail, Long> {

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

 
 package com.yeejoin.amos.fas.business.service.impl;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
-import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
-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 com.google.common.base.Joiner;
 import com.yeejoin.amos.fas.business.dao.mapper.AccidentTypeMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IAccidentTypeDao;
@@ -21,8 +12,16 @@ import com.yeejoin.amos.fas.dao.entity.AccidentType;
 import com.yeejoin.amos.fas.dao.entity.RiskFactor;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
+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.CollectionUtils;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 @Service("accidentTypeService")
 public class AccidentTypeServiceImpl implements IAccidentTypeService {
 

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

 package com.yeejoin.amos.fas.business.service.impl;
 
-import java.util.HashMap;
-import java.util.List;
-
+import com.yeejoin.amos.fas.business.dao.mapper.AlarmMapper;
+import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
+import com.yeejoin.amos.fas.business.service.intfc.IAlarmService;
 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 com.yeejoin.amos.fas.business.dao.mapper.AlarmMapper;
-import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
-import com.yeejoin.amos.fas.business.service.intfc.IAlarmService;
+import java.util.HashMap;
+import java.util.List;
 
 @Service("alarmService")
 public class AlarmServiceImpl implements IAlarmService {

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

@@ -10,7 +10,6 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Map;
 
 @Service("iBizMessageService")
 public class BizMessageServiceImpl implements IBizMessageService {

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

@@ -6,7 +6,6 @@ import com.yeejoin.amos.fas.business.param.PointListParam;
 import com.yeejoin.amos.fas.business.service.intfc.ICommonService;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;

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

@@ -20,7 +20,6 @@ import com.yeejoin.amos.fas.dao.entity.ContingencyOriginalData;
 import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
 import org.apache.commons.lang3.ArrayUtils;
-//import org.codehaus.jackson.map.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -34,6 +33,8 @@ import org.springframework.web.client.RestTemplate;
 
 import java.util.*;
 
+//import org.codehaus.jackson.map.ObjectMapper;
+
 @Service
 public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPlanInstance, String>*/ implements IContingencyInstance {
 

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

@@ -25,7 +25,6 @@ import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.component.emq.EmqKeeper;

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

 package com.yeejoin.amos.fas.business.service.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-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 com.yeejoin.amos.fas.business.dao.mapper.DictMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IDictDao;
 import com.yeejoin.amos.fas.business.service.intfc.IDictService;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.dao.entity.Dict;
+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 java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 @Service("dictService")
 public class DictServiceImpl implements IDictService {

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

 package com.yeejoin.amos.fas.business.service.impl;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
 import com.yeejoin.amos.fas.business.dao.mapper.*;
 import com.yeejoin.amos.fas.business.dao.repository.IEquipmentDao;
@@ -10,7 +9,6 @@ import com.yeejoin.amos.fas.business.dao.repository.IPreplanPictureDao;
 import com.yeejoin.amos.fas.business.feign.IEquipManageFeign;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.param.ImgParam;
-import com.yeejoin.amos.fas.business.service.intfc.EquipmentSpecificService;
 import com.yeejoin.amos.fas.business.service.intfc.IEquipmentService;
 import com.yeejoin.amos.fas.business.vo.EquipCommunicationData;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
@@ -23,9 +21,11 @@ import com.yeejoin.amos.fas.exception.YeeException;
 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 org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +44,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Service("equipService")

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

 package com.yeejoin.amos.fas.business.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.fas.business.dao.mapper.EquipmentSpecificMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.FmeaEquipmentPointMapper;
 import com.yeejoin.amos.fas.business.param.FmeaBindParam;
 import com.yeejoin.amos.fas.business.service.intfc.EquipmentSpecificService;
 import com.yeejoin.amos.fas.business.service.intfc.IEquipmentCategoryService;
-import com.yeejoin.amos.fas.business.service.intfc.IFmeaService;
 import com.yeejoin.amos.fas.business.util.TreeUtil;
 import com.yeejoin.amos.fas.business.vo.AssoEquipsVo;
 import com.yeejoin.amos.fas.business.vo.EquipmentPointVo;
 import com.yeejoin.amos.fas.business.vo.EquipmentSpecificVo;
 import com.yeejoin.amos.fas.dao.entity.EquipmentCategory;
-import com.yeejoin.amos.fas.dao.entity.EquipmentSpecific;
-import com.yeejoin.amos.fas.dao.entity.Fmea;
 import com.yeejoin.amos.fas.dao.entity.FmeaEquipmentPoint;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

 package com.yeejoin.amos.fas.business.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
 import com.yeejoin.amos.fas.business.dao.mapper.EvaModelMapper;
@@ -14,6 +7,12 @@ import com.yeejoin.amos.fas.business.dao.repository.IEvaluationModelDao;
 import com.yeejoin.amos.fas.business.service.intfc.IEvaModelService;
 import com.yeejoin.amos.fas.core.util.StringUtil;
 import com.yeejoin.amos.fas.dao.entity.EvaluationModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
 @Service("evaModelService")
 public class EvaModelServiceImpl implements IEvaModelService {

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

@@ -5,21 +5,17 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.yeejoin.amos.fas.business.dao.mapper.FireEquipMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.FireEquipPointMapper;
-//import com.yeejoin.amos.fas.business.dao.mapper.WaterResourceMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IRiskSourceDao;
 import com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentEntity;
 import com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentPointEntity;
 import com.yeejoin.amos.fas.business.param.FireEquipmentParam;
 import com.yeejoin.amos.fas.business.param.FireEquipmentPointParam;
-import com.yeejoin.amos.fas.business.param.WaterResourceParam;
 import com.yeejoin.amos.fas.business.service.intfc.IExcelService;
 import com.yeejoin.amos.fas.business.service.intfc.IFireEquipPontService;
 import com.yeejoin.amos.fas.business.util.StringUtil;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.dao.entity.RiskSource;
-//import com.yeejoin.amos.fas.dao.entity.WaterResource;
 import com.yeejoin.amos.fas.exception.YeeException;
-
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageImpl;
@@ -27,11 +23,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
+
+//import com.yeejoin.amos.fas.business.dao.mapper.WaterResourceMapper;
+//import com.yeejoin.amos.fas.dao.entity.WaterResource;
 
 @Service("excelService")
 public class ExcelServiceImpl implements IExcelService {

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

 package com.yeejoin.amos.fas.business.service.impl;
 
-import java.util.HashMap;
-
+import com.yeejoin.amos.fas.business.dao.mapper.FireCarMapper;
+import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
+import com.yeejoin.amos.fas.business.service.intfc.IFireCarService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
-import com.yeejoin.amos.fas.business.dao.mapper.FireCarMapper;
-import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
-import com.yeejoin.amos.fas.business.service.intfc.IFireCarService;
+import java.util.HashMap;
 
 
 @Service("fireCarService")

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

@@ -11,7 +11,6 @@ import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.core.util.StringUtil;
-
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -20,7 +19,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 @Service("fireEquipPoint")
 public class FireEquipPointServiceImpl implements IFireEquipPontService {

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

@@ -14,12 +14,10 @@ import com.yeejoin.amos.fas.business.vo.FireStationVo;
 import com.yeejoin.amos.fas.common.enums.EquipClassifyEnum;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.response.CommonPage;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -13,11 +13,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service("fireRectificationService")
 public class FireRectificationServiceImpl implements FireRectificationService {

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

 package com.yeejoin.amos.fas.business.service.impl;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-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.CollectionUtils;
-
 import com.google.common.base.Joiner;
 import com.yeejoin.amos.fas.business.action.model.RiskSourceRo;
 import com.yeejoin.amos.fas.business.dao.mapper.FmeaEquipmentPointMapper;
@@ -35,6 +19,15 @@ import com.yeejoin.amos.fas.dao.entity.RiskFactor;
 import com.yeejoin.amos.fas.dao.entity.RiskLevel;
 import com.yeejoin.amos.fas.dao.entity.RiskSource;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+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.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service("fmeaService")
 public class FmeaServiceImpl implements IFmeaService {

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

 package com.yeejoin.amos.fas.business.service.impl;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.yeejoin.amos.fas.business.dao.repository.ITopographyLineDao;
 import com.yeejoin.amos.fas.business.service.intfc.ITopographyLineService;
 import com.yeejoin.amos.fas.dao.entity.TopographyLine;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 @Service("topographyLineService")
 public class ITopographyLineServiceImpl implements ITopographyLineService{

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

 package com.yeejoin.amos.fas.business.service.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.yeejoin.amos.fas.business.dao.repository.ITopographyNodeDetailDao;
 import com.yeejoin.amos.fas.business.service.intfc.ITopographyNodeDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 @Service("topographyNodeDetailService")
 public class ITopographyNodeDetailServiceImpl implements ITopographyNodeDetailService{

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

 package com.yeejoin.amos.fas.business.service.impl;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.yeejoin.amos.fas.business.dao.repository.ITopographyLineDao;
 import com.yeejoin.amos.fas.business.dao.repository.ITopographyNodeDao;
 import com.yeejoin.amos.fas.business.dao.repository.ITopographyNodeDetailDao;
@@ -12,6 +7,10 @@ import com.yeejoin.amos.fas.business.service.intfc.ITopographyNodeService;
 import com.yeejoin.amos.fas.dao.entity.TopographyLine;
 import com.yeejoin.amos.fas.dao.entity.TopographyNode;
 import com.yeejoin.amos.fas.dao.entity.TopographyNodeDetail;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 @Service("topographyNodeService")
 public class ITopographyNodeServiceImpl implements ITopographyNodeService{

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

 package com.yeejoin.amos.fas.business.service.impl;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.yeejoin.amos.fas.business.dao.mapper.MessageMapper;
 import com.yeejoin.amos.fas.business.service.intfc.IMessageService;
 import com.yeejoin.amos.fas.dao.entity.Message;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 
 

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

 
 package com.yeejoin.amos.fas.business.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-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.CollectionUtils;
-
 import com.google.common.base.Joiner;
 import com.yeejoin.amos.fas.business.dao.mapper.RiskLevelMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IRiskLevelDao;
@@ -29,6 +14,14 @@ import com.yeejoin.amos.fas.dao.entity.RiskLevel;
 import com.yeejoin.amos.fas.dao.entity.RiskSource;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+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.CollectionUtils;
+
+import java.util.*;
+import java.util.stream.Collectors;
 @Service("riskLevelService")
 public class RiskLevelServiceImpl implements IRiskLevelService {
 	@Autowired 

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

 package com.yeejoin.amos.fas.business.service.impl;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.annotation.Resource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-import org.typroject.tyboot.core.foundation.context.SpringContextHelper;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yeejoin.amos.fas.business.action.CustomerAction;
 import com.yeejoin.amos.fas.business.action.model.ContingencyRo;
@@ -34,6 +12,22 @@ import com.yeejoin.amos.fas.business.dao.repository.IRuleRuningSnapshotDao;
 import com.yeejoin.amos.fas.business.service.intfc.IRuleRunningSnapshotService;
 import com.yeejoin.amos.fas.business.service.model.RuleRuningSnapshot;
 import com.yeejoin.amos.fas.business.service.model.ToipResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+import org.typroject.tyboot.core.foundation.context.SpringContextHelper;
+
+import javax.annotation.Resource;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.*;
 
 /**
  * 

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

@@ -2,12 +2,10 @@ package com.yeejoin.amos.fas.business.service.impl;
 
 import com.yeejoin.amos.fas.business.dao.repository.IStationMaintenDao;
 import com.yeejoin.amos.fas.business.service.intfc.IStationMaintenService;
-import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.dao.entity.StationInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 
 import java.util.List;
 

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

 package com.yeejoin.amos.fas.business.service.intfc;
 
+import com.yeejoin.amos.fas.core.util.CommonResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.yeejoin.amos.fas.core.util.CommonResponse;
-
 
 @FeignClient("AMOSSECURITY")
 public interface AMOSSecurityServer {

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

@@ -4,7 +4,6 @@ import com.yeejoin.amos.fas.business.param.FmeaBindParam;
 import com.yeejoin.amos.fas.business.vo.EquipmentPointVo;
 import com.yeejoin.amos.fas.business.vo.EquipmentSpecificVo;
 import com.yeejoin.amos.fas.dao.entity.FmeaEquipmentPoint;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;

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

 package com.yeejoin.amos.fas.business.service.intfc;
 
-import java.util.HashMap;
-import java.util.List;
-
+import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import org.springframework.data.domain.Page;
 
-import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
+import java.util.HashMap;
+import java.util.List;
 
 public interface IAccidentTypeService {
 

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

 package com.yeejoin.amos.fas.business.service.intfc;
 
-import java.util.HashMap;
-
+import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import org.springframework.data.domain.Page;
 
-import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
+import java.util.HashMap;
 
 public interface IAlarmService {
 

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

 package com.yeejoin.amos.fas.business.service.intfc;
 
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
-//import com.yeejoin.amos.fas.dao.entity.WaterResource;
 import org.springframework.data.domain.Page;
 
-import java.util.Map;
+//import com.yeejoin.amos.fas.dao.entity.WaterResource;
 
 public interface IBizMessageService {
 

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

@@ -3,7 +3,6 @@ package com.yeejoin.amos.fas.business.service.intfc;
 import com.yeejoin.amos.fas.business.param.PointListParam;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
-
 import org.springframework.data.domain.Page;
 
 import java.util.HashMap;

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

 package com.yeejoin.amos.fas.business.service.intfc;
 
-import java.util.List;
-
-import org.springframework.data.domain.Page;
-
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.dao.entity.Dict;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
 
 public interface IDictService {
 

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

@@ -2,7 +2,6 @@ package com.yeejoin.amos.fas.business.service.intfc;
 
 import com.yeejoin.amos.fas.business.param.FireEquipmentParam;
 import com.yeejoin.amos.fas.business.param.FireEquipmentPointParam;
-import com.yeejoin.amos.fas.business.param.WaterResourceParam;
 
 import java.util.List;
 import java.util.Map;

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

 package com.yeejoin.amos.fas.business.service.intfc;
 
-import java.util.HashMap;
-
+import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import org.springframework.data.domain.Page;
 
-import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
+import java.util.HashMap;
 
 public interface IFireCarService {
 

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

@@ -3,12 +3,13 @@ package com.yeejoin.amos.fas.business.service.intfc;
 import com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentPointEntity;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
-//import com.yeejoin.amos.fas.dao.entity.FireEquipmentPoint;
 import org.springframework.data.domain.Page;
 
 import java.util.List;
 import java.util.Map;
 
+//import com.yeejoin.amos.fas.dao.entity.FireEquipmentPoint;
+
 public interface IFireEquipPontService {
 
     /**

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

 package com.yeejoin.amos.fas.business.service.intfc;
 
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
-import com.yeejoin.amos.fas.dao.entity.Fmea;
 import org.springframework.data.domain.Page;
 
 import java.util.HashMap;

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

 package com.yeejoin.amos.fas.business.service.intfc;
 
-import java.util.List;
-
 import com.yeejoin.amos.fas.dao.entity.Message;
 
+import java.util.List;
+
 public interface IMessageService 
 {
 

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

 package com.yeejoin.amos.fas.business.service.intfc;
 
-import java.util.HashMap;
-import java.util.List;
-
-import org.springframework.data.domain.Page;
-
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.dao.entity.RiskFactor;
+import org.springframework.data.domain.Page;
+
+import java.util.HashMap;
+import java.util.List;
 
 public interface IRiskFactorService {
     /**

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

 package com.yeejoin.amos.fas.business.service.intfc;
 
-import java.util.HashMap;
-import java.util.List;
-
-import org.springframework.data.domain.Page;
-
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.dao.entity.RiskLevel;
+import org.springframework.data.domain.Page;
+
+import java.util.HashMap;
+import java.util.List;
 
 public interface IRiskLevelService {
 

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

 package com.yeejoin.amos.fas.business.service.intfc;
 
-import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.dao.entity.StationInfo;
 
 public interface IStationMaintenService {

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

 package com.yeejoin.amos.fas.business.service.intfc;
 
-import java.util.List;
-
 import com.yeejoin.amos.fas.dao.entity.TopographyLine;
 
+import java.util.List;
+
 public interface ITopographyLineService {
 
 	public List<TopographyLine>  getLinesByAppIdAndType(String appId,String type);

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

 package com.yeejoin.amos.fas.business.service.intfc;
 
-import java.util.List;
-
 import com.yeejoin.amos.fas.dao.entity.TopographyNode;
 import com.yeejoin.amos.fas.dao.entity.TopographyNodeDetail;
 
+import java.util.List;
+
 public interface ITopographyNodeService {
 
 	public List<TopographyNode> getNodesByAppIdAndType(String appId,String type);

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/service/model/ToipResponse.java

 package com.yeejoin.amos.fas.business.service.model;
 
-import java.io.Serializable;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.yeejoin.amos.fas.core.util.CommonResponse;
-import com.yeejoin.amos.fas.dao.entity.MessageRo;
-
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 
  * <pre>

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/core/util/query/BaseQuerySpecification.java

 package com.yeejoin.amos.fas.core.util.query;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
+import com.yeejoin.amos.fas.core.enums.QueryOperatorEnum;
+import com.yeejoin.amos.fas.core.util.DaoCriteria;
 import org.hibernate.query.criteria.internal.CriteriaBuilderImpl;
 import org.hibernate.query.criteria.internal.predicate.InPredicate;
 import org.springframework.data.jpa.domain.Specification;
 
-import com.yeejoin.amos.fas.core.enums.QueryOperatorEnum;
-import com.yeejoin.amos.fas.core.util.DaoCriteria;
+import javax.persistence.criteria.*;
+import java.math.BigDecimal;
+import java.util.*;
 
 /**
  * 基础Specification

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/feign/DataFillter.java

 package com.yeejoin.amos.knowledgebase.face.feign;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+
+import java.util.*;
 
 /**
  * @author 杨博超

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/model/KnowledgeDocCategoryModel.java

 package com.yeejoin.amos.knowledgebase.face.model;
 
-import org.typroject.tyboot.core.foundation.utils.TreeNode;
-import org.typroject.tyboot.core.rdbms.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.foundation.utils.TreeNode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
 import java.util.Collection;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/model/KnowledgeDynamicsGroupModel.java

 package com.yeejoin.amos.knowledgebase.face.model;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import org.typroject.tyboot.core.rdbms.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/model/KnowledgeDynamicsOptionModel.java

 package com.yeejoin.amos.knowledgebase.face.model;
 
-import org.typroject.tyboot.core.rdbms.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/model/KnowledgeDynamicsValueModel.java

 package com.yeejoin.amos.knowledgebase.face.model;
 
-import org.typroject.tyboot.core.rdbms.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 /**
  * <p>
  * 知识库系统动态选项配置的实例值

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/model/KnowledgeInteractionCountModel.java

 package com.yeejoin.amos.knowledgebase.face.model;
 
-import org.typroject.tyboot.core.rdbms.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 /**
  * <p>
  * 知识库内容交互计数表

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/model/KnowledgeInteractionRecordModel.java

 package com.yeejoin.amos.knowledgebase.face.model;
 
-import org.typroject.tyboot.core.rdbms.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 /**
  * <p>
  * 知识库内容交互记录

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/model/KnowledgeTagGroupModel.java

 package com.yeejoin.amos.knowledgebase.face.model;
 
-import org.typroject.tyboot.core.foundation.utils.TreeNode;
-import org.typroject.tyboot.core.rdbms.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.foundation.utils.TreeNode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
 import java.util.Collection;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/model/KnowledgeTagInstanceModel.java

 package com.yeejoin.amos.knowledgebase.face.model;
 
-import org.typroject.tyboot.core.rdbms.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
 import java.util.List;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/model/KnowledgeTagModel.java

 package com.yeejoin.amos.knowledgebase.face.model;
 
-import org.typroject.tyboot.core.rdbms.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
 import java.util.List;
 import java.util.Map;

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/model/KnowledgeTagValueModel.java

 package com.yeejoin.amos.knowledgebase.face.model;
 
-import org.typroject.tyboot.core.rdbms.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 /**
  * <p>
  * 值标签的实例值

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/service/DocAnnotateService.java

 package com.yeejoin.amos.knowledgebase.face.service;
 
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
+import com.yeejoin.amos.knowledgebase.face.feign.RemoteData;
+import com.yeejoin.amos.knowledgebase.face.model.KnowledgeDocAnnotateModel;
+import com.yeejoin.amos.knowledgebase.face.orm.dao.DocAnnotateMapper;
+import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeDocAnnotate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -16,10 +14,11 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import com.yeejoin.amos.knowledgebase.face.feign.RemoteData;
-import com.yeejoin.amos.knowledgebase.face.model.KnowledgeDocAnnotateModel;
-import com.yeejoin.amos.knowledgebase.face.orm.dao.DocAnnotateMapper;
-import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeDocAnnotate;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/service/DocAuditService.java

 package com.yeejoin.amos.knowledgebase.face.service;
 
 
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.component.rule.action.Topic;
+import com.yeejoin.amos.component.rule.config.ClazzUtils;
+import com.yeejoin.amos.component.rule.config.RuleConfig;
+import com.yeejoin.amos.component.rule.model.ConstantCategoryModel;
+import com.yeejoin.amos.component.rule.model.ConstantModel;
+import com.yeejoin.amos.component.rule.model.DefinitionModel;
+import com.yeejoin.amos.knowledgebase.face.model.KnowledgeDocContentModel;
+import com.yeejoin.amos.knowledgebase.face.model.KnowledgeTagInstanceModel;
+import com.yeejoin.amos.knowledgebase.face.model.KnowledgeTagValueModel;
+import com.yeejoin.amos.knowledgebase.face.util.BaseUtil;
+import com.yeejoin.amos.knowledgebase.face.util.ConfigLoader;
+import com.yeejoin.amos.knowledgebase.face.util.Constants;
+import com.yeejoin.amos.knowledgebase.face.util.QuoteCountFlushTiming;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,21 +32,10 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
 import org.typroject.tyboot.core.restful.exception.instance.RequestForbidden;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.yeejoin.amos.component.rule.action.Topic;
-import com.yeejoin.amos.component.rule.config.ClazzUtils;
-import com.yeejoin.amos.component.rule.config.RuleConfig;
-import com.yeejoin.amos.component.rule.model.ConstantCategoryModel;
-import com.yeejoin.amos.component.rule.model.ConstantModel;
-import com.yeejoin.amos.component.rule.model.DefinitionModel;
-import com.yeejoin.amos.knowledgebase.face.model.KnowledgeDocContentModel;
-import com.yeejoin.amos.knowledgebase.face.model.KnowledgeTagInstanceModel;
-import com.yeejoin.amos.knowledgebase.face.model.KnowledgeTagValueModel;
-import com.yeejoin.amos.knowledgebase.face.util.BaseUtil;
-import com.yeejoin.amos.knowledgebase.face.util.ConfigLoader;
-import com.yeejoin.amos.knowledgebase.face.util.Constants;
-import com.yeejoin.amos.knowledgebase.face.util.QuoteCountFlushTiming;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
 
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/service/DocCategoryService.java

 package com.yeejoin.amos.knowledgebase.face.service;
 
-import java.util.*;
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.knowledgebase.face.model.KnowledgeDocCategoryModel;
+import com.yeejoin.amos.knowledgebase.face.model.MultipleNodeModel;
+import com.yeejoin.amos.knowledgebase.face.orm.dao.DocCategoryMapper;
+import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeDocCategory;
+import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeTag;
+import com.yeejoin.amos.knowledgebase.face.util.BaseUtil;
+import com.yeejoin.amos.knowledgebase.face.util.Constants;
+import com.yeejoin.amos.knowledgebase.face.util.TreeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,16 +25,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.exception.instance.RequestForbidden;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.knowledgebase.face.model.KnowledgeDocCategoryModel;
-import com.yeejoin.amos.knowledgebase.face.model.MultipleNodeModel;
-import com.yeejoin.amos.knowledgebase.face.orm.dao.DocCategoryMapper;
-import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeDocCategory;
-import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeTag;
-import com.yeejoin.amos.knowledgebase.face.util.BaseUtil;
-import com.yeejoin.amos.knowledgebase.face.util.Constants;
-import com.yeejoin.amos.knowledgebase.face.util.TreeUtil;
+import java.util.*;
 
 /**
  * <p>

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/service/DocCommentsService.java

 package com.yeejoin.amos.knowledgebase.face.service;
 
 
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.knowledgebase.face.enumeration.OperateType;
 import com.yeejoin.amos.knowledgebase.face.feign.RemoteData;
@@ -17,6 +8,14 @@ import com.yeejoin.amos.knowledgebase.face.model.KnowledgeDocCommentsModel;
 import com.yeejoin.amos.knowledgebase.face.model.KnowledgeInteractionRecordModel;
 import com.yeejoin.amos.knowledgebase.face.orm.dao.DocCommentsMapper;
 import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeDocComments;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.Date;
+import java.util.List;
 
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/service/DocContentService.java

@@ -17,7 +17,6 @@ import com.yeejoin.amos.knowledgebase.face.feign.RemoteData;
 import com.yeejoin.amos.knowledgebase.face.model.*;
 import com.yeejoin.amos.knowledgebase.face.orm.dao.DocContentMapper;
 import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeDocContent;
-import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeTagValue;
 import com.yeejoin.amos.knowledgebase.face.util.Constants;
 import com.yeejoin.amos.knowledgebase.face.util.DocSortUtil;
 import com.yeejoin.amos.knowledgebase.face.util.QuoteCountFlushTiming;

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/service/DocLibraryService.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.amos.knowledgebase.face.enumeration.DynamicsFunctional;
 import com.yeejoin.amos.knowledgebase.face.enumeration.KnowledgeRoleName;
@@ -20,7 +19,6 @@ import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeTag;
 import com.yeejoin.amos.knowledgebase.face.util.*;
 import com.yeejoin.amos.knowledgebase.face.util.FileExporter.FileType;
 import com.yeejoin.amos.knowledgebase.face.util.excel.ExcelImportConfig;
-import com.yeejoin.amos.knowledgebase.face.util.excel.ExcelParser;
 import com.yeejoin.amos.knowledgebase.face.util.excel.ExcelParserOld;
 import com.yeejoin.amos.knowledgebase.face.util.pdf.PdfBuilder;
 import com.yeejoin.amos.knowledgebase.face.util.sql.BaseSqlCondition;
@@ -49,9 +47,6 @@ import org.typroject.tyboot.core.restful.exception.instance.RequestForbidden;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.text.ParseException;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.TemporalAccessor;
 import java.util.*;
 import java.util.stream.Collectors;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/service/DynamicsGroupService.java

@@ -4,7 +4,6 @@ package com.yeejoin.amos.knowledgebase.face.service;
 import com.yeejoin.amos.knowledgebase.face.model.KnowledgeDynamicsGroupModel;
 import com.yeejoin.amos.knowledgebase.face.orm.dao.DynamicsGroupMapper;
 import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeDynamicsGroup;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/service/DynamicsValueService.java

@@ -11,7 +11,6 @@ import com.yeejoin.amos.knowledgebase.face.model.KnowledgeDynamicsValueModel;
 import com.yeejoin.amos.knowledgebase.face.orm.dao.DynamicsValueMapper;
 import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeDynamicsValue;
 import com.yeejoin.amos.knowledgebase.face.util.Constants;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/service/ESDocService.java

@@ -13,7 +13,6 @@ import com.yeejoin.amos.knowledgebase.face.orm.entity.ESDocEntity;
 import com.yeejoin.amos.knowledgebase.face.orm.entity.ESTagEntity;
 import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeDocContent;
 import com.yeejoin.amos.knowledgebase.face.util.Constants;
-
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/service/InteractionCountService.java

@@ -6,19 +6,16 @@ import com.yeejoin.amos.knowledgebase.face.model.KnowledgeInteractionCountModel;
 import com.yeejoin.amos.knowledgebase.face.orm.dao.InteractionCountMapper;
 import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeInteractionCount;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.exception.BaseException;
-import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/service/StatisticsRecordService.java

 package com.yeejoin.amos.knowledgebase.face.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctc.wstx.util.StringUtil;
-import com.yeejoin.amos.knowledgebase.face.model.KnowledgeDocContentModel;
-import com.yeejoin.amos.knowledgebase.face.model.KnowledgeTagInstanceModel;
 import com.yeejoin.amos.knowledgebase.face.model.KnowlegeStatisticsRecordModel;
 import com.yeejoin.amos.knowledgebase.face.orm.dao.StatisticsRecordMapper;
-import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeDocContent;
 import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowlegeStatisticsRecord;
-
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import org.typroject.tyboot.core.foundation.exception.BaseException;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.foundation.utils.DateUtil;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/service/TagInstanceService.java

 package com.yeejoin.amos.knowledgebase.face.service;
 
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.knowledgebase.face.model.KnowledgeDynamicsValueModel;
+import com.yeejoin.amos.knowledgebase.face.model.KnowledgeTagInstanceModel;
+import com.yeejoin.amos.knowledgebase.face.model.KnowledgeTagModel;
+import com.yeejoin.amos.knowledgebase.face.model.KnowledgeTagValueModel;
+import com.yeejoin.amos.knowledgebase.face.orm.dao.TagInstanceMapper;
+import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeTagInstance;
+import com.yeejoin.amos.knowledgebase.face.util.Constants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
@@ -15,14 +18,10 @@ import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import com.baomidou.mybatisplus.core.toolkit.Sequence;
-import com.yeejoin.amos.knowledgebase.face.model.KnowledgeDynamicsValueModel;
-import com.yeejoin.amos.knowledgebase.face.model.KnowledgeTagInstanceModel;
-import com.yeejoin.amos.knowledgebase.face.model.KnowledgeTagModel;
-import com.yeejoin.amos.knowledgebase.face.model.KnowledgeTagValueModel;
-import com.yeejoin.amos.knowledgebase.face.orm.dao.TagInstanceMapper;
-import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeTagInstance;
-import com.yeejoin.amos.knowledgebase.face.util.Constants;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/service/TagService.java

@@ -11,7 +11,6 @@ import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeDocContent;
 import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeTag;
 import com.yeejoin.amos.knowledgebase.face.util.ConfigLoader;
 import com.yeejoin.amos.knowledgebase.face.util.Constants;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/service/TagValueService.java

 package com.yeejoin.amos.knowledgebase.face.service;
 
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.knowledgebase.face.model.KnowledgeTagValueModel;
+import com.yeejoin.amos.knowledgebase.face.orm.dao.TagValueMapper;
+import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeTagValue;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
@@ -13,13 +13,9 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yeejoin.amos.knowledgebase.face.model.KnowledgeTagValueModel;
-import com.yeejoin.amos.knowledgebase.face.orm.dao.TagValueMapper;
-import com.yeejoin.amos.knowledgebase.face.orm.entity.KnowledgeTagValue;
-
-import net.bytebuddy.asm.Advice.This;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 
 
 /**

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

@@ -32,14 +32,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/param/LatentDangerDto.java

@@ -3,10 +3,8 @@ package com.yeejoin.amos.latentdanger.business.param;
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 
-import javax.persistence.Column;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author tb

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/param/LatentDangerPatrolParam.java

 package com.yeejoin.amos.latentdanger.business.param;
 
 import lombok.Data;
+
 import java.util.List;
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/util/DaoCriteria.java

 package com.yeejoin.amos.latentdanger.business.util;
 
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.io.Serializable;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
 /**
  * 
  * <pre>

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/util/DesUtil.java

 package com.yeejoin.amos.latentdanger.business.util;
 
 
-
+import org.apache.commons.lang.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
-
 /**
  * 
  * <pre>

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/util/FileHelper.java

@@ -8,23 +8,10 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import com.yeejoin.amos.latentdanger.exception.YeeException;
 import org.apache.commons.io.FileUtils;
 import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hssf.usermodel.DVConstraint;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFDataValidation;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbookFactory;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -38,22 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
@@ -61,11 +33,7 @@ import java.nio.ByteBuffer;
 import java.nio.channels.Channel;
 import java.nio.channels.FileChannel;
 import java.nio.charset.StandardCharsets;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.TreeSet;
+import java.util.*;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/util/HttpUtil.java

@@ -3,11 +3,7 @@ package com.yeejoin.amos.latentdanger.business.util;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
+import org.apache.http.client.methods.*;
 import org.apache.http.config.Registry;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.socket.ConnectionSocketFactory;

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/util/TikaUtils.java

 package com.yeejoin.amos.latentdanger.business.util;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
 import org.apache.tika.Tika;
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.metadata.Metadata;
@@ -17,6 +12,11 @@ import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
 public class TikaUtils {
 
   /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/util/ToolUtils.java

 package com.yeejoin.amos.latentdanger.business.util;
 
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-
+import com.yeejoin.amos.latentdanger.core.util.StringUtil;
 import org.apache.commons.beanutils.BeanUtils;
-
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
@@ -24,7 +9,14 @@ import org.dom4j.Element;
 import org.dom4j.io.OutputFormat;
 import org.dom4j.io.XMLWriter;
 
-import com.yeejoin.amos.latentdanger.core.util.StringUtil;
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.Map.Entry;
 
 public class ToolUtils {
 	public static Document map2xml(Map<String, Object> map, String rootName) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/vo/LatentDangerDetailVo.java

@@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerFlowRecordBo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.checkerframework.checker.units.qual.A;
 
 import java.util.Date;
 import java.util.List;

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/common/remote/RemoteWorkFlowService.java

 package com.yeejoin.amos.latentdanger.common.remote;
 
-import java.util.Map;
-
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
+import com.yeejoin.amos.latentdanger.business.constants.Constants;
+import com.yeejoin.amos.latentdanger.business.util.HttpUtil;
+import com.yeejoin.amos.latentdanger.common.enums.WorkFlowUriEnum;
 import com.yeejoin.amos.latentdanger.common.enums.YesOrNoEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,13 +15,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.Maps;
-import com.yeejoin.amos.latentdanger.business.constants.Constants;
-import com.yeejoin.amos.latentdanger.business.util.HttpUtil;
-import com.yeejoin.amos.latentdanger.common.enums.WorkFlowUriEnum;
+import java.util.Map;
 
 @Service("remoteWorkFlowService")
 public class RemoteWorkFlowService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/core/async/TaskExecutorPoolConfig.java

 package com.yeejoin.amos.latentdanger.core.async;
 
-import java.util.concurrent.Executor;
-
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
+import java.util.concurrent.Executor;
+
 /**
  * @author DELL
  */

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/core/enums/QueryOperatorEnum.java

 package com.yeejoin.amos.latentdanger.core.enums;
 
+import org.apache.commons.lang.enums.ValuedEnum;
+
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.enums.ValuedEnum;
-
 /**
  * 操作枚举
  * 

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/core/framework/ExceptionHandler.java

 package com.yeejoin.amos.latentdanger.core.framework;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.yeejoin.amos.latentdanger.business.util.CommonResponse;
+import com.yeejoin.amos.latentdanger.business.util.CommonResponseUtil;
+import com.yeejoin.amos.latentdanger.exception.PermissionException;
+import com.yeejoin.amos.latentdanger.exception.YeeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.yeejoin.amos.latentdanger.business.util.CommonResponse;
-import com.yeejoin.amos.latentdanger.business.util.CommonResponseUtil;
-import com.yeejoin.amos.latentdanger.exception.PermissionException;
-import com.yeejoin.amos.latentdanger.exception.YeeException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/core/threadpool/AmosThreadPool.java

 package com.yeejoin.amos.latentdanger.core.threadpool;
 
 import com.yeejoin.amos.latentdanger.business.constants.Constants;
-import com.yeejoin.amos.latentdanger.business.trigger.TriggerKeyQueue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/core/util/StringUtil.java

 package com.yeejoin.amos.latentdanger.core.util;
 
+import org.springframework.util.Assert;
+
 import java.math.BigDecimal;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.springframework.util.Assert;
-
 /**
  * 字符串工具类
  * 

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

 package com.yeejoin.amos.patrol.business.dao.mapper;
 
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
-
 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.param.MsgConfigParam;
 import com.yeejoin.amos.patrol.business.param.MsgInfoPageParam;
 import com.yeejoin.amos.patrol.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-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PlanMapper.java

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

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/TaskMapper.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.TaskDetailParam;
 import com.yeejoin.amos.patrol.business.param.TaskPageParam;
 import com.yeejoin.amos.patrol.business.param.TaskStatisticsParam;
@@ -14,6 +8,11 @@ import com.yeejoin.amos.patrol.business.vo.TaskDetailVo;
 import com.yeejoin.amos.patrol.business.vo.TaskStatisticsVo;
 import com.yeejoin.amos.patrol.core.common.response.TaskInfoRespone;
 import com.yeejoin.amos.patrol.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-patrol-biz/src/main/java/com/yeejoin/amos/patrol/core/util/query/BaseQuerySpecification.java

 package com.yeejoin.amos.patrol.core.util.query;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
+import com.yeejoin.amos.patrol.business.util.DaoCriteria;
+import com.yeejoin.amos.patrol.core.enums.QueryOperatorEnum;
 import org.hibernate.query.criteria.internal.CriteriaBuilderImpl;
 import org.hibernate.query.criteria.internal.predicate.InPredicate;
 import org.springframework.data.jpa.domain.Specification;
 
-import com.yeejoin.amos.patrol.business.util.DaoCriteria;
-import com.yeejoin.amos.patrol.core.enums.QueryOperatorEnum;
+import javax.persistence.criteria.*;
+import java.math.BigDecimal;
+import java.util.*;
 
 /**
  * 基础Specification

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

 package com.yeejoin.amos.supervision.business.controller;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.supervision.core.enums.QueryOperatorEnum;
-import com.yeejoin.amos.supervision.core.util.StringUtil;
-import org.springframework.cglib.beans.BeanMap;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.supervision.business.constants.XJConstant;
 import com.yeejoin.amos.supervision.business.util.DaoCriteria;
 import com.yeejoin.amos.supervision.core.common.request.CommonRequest;
+import com.yeejoin.amos.supervision.core.enums.QueryOperatorEnum;
+import com.yeejoin.amos.supervision.core.util.StringUtil;
+import org.springframework.cglib.beans.BeanMap;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 //import com.yeejoin.amos.op.core.common.query.DaoCriteria;
 

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

 package com.yeejoin.amos.supervision.business.controller;
 
-import java.util.HashMap;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.supervision.business.dao.mapper.CatalogTreeMapper;
 import com.yeejoin.amos.supervision.business.param.CatalogTreePageParam;
@@ -25,10 +10,19 @@ import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
 import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
 import com.yeejoin.amos.supervision.core.common.request.CommonRequest;
 import com.yeejoin.amos.supervision.dao.entity.CatalogTree;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import java.util.HashMap;
+import java.util.List;
 @RestController
 @RequestMapping(value = "/api/catalogTree")
 @Api(tags="分类api")

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

@@ -6,9 +6,11 @@ import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import com.yeejoin.amos.supervision.business.constants.XJConstant;
 import com.yeejoin.amos.supervision.business.dao.mapper.PlanTaskDetailMapper;
-import com.yeejoin.amos.supervision.business.dto.CheckDto;
 import com.yeejoin.amos.supervision.business.dto.CheckInputItemDto;
-import com.yeejoin.amos.supervision.business.param.*;
+import com.yeejoin.amos.supervision.business.param.CheckInfoPageParam;
+import com.yeejoin.amos.supervision.business.param.CheckPageParam;
+import com.yeejoin.amos.supervision.business.param.CheckRecordParam;
+import com.yeejoin.amos.supervision.business.param.CheckStatisticalParam;
 import com.yeejoin.amos.supervision.business.service.intfc.ICheckService;
 import com.yeejoin.amos.supervision.business.service.intfc.IPlanTaskService;
 import com.yeejoin.amos.supervision.business.service.intfc.ISafety3DDataSendService;
@@ -52,7 +54,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Consumer;
 
 @RestController
 @RequestMapping(value = "/api/check")

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

@@ -10,13 +10,7 @@ import com.yeejoin.amos.supervision.core.common.dto.CheckReportParamDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -24,9 +18,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.UnsupportedEncodingException;
 import java.text.ParseException;
-import java.util.Date;
 
 @RestController
 @RequestMapping(value = "/check/report")

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

 package com.yeejoin.amos.supervision.business.controller;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.yeejoin.amos.supervision.business.service.intfc.IAppService;
 import com.yeejoin.amos.supervision.business.util.CommonResponse;
 import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
@@ -14,9 +7,14 @@ import com.yeejoin.amos.supervision.common.enums.CheckStatisticsTypeEnum;
 import com.yeejoin.amos.supervision.common.enums.PlanTaskExecution;
 import com.yeejoin.amos.supervision.common.enums.PlanTaskFinishStatusEnum;
 import com.yeejoin.amos.supervision.common.enums.TaskStatisticsTypeEnum;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 
 @RestController

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

 package com.yeejoin.amos.supervision.business.controller;
 
-import java.util.List;
-
+import com.yeejoin.amos.supervision.business.dao.repository.IConfigDao;
+import com.yeejoin.amos.supervision.business.util.CommonResponse;
+import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
+import com.yeejoin.amos.supervision.dao.entity.Config;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,13 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
-import com.yeejoin.amos.supervision.business.dao.repository.IConfigDao;
-import com.yeejoin.amos.supervision.business.util.CommonResponse;
-import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
-import com.yeejoin.amos.supervision.dao.entity.Config;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import java.util.List;
 
 
 /**

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

 package com.yeejoin.amos.supervision.business.controller;
 
 
-import java.util.HashMap;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.supervision.business.service.intfc.IEquipmentHandlerService;
 import com.yeejoin.amos.supervision.business.util.CommonResponse;
 import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
 import com.yeejoin.amos.supervision.business.util.Toke;
 import com.yeejoin.amos.supervision.dao.entity.InputItem;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * 任务

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

 package com.yeejoin.amos.supervision.business.controller;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.supervision.business.param.TaskStatisticsParam;
 import com.yeejoin.amos.supervision.business.service.impl.TaskReportService;
 import com.yeejoin.amos.supervision.business.util.CommonResponse;
 import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
 import com.yeejoin.amos.supervision.business.util.Toke;
-
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.io.FileUtils;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.util.Map;
 
 @RestController
 @RequestMapping(value = "/api/excel")

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

 package com.yeejoin.amos.supervision.business.controller;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
+import com.yeejoin.amos.supervision.business.service.intfc.ISafety3DDataSendService;
+import com.yeejoin.amos.supervision.business.util.CommonResponse;
+import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
+import com.yeejoin.amos.supervision.core.common.response.TaskInfoRespone;
 import com.yeejoin.amos.supervision.email.IEmailService;
 import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,18 +24,11 @@ import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
-import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.feign.privilege.model.CompanyModel;
-import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
-import com.yeejoin.amos.supervision.business.service.intfc.ISafety3DDataSendService;
-import com.yeejoin.amos.supervision.business.util.CommonResponse;
-import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
-import com.yeejoin.amos.supervision.core.common.response.TaskInfoRespone;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 获取部门、公司信息

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

 package com.yeejoin.amos.supervision.business.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
-import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.supervision.business.service.intfc.ICheckService;
 import com.yeejoin.amos.supervision.business.service.intfc.IPlanTaskService;
@@ -22,9 +7,18 @@ import com.yeejoin.amos.supervision.business.service.intfc.IPointService;
 import com.yeejoin.amos.supervision.business.service.intfc.ITaskService;
 import com.yeejoin.amos.supervision.business.util.CommonResponse;
 import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
-
+import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @RestController
 @RequestMapping(value = "/api/home")

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

 package com.yeejoin.amos.supervision.business.controller;
 
-import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import javax.servlet.http.HttpServletResponse;
-
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.supervision.business.dao.repository.IInputItemDao;
+import com.yeejoin.amos.supervision.business.param.InputItemPageParam;
+import com.yeejoin.amos.supervision.business.param.InputItemParam;
+import com.yeejoin.amos.supervision.business.service.intfc.IInputItemService;
+import com.yeejoin.amos.supervision.business.util.*;
 import com.yeejoin.amos.supervision.business.vo.InputItemTemplateVo;
 import com.yeejoin.amos.supervision.business.vo.InputItemVo;
 import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
+import com.yeejoin.amos.supervision.common.enums.DictTypeEnum;
+import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
+import com.yeejoin.amos.supervision.core.common.request.CommonRequest;
 import com.yeejoin.amos.supervision.core.enums.QueryOperatorEnum;
 import com.yeejoin.amos.supervision.core.util.StringUtil;
+import com.yeejoin.amos.supervision.dao.entity.InputItem;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
@@ -20,37 +28,18 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.supervision.business.dao.repository.IInputItemDao;
-import com.yeejoin.amos.supervision.business.param.InputItemPageParam;
-import com.yeejoin.amos.supervision.business.param.InputItemParam;
-import com.yeejoin.amos.supervision.business.service.intfc.IInputItemService;
-import com.yeejoin.amos.supervision.business.util.CommonResponse;
-import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
-import com.yeejoin.amos.supervision.business.util.DaoCriteria;
-import com.yeejoin.amos.supervision.business.util.ExcelUtils;
-import com.yeejoin.amos.supervision.business.util.InputItemParamUtil;
-import com.yeejoin.amos.supervision.common.enums.DictTypeEnum;
-import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
-import com.yeejoin.amos.supervision.core.common.request.CommonRequest;
-import com.yeejoin.amos.supervision.dao.entity.InputItem;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * 检查项

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

 package com.yeejoin.amos.supervision.business.controller;
 
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-import com.yeejoin.amos.supervision.business.vo.DangerTimeAxisVo;
-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.util.ObjectUtils;
-import org.springframework.web.bind.annotation.*;
-
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.supervision.business.dto.DangerExecuteSubmitDto;
-import com.yeejoin.amos.supervision.business.param.LatentDangerExcuteParam;
-import com.yeejoin.amos.supervision.business.param.LatentDangerListParam;
-import com.yeejoin.amos.supervision.business.param.LatentDangerNormalParam;
-import com.yeejoin.amos.supervision.business.param.LatentDangerPatrolParam;
-import com.yeejoin.amos.supervision.business.param.PageParam;
+import com.yeejoin.amos.supervision.business.param.*;
 import com.yeejoin.amos.supervision.business.service.intfc.ILatentDangerService;
 import com.yeejoin.amos.supervision.business.util.CommonResponse;
 import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
 import com.yeejoin.amos.supervision.business.util.FileHelper;
+import com.yeejoin.amos.supervision.business.vo.DangerTimeAxisVo;
 import com.yeejoin.amos.supervision.common.enums.DictTypeEnum;
 import com.yeejoin.amos.supervision.core.common.response.DangerListResponse;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+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.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+
 @RestController
 @RequestMapping(value = "/api/latent/danger")
 @Api(tags = "隐患接口api")

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

 package com.yeejoin.amos.supervision.business.controller;
 
-import java.util.Date;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.yeejoin.amos.supervision.business.service.intfc.IMeasuresService;
 import com.yeejoin.amos.supervision.business.util.CommonResponse;
 import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
 import com.yeejoin.amos.supervision.dao.entity.Measure;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import java.util.Date;
 
 @RestController
 @RequestMapping(value = "/measures")

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

@@ -16,8 +16,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.Map;
-
 @RestController
 @RequestMapping(value = "/api/planAudit")
 @Api(tags = "计划审核api")

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

 package com.yeejoin.amos.supervision.business.controller;
 
-import static org.hamcrest.CoreMatchers.nullValue;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;import java.util.stream.Collector;
-import java.util.stream.Collectors;
-
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.GroupModel;
+import com.yeejoin.amos.supervision.business.param.PlanInfoPageParam;
+import com.yeejoin.amos.supervision.business.service.intfc.IPlanService;
+import com.yeejoin.amos.supervision.business.util.CommonResponse;
+import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
+import com.yeejoin.amos.supervision.business.util.PlanPageParamUtil;
 import com.yeejoin.amos.supervision.common.enums.CheckTypeSuEnum;
 import com.yeejoin.amos.supervision.common.enums.DangerCheckTypeLevelEnum;
 import com.yeejoin.amos.supervision.common.enums.PlanStatusEnum;
 import com.yeejoin.amos.supervision.core.common.request.AddPlanRequest;
+import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
+import com.yeejoin.amos.supervision.core.common.request.CommonRequest;
 import com.yeejoin.amos.supervision.core.common.response.PlanPointRespone;
 import com.yeejoin.amos.supervision.core.framework.PersonIdentify;
+import com.yeejoin.amos.supervision.dao.entity.Plan;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,24 +30,14 @@ import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.supervision.business.param.PlanInfoPageParam;
-import com.yeejoin.amos.supervision.business.service.intfc.IPlanService;
-import com.yeejoin.amos.supervision.business.util.CommonResponse;
-import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
-import com.yeejoin.amos.supervision.business.util.PlanPageParamUtil;
-import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
-import com.yeejoin.amos.supervision.core.common.request.CommonRequest;
-import com.yeejoin.amos.supervision.dao.entity.Plan;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 @RestController
 @RequestMapping(value = "/api/plan")
 @Api(tags = "巡检计划api")

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

 package com.yeejoin.amos.supervision.business.controller;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletResponse;
-
-import com.yeejoin.amos.supervision.business.util.*;
-import com.yeejoin.amos.supervision.business.vo.CodeOrderVo;
-import com.yeejoin.amos.supervision.business.vo.PlanTaskVo;
-import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
-import com.yeejoin.amos.supervision.common.enums.*;
-import com.yeejoin.amos.supervision.core.framework.PersonIdentify;
-import com.yeejoin.amos.supervision.exception.YeeException;
-import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -36,18 +8,38 @@ import com.yeejoin.amos.supervision.business.param.PlanTaskPageParam;
 import com.yeejoin.amos.supervision.business.service.intfc.IPlanTaskService;
 import com.yeejoin.amos.supervision.business.service.intfc.IPointService;
 import com.yeejoin.amos.supervision.business.service.intfc.IRouteService;
+import com.yeejoin.amos.supervision.business.util.*;
+import com.yeejoin.amos.supervision.business.vo.CodeOrderVo;
+import com.yeejoin.amos.supervision.business.vo.PlanTaskVo;
+import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
+import com.yeejoin.amos.supervision.common.enums.*;
 import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
 import com.yeejoin.amos.supervision.core.common.request.CommonRequest;
 import com.yeejoin.amos.supervision.core.common.response.AppPointCheckRespone;
+import com.yeejoin.amos.supervision.core.framework.PersonIdentify;
 import com.yeejoin.amos.supervision.dao.entity.Point;
 import com.yeejoin.amos.supervision.dao.entity.PointClassify;
-
+import com.yeejoin.amos.supervision.exception.YeeException;
+import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
 @RestController
 @RequestMapping(value = "/api/planTask")
 @Api(tags = "计划执行api")

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

 package com.yeejoin.amos.supervision.business.controller;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-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 javax.servlet.http.HttpServletResponse;
-
-import com.yeejoin.amos.supervision.business.dto.OrgUsrFormDto;
-import com.yeejoin.amos.supervision.business.vo.MaintenanceResourceData;
-import com.yeejoin.amos.supervision.business.vo.PointClassifyVo;
-import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
-import com.yeejoin.amos.supervision.business.vo.PointVo;
-import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
-import io.swagger.annotations.ApiModel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.http.MediaType;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.supervision.business.dto.PointDto;
@@ -47,23 +9,35 @@ import com.yeejoin.amos.supervision.business.param.PointImportQueryParam;
 import com.yeejoin.amos.supervision.business.param.PointParam;
 import com.yeejoin.amos.supervision.business.service.intfc.ICatalogTreeService;
 import com.yeejoin.amos.supervision.business.service.intfc.IPointService;
-import com.yeejoin.amos.supervision.business.util.CommonResponse;
-import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
-import com.yeejoin.amos.supervision.business.util.DaoCriteria;
-import com.yeejoin.amos.supervision.business.util.FileHelper;
-import com.yeejoin.amos.supervision.business.util.PointParamUtils;
+import com.yeejoin.amos.supervision.business.util.*;
+import com.yeejoin.amos.supervision.business.vo.PointClassifyVo;
+import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
+import com.yeejoin.amos.supervision.business.vo.PointVo;
 import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
 import com.yeejoin.amos.supervision.core.common.request.CommonRequest;
 import com.yeejoin.amos.supervision.core.common.response.PointResponse;
 import com.yeejoin.amos.supervision.dao.entity.Point;
 import com.yeejoin.amos.supervision.dao.entity.PointClassify;
-
+import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.http.MediaType;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
 @RestController
 @RequestMapping(value = "/api/point")
 @Api(tags = "巡检点api")

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

 package com.yeejoin.amos.supervision.business.controller;
 
-import java.util.HashMap;
-import java.util.List;
-
-import com.yeejoin.amos.supervision.business.vo.CheckStatsVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.supervision.business.param.CheckStatsListPageParam;
 import com.yeejoin.amos.supervision.business.service.intfc.IQueryStatsService;
 import com.yeejoin.amos.supervision.business.util.CheckStatsParamUtils;
 import com.yeejoin.amos.supervision.business.util.CommonResponse;
 import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
+import com.yeejoin.amos.supervision.business.vo.CheckStatsVo;
 import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
 import com.yeejoin.amos.supervision.core.common.request.CommonRequest;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import java.util.HashMap;
+import java.util.List;
 
 @RestController
 @RequestMapping(value = "/api/stats")

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

 package com.yeejoin.amos.supervision.business.controller;
 
-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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.supervision.business.param.RoutePageParam;
 import com.yeejoin.amos.supervision.business.service.intfc.IRouteService;
@@ -36,13 +13,21 @@ import com.yeejoin.amos.supervision.dao.entity.InputItem;
 import com.yeejoin.amos.supervision.dao.entity.Plan;
 import com.yeejoin.amos.supervision.dao.entity.Route;
 import com.yeejoin.amos.supervision.dao.entity.RoutePoint;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 @RestController
 @RequestMapping(value = "/api/route")
 @Api(tags = "巡检路线api")

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

 package com.yeejoin.amos.supervision.business.controller;
 
-import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.supervision.business.util.CommonResponse;
 import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
-
+import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 @RestController
 @RequestMapping(value = "/safe")

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

 package com.yeejoin.amos.supervision.business.controller;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.supervision.business.entity.mybatis.CheckChkExListBo;
-import com.yeejoin.amos.supervision.business.entity.mybatis.CheckDetailBo;
-import com.yeejoin.amos.supervision.business.entity.mybatis.CheckInputBo;
-import com.yeejoin.amos.supervision.business.entity.mybatis.CheckPtListBo;
-import com.yeejoin.amos.supervision.business.entity.mybatis.CheckTraListBo;
-import com.yeejoin.amos.supervision.business.entity.mybatis.CheckUserBo;
-import com.yeejoin.amos.supervision.business.entity.mybatis.PlanRoutePointBo;
+import com.yeejoin.amos.supervision.business.entity.mybatis.*;
 import com.yeejoin.amos.supervision.business.param.CheckInfoListPageParam;
 import com.yeejoin.amos.supervision.business.param.CheckPtListPageParam;
 import com.yeejoin.amos.supervision.business.service.intfc.ICheckService;
@@ -45,11 +20,19 @@ import com.yeejoin.amos.supervision.core.common.request.CommonRequest;
 import com.yeejoin.amos.supervision.core.common.response.CommonPage;
 import com.yeejoin.amos.supervision.core.common.response.QueryCriteriaRespone;
 import com.yeejoin.amos.supervision.dao.entity.Measure;
-
+import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import java.util.*;
 
 @RestController
 @RequestMapping(value = "/api/spc")

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

 package com.yeejoin.amos.supervision.business.controller;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.supervision.business.param.SynInputItemParam;
@@ -22,10 +9,16 @@ import com.yeejoin.amos.supervision.business.service.intfc.ISynDataService;
 import com.yeejoin.amos.supervision.business.util.CommonResponse;
 import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
 import com.yeejoin.amos.supervision.business.util.Toke;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 
 @RestController

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

 package com.yeejoin.amos.supervision.business.controller;
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-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.servlet.http.HttpServletResponse;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import com.yeejoin.amos.supervision.business.vo.TaskStatisticsVo;
-import com.yeejoin.amos.supervision.core.async.AsyncTask;
-import com.yeejoin.amos.supervision.core.util.DateUtil;
-import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.data.domain.Page;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.DomDriver;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -56,31 +7,45 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.supervision.business.constants.XJConstant;
 import com.yeejoin.amos.supervision.business.entity.mybatis.TaskBo;
 import com.yeejoin.amos.supervision.business.entity.mybatis.TaskFeedbackBo;
-import com.yeejoin.amos.supervision.business.param.FeedbackParam;
-import com.yeejoin.amos.supervision.business.param.RoutePointParam;
-import com.yeejoin.amos.supervision.business.param.TaskPageParam;
-import com.yeejoin.amos.supervision.business.param.TaskParam;
-import com.yeejoin.amos.supervision.business.param.TaskStatisticsParam;
+import com.yeejoin.amos.supervision.business.param.*;
 import com.yeejoin.amos.supervision.business.service.intfc.IPointService;
 import com.yeejoin.amos.supervision.business.service.intfc.ITaskService;
-import com.yeejoin.amos.supervision.business.util.ClazzFieldUtil;
-import com.yeejoin.amos.supervision.business.util.CommonResponse;
-import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
-import com.yeejoin.amos.supervision.business.util.DaoCriteria;
-import com.yeejoin.amos.supervision.business.util.FileHelper;
-import com.yeejoin.amos.supervision.business.util.TaskPageParamUtil;
+import com.yeejoin.amos.supervision.business.util.*;
+import com.yeejoin.amos.supervision.business.vo.TaskStatisticsVo;
 import com.yeejoin.amos.supervision.common.enums.TaskFeedbackType;
 import com.yeejoin.amos.supervision.common.enums.TaskStatusEnum;
+import com.yeejoin.amos.supervision.core.async.AsyncTask;
 import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
 import com.yeejoin.amos.supervision.core.common.request.CommonRequest;
 import com.yeejoin.amos.supervision.core.common.response.QueryCriteriaRespone;
+import com.yeejoin.amos.supervision.core.util.DateUtil;
 import com.yeejoin.amos.supervision.dao.entity.Task;
 import com.yeejoin.amos.supervision.dao.entity.TaskFeedback;
 import com.yeejoin.amos.supervision.dao.entity.TaskPicture;
-
+import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.data.domain.Page;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.transform.*;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import java.io.*;
+import java.lang.reflect.Field;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 任务

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

 package com.yeejoin.amos.supervision.business.controller;
 
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.supervision.business.param.TaskStatisticsParam;
 import com.yeejoin.amos.supervision.business.service.impl.TaskReportService;
 import com.yeejoin.amos.supervision.business.util.CommonResponse;
 import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
 import com.yeejoin.amos.supervision.business.util.Toke;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 @RestController
 @RequestMapping(value = "/api/task/report")

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

 package com.yeejoin.amos.supervision.business.controller;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-import com.yeejoin.amos.supervision.core.framework.PersonIdentify;
-import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
-import com.yeejoin.amos.supervision.jpush.AppMessagePushService;
-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.env.Environment;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestTemplate;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -50,16 +14,28 @@ import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
 import com.yeejoin.amos.supervision.business.param.AppLoginUserParam;
 import com.yeejoin.amos.supervision.business.service.intfc.IAppService;
-import com.yeejoin.amos.supervision.business.util.CommonResponse;
-import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
-import com.yeejoin.amos.supervision.business.util.DepartmentUserTreeAppVo;
-import com.yeejoin.amos.supervision.business.util.DepartmentUserTreeWebVo;
-import com.yeejoin.amos.supervision.business.util.DesUtil;
-import com.yeejoin.amos.supervision.business.util.StringUtil;
-
+import com.yeejoin.amos.supervision.business.util.*;
+import com.yeejoin.amos.supervision.core.framework.PersonIdentify;
+import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
+import com.yeejoin.amos.supervision.jpush.AppMessagePushService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+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.env.Environment;
+import org.springframework.http.*;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import java.lang.reflect.Field;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 获取用户信息