合并装置模块和检测计划模块

detection/Readme.md

@@ -1,6 +1,9 @@
 #### 简介
     设备模块主要包含以下功能：
+* 检测计划管理
 * 被检设备管理
-* 检测脚本管理
+* 被检设备下监测点管理
 * 误差体系管理
+* 检测脚本管理
 * 检测源管理
+* 检测报告管理

detection/pom.xml

@@ -8,10 +8,9 @@
         <artifactId>CN_Gather</artifactId>
         <version>1.0.0</version>
     </parent>
-
     <artifactId>detection</artifactId>
-    <dependencies>
 
+    <dependencies>
         <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>njcn-common</artifactId>
@@ -29,20 +28,12 @@
             <artifactId>spingboot2.3.12</artifactId>
             <version>2.3.12</version>
         </dependency>
-
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
-            <version>4.1.68.Final</version>
-        </dependency>
-
         <dependency>
             <groupId>com.njcn.gather</groupId>
-            <artifactId>device</artifactId>
+            <artifactId>system</artifactId>
             <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
@@ -54,22 +45,23 @@
             <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
-
+        <dependency>
-
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>4.1.68.Final</version>
+        </dependency>
         <!-- WordToHtml .doc .odcx  poi  -->
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-scratchpad</artifactId>
             <version>4.1.2</version>
         </dependency>
-
         <!-- 操作excel的库 注意版本保持一致 poi poi-ooxml  poi-scratchpad -->
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
             <version>4.1.2</version>
         </dependency>
-
         <!--poi-ooxml和*poi-ooxml-schemas*是poi对2007及以上版本的扩充。-->
         <dependency>
             <groupId>org.apache.poi</groupId>
@@ -82,7 +74,7 @@
             <artifactId>poi-ooxml</artifactId>
             <version>4.1.2</version>
         </dependency>
-
     </dependencies>
 
+
 </project>

detection/src/main/java/com/njcn/gather/detection/controller/PreDetectionController.java

@@ -1,20 +1,17 @@
 package com.njcn.gather.detection.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
-import com.njcn.gather.detection.pojo.po.DevData;
 import com.njcn.gather.detection.service.PreDetectionService;
 import com.njcn.gather.detection.service.impl.DetectionServiceImpl;
 import com.njcn.gather.detection.util.socket.MsgUtil;
-import com.njcn.gather.device.device.pojo.vo.PreDetection;
+import com.njcn.gather.device.pojo.vo.PreDetection;
-import com.njcn.gather.device.device.service.IPqDevService;
+import com.njcn.gather.device.service.IPqDevService;
-import com.njcn.gather.device.script.pojo.param.PqScriptIssueParam;
+import com.njcn.gather.script.pojo.param.PqScriptIssueParam;
-import com.njcn.gather.device.script.pojo.po.SourceIssue;
+import com.njcn.gather.script.pojo.po.SourceIssue;
-import com.njcn.gather.device.script.service.IPqScriptDtlsService;
+import com.njcn.gather.script.service.IPqScriptDtlsService;
-import com.njcn.gather.system.dictionary.pojo.enums.DictDataEnum;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.HttpResultUtil;
 import io.swagger.annotations.Api;
@@ -24,7 +21,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java

@@ -15,14 +15,14 @@ import com.njcn.gather.detection.pojo.po.SourceCompareDev;
 import com.njcn.gather.detection.pojo.vo.*;
 import com.njcn.gather.detection.service.impl.DetectionServiceImpl;
 import com.njcn.gather.detection.util.socket.*;
-import com.njcn.gather.device.device.pojo.po.PqDev;
+import com.njcn.gather.device.pojo.po.PqDev;
-import com.njcn.gather.device.device.pojo.vo.PreDetection;
+import com.njcn.gather.device.pojo.vo.PreDetection;
-import com.njcn.gather.device.device.service.IPqDevService;
+import com.njcn.gather.device.service.IPqDevService;
-import com.njcn.gather.device.script.pojo.param.PqScriptCheckDataParam;
+import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam;
-import com.njcn.gather.device.script.pojo.param.PqScriptIssueParam;
+import com.njcn.gather.script.pojo.param.PqScriptIssueParam;
-import com.njcn.gather.device.script.pojo.po.SourceIssue;
+import com.njcn.gather.script.pojo.po.SourceIssue;
-import com.njcn.gather.device.script.service.IPqScriptCheckDataService;
+import com.njcn.gather.script.service.IPqScriptCheckDataService;
-import com.njcn.gather.device.script.service.IPqScriptDtlsService;
+import com.njcn.gather.script.service.IPqScriptDtlsService;
 import com.njcn.gather.plan.service.IAdPlanService;
 import com.njcn.gather.storage.pojo.param.StorageParam;
 import com.njcn.gather.storage.pojo.po.AdHarmonicResult;
@@ -46,7 +46,6 @@ import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 import java.util.stream.Collectors;

detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java

@@ -16,10 +16,9 @@ import com.njcn.gather.detection.util.socket.SocketManager;
 import com.njcn.gather.detection.util.socket.WebServiceManager;
 import com.njcn.gather.detection.util.socket.cilent.NettyClient;
 import com.njcn.gather.detection.util.socket.cilent.NettyDevClientHandler;
-import com.njcn.gather.detection.util.socket.web.WebSocketHandler;
+import com.njcn.gather.device.pojo.vo.PreDetection;
-import com.njcn.gather.device.device.pojo.vo.PreDetection;
+import com.njcn.gather.device.service.IPqDevService;
-import com.njcn.gather.device.device.service.IPqDevService;
+import com.njcn.gather.script.pojo.po.SourceIssue;
-import com.njcn.gather.device.script.pojo.po.SourceIssue;
 import com.njcn.gather.system.pojo.enums.DicDataEnum;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;

detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java

@@ -11,13 +11,13 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
 import com.njcn.gather.detection.pojo.po.DevData;
 import com.njcn.gather.detection.pojo.vo.DetectionData;
-import com.njcn.gather.device.err.pojo.param.PqErrSysParam;
+import com.njcn.gather.err.pojo.param.PqErrSysParam;
-import com.njcn.gather.device.err.pojo.po.PqErrSysDtls;
+import com.njcn.gather.err.pojo.po.PqErrSysDtls;
-import com.njcn.gather.device.err.pojo.vo.ErrDtlsCheckDataVO;
+import com.njcn.gather.err.pojo.vo.ErrDtlsCheckDataVO;
-import com.njcn.gather.device.err.service.IPqErrSysDtlsService;
+import com.njcn.gather.err.service.IPqErrSysDtlsService;
-import com.njcn.gather.device.script.pojo.po.PqScriptCheckData;
+import com.njcn.gather.script.pojo.po.PqScriptCheckData;
-import com.njcn.gather.device.script.pojo.po.SourceIssue;
+import com.njcn.gather.script.pojo.po.SourceIssue;
-import com.njcn.gather.device.script.service.IPqScriptCheckDataService;
+import com.njcn.gather.script.service.IPqScriptCheckDataService;
 import com.njcn.gather.storage.pojo.po.AdHarmonicResult;
 import com.njcn.gather.storage.pojo.po.AdNonHarmonicResult;
 import com.njcn.gather.storage.service.DetectionDataDealService;

detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java

@@ -3,50 +3,36 @@ package com.njcn.gather.detection.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.njcn.common.bean.CustomCacheUtil;
-import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.gather.detection.handler.SocketDevResponseService;
 import com.njcn.gather.detection.handler.SocketSourceResponseService;
 import com.njcn.gather.detection.pojo.enums.DetectionResponseEnum;
 import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
-import com.njcn.gather.detection.pojo.vo.SocketDataMsg;
 import com.njcn.gather.detection.pojo.vo.SocketMsg;
 import com.njcn.gather.detection.service.PreDetectionService;
 
 import com.njcn.gather.detection.util.socket.CnSocketUtil;
 import com.njcn.gather.detection.util.socket.FormalTestManager;
-import com.njcn.gather.detection.util.socket.MsgUtil;
 import com.njcn.gather.detection.util.socket.SocketManager;
 import com.njcn.gather.detection.util.socket.cilent.NettyClient;
 import com.njcn.gather.detection.util.socket.cilent.NettySourceClientHandler;
-import com.njcn.gather.device.device.service.IPqDevService;
+import com.njcn.gather.device.service.IPqDevService;
-import com.njcn.gather.device.script.pojo.param.PqScriptCheckDataParam;
+import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam;
-import com.njcn.gather.device.script.pojo.param.PqScriptIssueParam;
+import com.njcn.gather.script.pojo.po.SourceIssue;
-import com.njcn.gather.device.script.pojo.po.PqScriptCheckData;
+import com.njcn.gather.script.service.IPqScriptCheckDataService;
-import com.njcn.gather.device.script.pojo.po.PqScriptDtls;
+import com.njcn.gather.script.service.IPqScriptDtlsService;
-import com.njcn.gather.device.script.pojo.po.SourceIssue;
+import com.njcn.gather.source.pojo.po.SourceInitialize;
-import com.njcn.gather.device.script.service.IPqScriptCheckDataService;
+import com.njcn.gather.source.service.IPqSourceService;
-import com.njcn.gather.device.script.service.IPqScriptDtlsService;
-import com.njcn.gather.device.source.pojo.po.PqSource;
-import com.njcn.gather.device.source.pojo.po.SourceInitialize;
-import com.njcn.gather.device.source.service.IPqSourceService;
 import com.njcn.gather.plan.pojo.po.AdPlan;
 import com.njcn.gather.plan.pojo.po.AdPlanSource;
 import com.njcn.gather.plan.service.IAdPlanService;
 import com.njcn.gather.plan.service.IAdPlanSourceService;
-import com.njcn.gather.storage.pojo.param.StorageParam;
-import com.njcn.gather.storage.service.AdHarmonicService;
 import com.njcn.gather.system.dictionary.pojo.enums.DictDataEnum;
-import com.njcn.gather.system.dictionary.pojo.po.DictTree;
 import com.njcn.gather.system.dictionary.service.IDictDataService;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelFutureListener;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;

detection/src/main/java/com/njcn/gather/detection/util/socket/CnSocketUtil.java

@@ -4,13 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
-import com.njcn.gather.detection.pojo.vo.CoefficientVO;
 import com.njcn.gather.detection.pojo.vo.SocketMsg;
 import com.njcn.gather.detection.pojo.vo.WebSocketVO;
-import com.njcn.gather.detection.util.socket.web.WebSocketHandler;
-import org.apache.poi.ss.formula.functions.T;
-
-import java.util.Objects;
 
 /**
  * @Author: cdf

detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java

@@ -1,7 +1,6 @@
 package com.njcn.gather.detection.util.socket;
 
-import com.njcn.gather.detection.pojo.vo.DevLineTestResult;
+import com.njcn.gather.device.pojo.vo.PreDetection;
-import com.njcn.gather.device.device.pojo.vo.PreDetection;
 
 import java.util.ArrayList;
 import java.util.HashMap;

detection/src/main/java/com/njcn/gather/detection/util/socket/SocketManager.java

@@ -1,13 +1,11 @@
 package com.njcn.gather.detection.util.socket;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.njcn.gather.detection.pojo.dto.DevXiNumData;
+import com.njcn.gather.device.pojo.vo.PreDetection;
-import com.njcn.gather.device.device.pojo.vo.PreDetection;
+import com.njcn.gather.script.pojo.po.SourceIssue;
-import com.njcn.gather.device.script.pojo.po.SourceIssue;
 import io.netty.channel.Channel;
 import io.netty.channel.nio.NioEventLoopGroup;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

detection/src/main/java/com/njcn/gather/detection/util/socket/XiNumberManager.java

@@ -2,7 +2,7 @@ package com.njcn.gather.detection.util.socket;
 
 import com.njcn.gather.detection.pojo.dto.DevXiNumData;
 import com.njcn.gather.detection.pojo.vo.CoefficientVO;
-import com.njcn.gather.device.script.pojo.po.SourceIssue;
+import com.njcn.gather.script.pojo.po.SourceIssue;
 
 import java.util.ArrayList;
 import java.util.List;

detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyClient.java

@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSON;
 import com.njcn.gather.detection.pojo.enums.SourceResponseCodeEnum;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
 import com.njcn.gather.detection.pojo.vo.SocketDataMsg;
-import com.njcn.gather.detection.pojo.vo.WebSocketVO;
 import com.njcn.gather.detection.util.socket.CnSocketUtil;
 import com.njcn.gather.detection.util.socket.SocketManager;
 import com.njcn.gather.detection.util.socket.WebServiceManager;

detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyDevClientHandler.java

@@ -6,11 +6,10 @@ import com.njcn.gather.detection.handler.SocketDevResponseService;
 import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
 import com.njcn.gather.detection.pojo.vo.DevLineTestResult;
-import com.njcn.gather.detection.pojo.vo.SocketMsg;
 import com.njcn.gather.detection.pojo.vo.WebSocketVO;
 import com.njcn.gather.detection.util.socket.*;
-import com.njcn.gather.device.device.pojo.vo.PreDetection;
+import com.njcn.gather.device.pojo.vo.PreDetection;
-import com.njcn.gather.device.script.pojo.po.SourceIssue;
+import com.njcn.gather.script.pojo.po.SourceIssue;
 import com.njcn.gather.system.pojo.enums.DicDataEnum;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;

detection/src/main/java/com/njcn/gather/detection/util/socket/service/NettyServerChannelInitializer.java

@@ -1,6 +1,5 @@
 package com.njcn.gather.detection.util.socket.service;
 
-import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.handler.codec.string.StringDecoder;

detection/src/main/java/com/njcn/gather/detection/util/socket/service/NettyServerHandler.java

@@ -2,7 +2,6 @@ package com.njcn.gather.detection.util.socket.service;
 
 import com.alibaba.fastjson.JSONObject;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 

detection/src/main/java/com/njcn/gather/detection/util/socket/web/WebSocketInitializer.java

@@ -11,8 +11,6 @@ import io.netty.handler.codec.http.HttpServerCodec;
 import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
 import io.netty.handler.stream.ChunkedWriteHandler;
 import io.netty.handler.timeout.IdleStateHandler;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
 
 import java.util.concurrent.TimeUnit;
 

detection/src/main/java/com/njcn/gather/device/controller/PqDevController.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.device.controller;
+package com.njcn.gather.device.controller;
 
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
@@ -14,13 +14,13 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.LogUtil;
-import com.njcn.gather.device.device.pojo.param.PqDevParam;
+import com.njcn.gather.device.pojo.param.PqDevParam;
-import com.njcn.gather.device.device.pojo.po.PqDev;
+import com.njcn.gather.device.pojo.po.PqDev;
-import com.njcn.gather.device.device.pojo.vo.CNDevExcel;
+import com.njcn.gather.device.pojo.vo.CNDevExcel;
-import com.njcn.gather.device.device.pojo.vo.PqDevExcel;
+import com.njcn.gather.device.pojo.vo.PqDevExcel;
-import com.njcn.gather.device.device.pojo.vo.PqDevVO;
+import com.njcn.gather.device.pojo.vo.PqDevVO;
-import com.njcn.gather.device.device.pojo.vo.PreDetection;
+import com.njcn.gather.device.pojo.vo.PreDetection;
-import com.njcn.gather.device.device.service.IPqDevService;
+import com.njcn.gather.device.service.IPqDevService;
 import com.njcn.gather.device.pojo.enums.DevResponseEnum;
 import com.njcn.gather.device.pojo.enums.PatternEnum;
 import com.njcn.gather.system.dictionary.pojo.po.DictData;
@@ -42,7 +42,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

detection/src/main/java/com/njcn/gather/device/mapper/PqDevMapper.java

@@ -1,8 +1,8 @@
-package com.njcn.gather.device.device.mapper;
+package com.njcn.gather.device.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
-import com.njcn.gather.device.device.pojo.po.PqDev;
+import com.njcn.gather.device.pojo.po.PqDev;
-import com.njcn.gather.device.device.pojo.vo.PreDetection;
+import com.njcn.gather.device.pojo.vo.PreDetection;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -16,7 +16,7 @@ public interface PqDevMapper extends MPJBaseMapper<PqDev> {
     /**
      * 根据装置id集合获取装置信息
      * @param devIds 装置id
-     * @return: java.util.List<com.njcn.gather.device.device.pojo.vo.PreDetection>
+     * @return: java.util.List<com.njcn.gather.device.pojo.vo.PreDetection>
      * @Author: wr
      * @Date: 2024/12/12 11:46
      */

detection/src/main/java/com/njcn/gather/device/mapper/mapping/PqDevMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.gather.device.device.mapper.PqDevMapper">
+<mapper namespace="com.njcn.gather.device.mapper.PqDevMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="DevResultMap" type="com.njcn.gather.device.device.pojo.vo.PreDetection">
+    <resultMap id="DevResultMap" type="com.njcn.gather.device.pojo.vo.PreDetection">
         <id column="Id" property="devId" />
         <id column="Name" property="devName" />
         <id column="IP" property="devIP" />
@@ -19,7 +19,7 @@
         <collection
                 property="monitorList"
                 column="{ devId = Id}"
-                select="com.njcn.gather.device.monitor.mapper.PqMonitorMapper.selectMonitorInfo"
+                select="com.njcn.gather.monitor.mapper.PqMonitorMapper.selectMonitorInfo"
         >
         </collection>
     </resultMap>

detection/src/main/java/com/njcn/gather/device/pojo/param/PqDevParam.java

@@ -1,7 +1,7 @@
-package com.njcn.gather.device.device.pojo.param;
+package com.njcn.gather.device.pojo.param;
 
 import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.gather.device.monitor.pojo.param.PqMonitorParam;
+import com.njcn.gather.monitor.pojo.param.PqMonitorParam;
 import com.njcn.gather.device.pojo.constant.DevValidMessage;
 import com.njcn.web.pojo.annotation.DateTimeStrValid;
 import com.njcn.web.pojo.param.BaseParam;

detection/src/main/java/com/njcn/gather/device/pojo/po/PqDev.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.device.pojo.po;
+package com.njcn.gather.device.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;

detection/src/main/java/com/njcn/gather/device/pojo/vo/CNDevExcel.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.device.pojo.vo;
+package com.njcn.gather.device.pojo.vo;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.njcn.common.pojo.constant.PatternRegex;

detection/src/main/java/com/njcn/gather/device/pojo/vo/PqDevExcel.java

@@ -1,9 +1,9 @@
-package com.njcn.gather.device.device.pojo.vo;
+package com.njcn.gather.device.pojo.vo;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
 import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.gather.device.monitor.pojo.vo.PqMonitorExcel;
+import com.njcn.gather.monitor.pojo.vo.PqMonitorExcel;
 import com.njcn.gather.device.pojo.constant.DevValidMessage;
 import com.njcn.web.pojo.annotation.DateTimeStrValid;
 import lombok.Data;

detection/src/main/java/com/njcn/gather/device/pojo/vo/PqDevVO.java

@@ -1,11 +1,11 @@
-package com.njcn.gather.device.device.pojo.vo;
+package com.njcn.gather.device.pojo.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
-import com.njcn.gather.device.monitor.pojo.po.PqMonitor;
+import com.njcn.gather.monitor.pojo.po.PqMonitor;
 import lombok.Data;
 
 import java.time.LocalDate;

detection/src/main/java/com/njcn/gather/device/pojo/vo/PreDetection.java

@@ -1,9 +1,8 @@
-package com.njcn.gather.device.device.pojo.vo;
+package com.njcn.gather.device.pojo.vo;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.njcn.gather.util.DeviceUtil;
-import com.njcn.gather.device.device.util.DeviceUtil;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

detection/src/main/java/com/njcn/gather/device/service/IPqDevService.java

@@ -1,18 +1,16 @@
-package com.njcn.gather.device.device.service;
+package com.njcn.gather.device.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.gather.device.device.pojo.enums.TimeCheckResultEnum;
+import com.njcn.gather.device.pojo.enums.TimeCheckResultEnum;
-import com.njcn.gather.device.device.pojo.param.PqDevParam;
+import com.njcn.gather.device.pojo.param.PqDevParam;
-import com.njcn.gather.device.device.pojo.po.PqDev;
+import com.njcn.gather.device.pojo.po.PqDev;
-import com.njcn.gather.device.device.pojo.vo.CNDevExcel;
+import com.njcn.gather.device.pojo.vo.CNDevExcel;
-import com.njcn.gather.device.device.pojo.vo.PqDevExcel;
+import com.njcn.gather.device.pojo.vo.PqDevExcel;
-import com.njcn.gather.device.device.pojo.vo.PqDevVO;
+import com.njcn.gather.device.pojo.vo.PqDevVO;
-import com.njcn.gather.device.device.pojo.vo.PreDetection;
+import com.njcn.gather.device.pojo.vo.PreDetection;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -162,7 +160,7 @@ public interface IPqDevService extends IService<PqDev> {
      * 获取装置信息和装置下监测点信息
      *
      * @param devIds
-     * @return: java.util.List<com.njcn.gather.device.device.pojo.vo.PreDetection>
+     * @return: java.util.List<com.njcn.gather.device.pojo.vo.PreDetection>
      * @Author: wr
      * @Date: 2024/12/12 15:50
      */
@@ -208,5 +206,5 @@ public interface IPqDevService extends IService<PqDev> {
      * @param cnDevExcelList 灿能二楼设备数据列表
      * @param patternId        模式Id
      */
-    void importCNDev(List<CNDevExcel> cnDevExcelList,String patternId);
+    void importCNDev(List<CNDevExcel> cnDevExcelList, String patternId);
 }

detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.device.service.impl;
+package com.njcn.gather.device.service.impl;
 
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.hutool.core.bean.BeanUtil;
@@ -16,22 +16,21 @@ import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.poi.PullDown;
 import com.njcn.db.mybatisplus.constant.DbConstant;
-import com.njcn.gather.device.device.mapper.PqDevMapper;
+import com.njcn.gather.device.mapper.PqDevMapper;
-import com.njcn.gather.device.device.pojo.enums.TimeCheckResultEnum;
+import com.njcn.gather.device.pojo.enums.TimeCheckResultEnum;
-import com.njcn.gather.device.device.pojo.param.PqDevParam;
+import com.njcn.gather.device.pojo.param.PqDevParam;
-import com.njcn.gather.device.device.pojo.po.PqDev;
+import com.njcn.gather.device.pojo.po.PqDev;
-import com.njcn.gather.device.device.pojo.vo.CNDevExcel;
+import com.njcn.gather.device.pojo.vo.CNDevExcel;
-import com.njcn.gather.device.device.pojo.vo.PqDevExcel;
+import com.njcn.gather.device.pojo.vo.PqDevExcel;
-import com.njcn.gather.device.device.pojo.vo.PqDevVO;
+import com.njcn.gather.device.pojo.vo.PqDevVO;
-import com.njcn.gather.device.device.pojo.vo.PreDetection;
+import com.njcn.gather.device.pojo.vo.PreDetection;
-import com.njcn.gather.device.device.service.IPqDevService;
+import com.njcn.gather.device.service.IPqDevService;
-import com.njcn.gather.device.device.util.DeviceUtil;
+import com.njcn.gather.monitor.pojo.po.PqMonitor;
-import com.njcn.gather.device.monitor.pojo.po.PqMonitor;
+import com.njcn.gather.monitor.pojo.vo.PqMonitorExcel;
-import com.njcn.gather.device.monitor.pojo.vo.PqMonitorExcel;
+import com.njcn.gather.monitor.service.IPqMonitorService;
-import com.njcn.gather.device.monitor.service.IPqMonitorService;
 import com.njcn.gather.device.pojo.enums.*;
-import com.njcn.gather.device.type.entity.DevType;
+import com.njcn.gather.type.entity.DevType;
-import com.njcn.gather.device.type.service.IDevTypeService;
+import com.njcn.gather.type.service.IDevTypeService;
 import com.njcn.gather.storage.service.DetectionDataDealService;
 import com.njcn.gather.system.config.pojo.po.SysTestConfig;
 import com.njcn.gather.system.config.service.ISysTestConfigService;
@@ -39,6 +38,7 @@ import com.njcn.gather.system.dictionary.pojo.po.DictData;
 import com.njcn.gather.system.dictionary.pojo.po.DictType;
 import com.njcn.gather.system.dictionary.service.IDictDataService;
 import com.njcn.gather.system.dictionary.service.IDictTypeService;
+import com.njcn.gather.util.DeviceUtil;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.ExcelUtil;
 import lombok.RequiredArgsConstructor;

detection/src/main/java/com/njcn/gather/err/controller/PqErrSysController.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.err.controller;
+package com.njcn.gather.err.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,10 +7,10 @@ import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.LogUtil;
-import com.njcn.gather.device.err.pojo.param.PqErrSysParam;
+import com.njcn.gather.err.pojo.param.PqErrSysParam;
-import com.njcn.gather.device.err.pojo.po.PqErrSys;
+import com.njcn.gather.err.pojo.po.PqErrSys;
-import com.njcn.gather.device.err.pojo.vo.PqErrSysDtlsVO;
+import com.njcn.gather.err.pojo.vo.PqErrSysDtlsVO;
-import com.njcn.gather.device.err.service.IPqErrSysService;
+import com.njcn.gather.err.service.IPqErrSysService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.HttpResultUtil;
 import io.swagger.annotations.Api;

detection/src/main/java/com/njcn/gather/err/mapper/PqErrSysDtlsMapper.java

@@ -1,7 +1,7 @@
-package com.njcn.gather.device.err.mapper;
+package com.njcn.gather.err.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
-import com.njcn.gather.device.err.pojo.po.PqErrSysDtls;
+import com.njcn.gather.err.pojo.po.PqErrSysDtls;
 
 /**
  * @author caozehui

detection/src/main/java/com/njcn/gather/err/mapper/PqErrSysMapper.java

@@ -1,7 +1,7 @@
-package com.njcn.gather.device.err.mapper;
+package com.njcn.gather.err.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
-import com.njcn.gather.device.err.pojo.po.PqErrSys;
+import com.njcn.gather.err.pojo.po.PqErrSys;
 
 /**
  * @author caozehui

detection/src/main/java/com/njcn/gather/err/mapper/mapping/PqErrSysDtlsMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.gather.device.err.mapper.PqErrSysDtlsMapper">
+<mapper namespace="com.njcn.gather.err.mapper.PqErrSysDtlsMapper">
 
 
 </mapper>

detection/src/main/java/com/njcn/gather/err/mapper/mapping/PqErrSysMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.gather.err.mapper.PqErrSysMapper">
+
+
+</mapper>
+

detection/src/main/java/com/njcn/gather/err/pojo/param/PqErrSysDtlsParam.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.err.pojo.param;
+package com.njcn.gather.err.pojo.param;
 
 import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.gather.device.pojo.constant.DevValidMessage;

detection/src/main/java/com/njcn/gather/err/pojo/param/PqErrSysParam.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.err.pojo.param;
+package com.njcn.gather.err.pojo.param;
 
 import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.gather.device.pojo.constant.DevValidMessage;

detection/src/main/java/com/njcn/gather/err/pojo/po/PqErrSys.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.err.pojo.po;
+package com.njcn.gather.err.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

detection/src/main/java/com/njcn/gather/err/pojo/po/PqErrSysDtls.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.err.pojo.po;
+package com.njcn.gather.err.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

detection/src/main/java/com/njcn/gather/err/pojo/vo/ErrDtlsCheckDataVO.java

@@ -1,6 +1,6 @@
-package com.njcn.gather.device.err.pojo.vo;
+package com.njcn.gather.err.pojo.vo;
 
-import com.njcn.gather.device.err.pojo.po.PqErrSysDtls;
+import com.njcn.gather.err.pojo.po.PqErrSysDtls;
 import lombok.Data;
 
 import java.io.Serializable;

detection/src/main/java/com/njcn/gather/err/pojo/vo/PqErrSysDtlsVO.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.err.pojo.vo;
+package com.njcn.gather.err.pojo.vo;
 
 import lombok.Data;
 

detection/src/main/java/com/njcn/gather/err/service/IPqErrSysDtlsService.java

@@ -1,10 +1,10 @@
-package com.njcn.gather.device.err.service;
+package com.njcn.gather.err.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.gather.device.err.pojo.param.PqErrSysDtlsParam;
+import com.njcn.gather.err.pojo.param.PqErrSysDtlsParam;
-import com.njcn.gather.device.err.pojo.param.PqErrSysParam;
+import com.njcn.gather.err.pojo.param.PqErrSysParam;
-import com.njcn.gather.device.err.pojo.po.PqErrSysDtls;
+import com.njcn.gather.err.pojo.po.PqErrSysDtls;
-import com.njcn.gather.device.err.pojo.vo.ErrDtlsCheckDataVO;
+import com.njcn.gather.err.pojo.vo.ErrDtlsCheckDataVO;
 
 import java.util.List;
 

detection/src/main/java/com/njcn/gather/err/service/IPqErrSysService.java

@@ -1,11 +1,10 @@
-package com.njcn.gather.device.err.service;
+package com.njcn.gather.err.service;
 
-import cn.hutool.core.date.StopWatch;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.gather.device.err.pojo.param.PqErrSysParam;
+import com.njcn.gather.err.pojo.param.PqErrSysParam;
-import com.njcn.gather.device.err.pojo.po.PqErrSys;
+import com.njcn.gather.err.pojo.po.PqErrSys;
-import com.njcn.gather.device.err.pojo.vo.PqErrSysDtlsVO;
+import com.njcn.gather.err.pojo.vo.PqErrSysDtlsVO;
 
 import java.util.List;
 import java.util.Map;

detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysDtlsServiceImpl.java

@@ -1,18 +1,18 @@
-package com.njcn.gather.device.err.service.impl;
+package com.njcn.gather.err.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.njcn.gather.device.err.mapper.PqErrSysDtlsMapper;
+import com.njcn.gather.err.mapper.PqErrSysDtlsMapper;
-import com.njcn.gather.device.err.pojo.param.PqErrSysDtlsParam;
+import com.njcn.gather.err.pojo.param.PqErrSysDtlsParam;
-import com.njcn.gather.device.err.pojo.param.PqErrSysParam;
+import com.njcn.gather.err.pojo.param.PqErrSysParam;
-import com.njcn.gather.device.err.pojo.po.PqErrSysDtls;
+import com.njcn.gather.err.pojo.po.PqErrSysDtls;
-import com.njcn.gather.device.err.pojo.vo.ErrDtlsCheckDataVO;
+import com.njcn.gather.err.pojo.vo.ErrDtlsCheckDataVO;
-import com.njcn.gather.device.err.service.IPqErrSysDtlsService;
+import com.njcn.gather.err.service.IPqErrSysDtlsService;
-import com.njcn.gather.device.script.pojo.param.PqScriptCheckDataParam;
+import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam;
-import com.njcn.gather.device.script.pojo.po.PqScriptCheckData;
+import com.njcn.gather.script.pojo.po.PqScriptCheckData;
-import com.njcn.gather.device.script.service.IPqScriptCheckDataService;
+import com.njcn.gather.script.service.IPqScriptCheckDataService;
 import com.njcn.gather.system.dictionary.pojo.po.DictTree;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysServiceImpl.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.err.service.impl;
+package com.njcn.gather.err.service.impl;
 
 import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.ObjectUtil;
@@ -7,13 +7,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.gather.device.err.mapper.PqErrSysMapper;
+import com.njcn.gather.err.mapper.PqErrSysMapper;
-import com.njcn.gather.device.err.pojo.param.PqErrSysParam;
+import com.njcn.gather.err.pojo.param.PqErrSysParam;
-import com.njcn.gather.device.err.pojo.po.PqErrSys;
+import com.njcn.gather.err.pojo.po.PqErrSys;
-import com.njcn.gather.device.err.pojo.po.PqErrSysDtls;
+import com.njcn.gather.err.pojo.po.PqErrSysDtls;
-import com.njcn.gather.device.err.pojo.vo.PqErrSysDtlsVO;
+import com.njcn.gather.err.pojo.vo.PqErrSysDtlsVO;
-import com.njcn.gather.device.err.service.IPqErrSysDtlsService;
+import com.njcn.gather.err.service.IPqErrSysDtlsService;
-import com.njcn.gather.device.err.service.IPqErrSysService;
+import com.njcn.gather.err.service.IPqErrSysService;
 import com.njcn.gather.device.pojo.enums.DevResponseEnum;
 import com.njcn.gather.system.dictionary.pojo.po.DictData;
 import com.njcn.gather.system.dictionary.pojo.po.DictTree;

detection/src/main/java/com/njcn/gather/monitor/controller/PqMonitorController.java

@@ -1,6 +1,6 @@
-package com.njcn.gather.device.monitor.controller;
+package com.njcn.gather.monitor.controller;
 
-import com.njcn.gather.device.monitor.service.IPqMonitorService;
+import com.njcn.gather.monitor.service.IPqMonitorService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;

detection/src/main/java/com/njcn/gather/monitor/mapper/PqMonitorMapper.java

@@ -1,8 +1,8 @@
-package com.njcn.gather.device.monitor.mapper;
+package com.njcn.gather.monitor.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
-import com.njcn.gather.device.device.pojo.vo.PreDetection;
+import com.njcn.gather.device.pojo.vo.PreDetection;
-import com.njcn.gather.device.monitor.pojo.po.PqMonitor;
+import com.njcn.gather.monitor.pojo.po.PqMonitor;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -16,7 +16,7 @@ public interface PqMonitorMapper extends MPJBaseMapper<PqMonitor> {
     /**
      * 根据终端id获取监测点集合
      * @param devId
-     * @return: java.util.List<com.njcn.gather.device.device.pojo.vo.PreDetection.MonitorListDTO>
+     * @return: java.util.List<com.njcn.gather.device.pojo.vo.PreDetection.MonitorListDTO>
      * @Author: wr
      * @Date: 2024/12/12 13:15
      */

detection/src/main/java/com/njcn/gather/monitor/mapper/mapping/PqMonitorMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.gather.device.monitor.mapper.PqMonitorMapper">
+<mapper namespace="com.njcn.gather.monitor.mapper.PqMonitorMapper">
 
     <select id="selectMonitorInfo"
-            resultType="com.njcn.gather.device.device.pojo.vo.PreDetection$MonitorListDTO">
+            resultType="com.njcn.gather.device.pojo.vo.PreDetection$MonitorListDTO">
         SELECT
             Id as lineId,
             Num as line,

detection/src/main/java/com/njcn/gather/monitor/pojo/param/PqMonitorParam.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.monitor.pojo.param;
+package com.njcn.gather.monitor.pojo.param;
 
 import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.gather.device.pojo.constant.DevValidMessage;

detection/src/main/java/com/njcn/gather/monitor/pojo/po/PqMonitor.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.monitor.pojo.po;
+package com.njcn.gather.monitor.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.mybatisplus.bo.BaseEntity;

detection/src/main/java/com/njcn/gather/monitor/pojo/vo/PqMonitorExcel.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.monitor.pojo.vo;
+package com.njcn.gather.monitor.pojo.vo;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.njcn.common.pojo.constant.PatternRegex;

detection/src/main/java/com/njcn/gather/monitor/service/IPqMonitorService.java

@@ -1,12 +1,11 @@
-package com.njcn.gather.device.monitor.service;
+package com.njcn.gather.monitor.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.gather.device.device.pojo.po.PqDev;
+import com.njcn.gather.device.pojo.po.PqDev;
-import com.njcn.gather.device.monitor.pojo.param.PqMonitorParam;
+import com.njcn.gather.monitor.pojo.param.PqMonitorParam;
-import com.njcn.gather.device.monitor.pojo.po.PqMonitor;
+import com.njcn.gather.monitor.pojo.po.PqMonitor;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author caozehui

detection/src/main/java/com/njcn/gather/monitor/service/impl/PqMonitorServiceImpl.java

@@ -1,26 +1,20 @@
-package com.njcn.gather.device.monitor.service.impl;
+package com.njcn.gather.monitor.service.impl;
 
-import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.gather.device.device.pojo.po.PqDev;
+import com.njcn.gather.device.pojo.po.PqDev;
-import com.njcn.gather.device.monitor.mapper.PqMonitorMapper;
+import com.njcn.gather.monitor.mapper.PqMonitorMapper;
-import com.njcn.gather.device.monitor.pojo.param.PqMonitorParam;
+import com.njcn.gather.monitor.pojo.param.PqMonitorParam;
-import com.njcn.gather.device.monitor.pojo.po.PqMonitor;
+import com.njcn.gather.monitor.pojo.po.PqMonitor;
-import com.njcn.gather.device.monitor.pojo.vo.PqMonitorExcel;
+import com.njcn.gather.monitor.service.IPqMonitorService;
-import com.njcn.gather.device.monitor.service.IPqMonitorService;
 import com.njcn.gather.system.dictionary.service.IDictDataService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author caozehui

detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java

@@ -13,14 +13,12 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.LogUtil;
-import com.njcn.gather.device.device.service.IPqDevService;
+import com.njcn.gather.device.service.IPqDevService;
 import com.njcn.gather.device.pojo.enums.DevResponseEnum;
-import com.njcn.gather.device.pojo.enums.PatternEnum;
 import com.njcn.gather.plan.pojo.param.AdPlanParam;
 import com.njcn.gather.plan.pojo.vo.AdPlanExcel;
 import com.njcn.gather.plan.pojo.vo.AdPlanVO;
 import com.njcn.gather.plan.service.IAdPlanService;
-import com.njcn.gather.system.dictionary.service.IDictDataService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.ExcelUtil;
 import com.njcn.web.utils.HttpResultUtil;

detection/src/main/java/com/njcn/gather/plan/mapper/AdPlanSourceMapper.java

@@ -2,7 +2,7 @@ package com.njcn.gather.plan.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
 import com.njcn.gather.plan.pojo.po.AdPlanSource;
-import com.njcn.gather.device.source.pojo.po.PqSource;
+import com.njcn.gather.source.pojo.po.PqSource;
 
 import java.util.List;
 

detection/src/main/java/com/njcn/gather/plan/mapper/mapping/AdPlanSourceMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.njcn.gather.plan.mapper.AdPlanSourceMapper">
 
 
-    <select id="selectPqSourceByPlanId" resultType="com.njcn.gather.device.source.pojo.po.PqSource">
+    <select id="selectPqSourceByPlanId" resultType="com.njcn.gather.source.pojo.po.PqSource">
         SELECT pq_source.*
         FROM pq_source,
              ad_plan_source

detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdPlanExcel.java

@@ -68,7 +68,7 @@ public class AdPlanExcel {
 //        private Integer code;
 
         @ExcelCollection(name = "绑定的设备", orderNum = "9")
-        private List<AdPlanExcel.BoundExportData> devices;
+        private List<BoundExportData> devices;
     }
 
     @Data
@@ -91,7 +91,7 @@ public class AdPlanExcel {
         private String result;
 
         @ExcelCollection(name = "绑定的设备", orderNum = "9")
-        private List<AdPlanExcel.BoundImportData> devices;
+        private List<BoundImportData> devices;
     }
 
     @Data

detection/src/main/java/com/njcn/gather/plan/service/IAdPlanSourceService.java

@@ -2,7 +2,7 @@ package com.njcn.gather.plan.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.gather.plan.pojo.po.AdPlanSource;
-import com.njcn.gather.device.source.pojo.po.PqSource;
+import com.njcn.gather.source.pojo.po.PqSource;
 
 import java.util.List;
 

detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java

@@ -12,17 +12,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.gather.device.device.pojo.enums.TimeCheckResultEnum;
+import com.njcn.gather.device.pojo.enums.TimeCheckResultEnum;
-import com.njcn.gather.device.device.pojo.param.PqDevParam;
+import com.njcn.gather.device.pojo.param.PqDevParam;
-import com.njcn.gather.device.device.pojo.po.PqDev;
+import com.njcn.gather.device.pojo.po.PqDev;
-import com.njcn.gather.device.device.service.IPqDevService;
+import com.njcn.gather.device.service.IPqDevService;
-import com.njcn.gather.device.err.service.IPqErrSysService;
+import com.njcn.gather.err.service.IPqErrSysService;
 import com.njcn.gather.device.pojo.enums.*;
-import com.njcn.gather.device.script.pojo.po.PqScriptDtls;
+import com.njcn.gather.script.pojo.po.PqScriptDtls;
-import com.njcn.gather.device.script.service.IPqScriptDtlsService;
+import com.njcn.gather.script.service.IPqScriptDtlsService;
-import com.njcn.gather.device.script.service.IPqScriptService;
+import com.njcn.gather.script.service.IPqScriptService;
-import com.njcn.gather.device.source.pojo.po.PqSource;
+import com.njcn.gather.source.pojo.po.PqSource;
-import com.njcn.gather.device.source.service.IPqSourceService;
+import com.njcn.gather.source.service.IPqSourceService;
 import com.njcn.gather.plan.mapper.AdPlanMapper;
 import com.njcn.gather.plan.pojo.enums.DataSourceEnum;
 import com.njcn.gather.plan.pojo.enums.PlanResponseEnum;

detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanSourceServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.gather.plan.mapper.AdPlanSourceMapper;
 import com.njcn.gather.plan.pojo.po.AdPlanSource;
 import com.njcn.gather.plan.service.IAdPlanSourceService;
-import com.njcn.gather.device.source.pojo.po.PqSource;
+import com.njcn.gather.source.pojo.po.PqSource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

detection/src/main/java/com/njcn/gather/report/service/impl/ReportServiceImpl.java

@@ -9,15 +9,15 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.gather.detection.pojo.vo.DetectionData;
-import com.njcn.gather.device.device.pojo.vo.PqDevVO;
+import com.njcn.gather.device.pojo.vo.PqDevVO;
-import com.njcn.gather.device.device.service.IPqDevService;
+import com.njcn.gather.device.service.IPqDevService;
 import com.njcn.gather.device.pojo.enums.DevReportStateEnum;
-import com.njcn.gather.device.script.pojo.po.PqScriptCheckData;
+import com.njcn.gather.script.pojo.po.PqScriptCheckData;
-import com.njcn.gather.device.script.pojo.po.PqScriptDtls;
+import com.njcn.gather.script.pojo.po.PqScriptDtls;
-import com.njcn.gather.device.script.service.IPqScriptCheckDataService;
+import com.njcn.gather.script.service.IPqScriptCheckDataService;
-import com.njcn.gather.device.script.service.IPqScriptDtlsService;
+import com.njcn.gather.script.service.IPqScriptDtlsService;
-import com.njcn.gather.device.type.entity.DevType;
+import com.njcn.gather.type.entity.DevType;
-import com.njcn.gather.device.type.service.IDevTypeService;
+import com.njcn.gather.type.service.IDevTypeService;
 import com.njcn.gather.plan.pojo.po.AdPlan;
 import com.njcn.gather.plan.service.IAdPlanService;
 import com.njcn.gather.report.pojo.DevReportParam;

detection/src/main/java/com/njcn/gather/result/controller/ResultController.java

@@ -6,7 +6,7 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.LogUtil;
-import com.njcn.gather.device.device.pojo.param.PqDevParam;
+import com.njcn.gather.device.pojo.param.PqDevParam;
 import com.njcn.gather.result.pojo.param.ResultParam;
 import com.njcn.gather.result.pojo.vo.FormContentVO;
 import com.njcn.gather.result.pojo.vo.ResultVO;

detection/src/main/java/com/njcn/gather/result/pojo/vo/RawDataExcel.java

@@ -1,7 +1,7 @@
 package com.njcn.gather.result.pojo.vo;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.njcn.gather.device.device.pojo.vo.PqDevExcel;
+import com.njcn.gather.device.pojo.vo.PqDevExcel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java

@@ -1,6 +1,5 @@
 package com.njcn.gather.result.service.impl;
 
-import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -8,15 +7,14 @@ import cn.hutool.core.util.StrUtil;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.gather.device.device.service.IPqDevService;
+import com.njcn.gather.device.service.IPqDevService;
-import com.njcn.gather.device.script.mapper.PqScriptMapper;
+import com.njcn.gather.script.mapper.PqScriptMapper;
-import com.njcn.gather.device.script.pojo.po.PqScriptCheckData;
+import com.njcn.gather.script.pojo.po.PqScriptCheckData;
-import com.njcn.gather.device.script.pojo.po.PqScriptDtls;
+import com.njcn.gather.script.pojo.po.PqScriptDtls;
-import com.njcn.gather.device.script.service.IPqScriptCheckDataService;
+import com.njcn.gather.script.service.IPqScriptCheckDataService;
-import com.njcn.gather.device.script.service.IPqScriptDtlsService;
+import com.njcn.gather.script.service.IPqScriptDtlsService;
-import com.njcn.gather.device.script.util.ScriptDtlsDesc;
+import com.njcn.gather.script.util.ScriptDtlsDesc;
 import com.njcn.gather.plan.pojo.po.AdPlan;
-import com.njcn.gather.plan.pojo.vo.AdPlanExcel;
 import com.njcn.gather.plan.service.IAdPlanService;
 import com.njcn.gather.result.pojo.enums.ResultResponseEnum;
 import com.njcn.gather.result.pojo.enums.ResultUnitEnum;

detection/src/main/java/com/njcn/gather/script/controller/PqScriptController.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.script.controller;
+package com.njcn.gather.script.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
@@ -9,13 +9,13 @@ import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.LogUtil;
-import com.njcn.gather.device.script.pojo.param.PqScriptIssueParam;
+import com.njcn.gather.script.pojo.param.PqScriptIssueParam;
-import com.njcn.gather.device.script.pojo.param.PqScriptParam;
+import com.njcn.gather.script.pojo.param.PqScriptParam;
-import com.njcn.gather.device.script.pojo.po.PqScript;
+import com.njcn.gather.script.pojo.po.PqScript;
-import com.njcn.gather.device.script.pojo.po.PqScriptDtls;
+import com.njcn.gather.script.pojo.po.PqScriptDtls;
-import com.njcn.gather.device.script.pojo.po.SourceIssue;
+import com.njcn.gather.script.pojo.po.SourceIssue;
-import com.njcn.gather.device.script.service.IPqScriptDtlsService;
+import com.njcn.gather.script.service.IPqScriptDtlsService;
-import com.njcn.gather.device.script.service.IPqScriptService;
+import com.njcn.gather.script.service.IPqScriptService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.HttpResultUtil;
 import io.swagger.annotations.Api;

detection/src/main/java/com/njcn/gather/script/mapper/PqScriptCheckDataMapper.java

@@ -1,7 +1,7 @@
-package com.njcn.gather.device.script.mapper;
+package com.njcn.gather.script.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
-import com.njcn.gather.device.script.pojo.po.PqScriptCheckData;
+import com.njcn.gather.script.pojo.po.PqScriptCheckData;
 
 /**
  * @Description:

detection/src/main/java/com/njcn/gather/script/mapper/PqScriptDtlsMapper.java

@@ -1,7 +1,7 @@
-package com.njcn.gather.device.script.mapper;
+package com.njcn.gather.script.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
-import com.njcn.gather.device.script.pojo.po.PqScriptDtls;
+import com.njcn.gather.script.pojo.po.PqScriptDtls;
 
 /**
  * @author caozehui

detection/src/main/java/com/njcn/gather/script/mapper/PqScriptMapper.java

@@ -1,7 +1,7 @@
-package com.njcn.gather.device.script.mapper;
+package com.njcn.gather.script.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
-import com.njcn.gather.device.script.pojo.po.PqScript;
+import com.njcn.gather.script.pojo.po.PqScript;
 import org.apache.ibatis.annotations.Param;
 
 /**

detection/src/main/java/com/njcn/gather/script/mapper/mapping/PqScriptCheckDataMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.gather.device.script.mapper.PqScriptDtlsMapper">
+<mapper namespace="com.njcn.gather.script.mapper.PqScriptCheckDataMapper">
 
 
 </mapper>

detection/src/main/java/com/njcn/gather/script/mapper/mapping/PqScriptDtlsMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.gather.device.err.mapper.PqErrSysMapper">
+<mapper namespace="com.njcn.gather.script.mapper.PqScriptDtlsMapper">
 
 
 </mapper>

detection/src/main/java/com/njcn/gather/script/mapper/mapping/PqScriptMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.gather.device.script.mapper.PqScriptMapper">
+<mapper namespace="com.njcn.gather.script.mapper.PqScriptMapper">
 
 
     <select id="selectScriptIsValueType" resultType="java.lang.Boolean">

detection/src/main/java/com/njcn/gather/script/pojo/enums/ResultUnitEnum.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.script.pojo.enums;
+package com.njcn.gather.script.pojo.enums;
 
 import lombok.Getter;
 

detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptCheckDataParam.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.script.pojo.param;
+package com.njcn.gather.script.pojo.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptIssueParam.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.script.pojo.param;
+package com.njcn.gather.script.pojo.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptParam.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.script.pojo.param;
+package com.njcn.gather.script.pojo.param;
 
 import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.gather.device.pojo.constant.DevValidMessage;

detection/src/main/java/com/njcn/gather/script/pojo/po/PqScript.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.script.pojo.po;
+package com.njcn.gather.script.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptCheckData.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.script.pojo.po;
+package com.njcn.gather.script.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptDtls.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.script.pojo.po;
+package com.njcn.gather.script.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

detection/src/main/java/com/njcn/gather/script/pojo/po/SourceIssue.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.script.pojo.po;
+package com.njcn.gather.script.pojo.po;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;

detection/src/main/java/com/njcn/gather/script/pojo/vo/PqScriptCheckDataVO.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.script.pojo.vo;
+package com.njcn.gather.script.pojo.vo;
 
 import lombok.Data;
 

detection/src/main/java/com/njcn/gather/script/service/IPqScriptCheckDataService.java

@@ -1,10 +1,8 @@
-package com.njcn.gather.device.script.service;
+package com.njcn.gather.script.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.gather.device.script.pojo.param.PqScriptCheckDataParam;
+import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam;
-import com.njcn.gather.device.script.pojo.po.PqScriptCheckData;
+import com.njcn.gather.script.pojo.po.PqScriptCheckData;
-import com.njcn.gather.device.script.pojo.vo.PqScriptCheckDataVO;
-import com.njcn.gather.system.dictionary.pojo.po.DictTree;
 
 import java.util.List;
 import java.util.Map;

detection/src/main/java/com/njcn/gather/script/service/IPqScriptDtlsService.java

@@ -1,9 +1,9 @@
-package com.njcn.gather.device.script.service;
+package com.njcn.gather.script.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.gather.device.script.pojo.param.PqScriptIssueParam;
+import com.njcn.gather.script.pojo.param.PqScriptIssueParam;
-import com.njcn.gather.device.script.pojo.po.PqScriptDtls;
+import com.njcn.gather.script.pojo.po.PqScriptDtls;
-import com.njcn.gather.device.script.pojo.po.SourceIssue;
+import com.njcn.gather.script.pojo.po.SourceIssue;
 
 import java.util.List;
 

detection/src/main/java/com/njcn/gather/script/service/IPqScriptService.java

@@ -1,9 +1,9 @@
-package com.njcn.gather.device.script.service;
+package com.njcn.gather.script.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.gather.device.script.pojo.param.PqScriptParam;
+import com.njcn.gather.script.pojo.param.PqScriptParam;
-import com.njcn.gather.device.script.pojo.po.PqScript;
+import com.njcn.gather.script.pojo.po.PqScript;
 
 import java.util.List;
 import java.util.Map;

detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptCheckDataServiceImpl.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.script.service.impl;
+package com.njcn.gather.script.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
-import com.njcn.gather.device.script.mapper.PqScriptCheckDataMapper;
+import com.njcn.gather.script.mapper.PqScriptCheckDataMapper;
-import com.njcn.gather.device.script.pojo.param.PqScriptCheckDataParam;
+import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam;
-import com.njcn.gather.device.script.pojo.po.PqScriptCheckData;
+import com.njcn.gather.script.pojo.po.PqScriptCheckData;
-import com.njcn.gather.device.script.service.IPqScriptCheckDataService;
+import com.njcn.gather.script.service.IPqScriptCheckDataService;
 import com.njcn.gather.system.dictionary.mapper.DictTreeMapper;
 import com.njcn.gather.system.dictionary.pojo.po.DictTree;
 import lombok.RequiredArgsConstructor;

detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.script.service.impl;
+package com.njcn.gather.script.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
@@ -7,20 +7,20 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
-import com.njcn.gather.device.device.pojo.po.PqDev;
+import com.njcn.gather.device.pojo.po.PqDev;
-import com.njcn.gather.device.device.service.IPqDevService;
+import com.njcn.gather.device.service.IPqDevService;
 import com.njcn.gather.device.pojo.enums.CommonEnum;
-import com.njcn.gather.device.script.mapper.PqScriptDtlsMapper;
+import com.njcn.gather.script.mapper.PqScriptDtlsMapper;
-import com.njcn.gather.device.script.mapper.PqScriptMapper;
+import com.njcn.gather.script.mapper.PqScriptMapper;
-import com.njcn.gather.device.script.pojo.param.PqScriptCheckDataParam;
+import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam;
-import com.njcn.gather.device.script.pojo.param.PqScriptIssueParam;
+import com.njcn.gather.script.pojo.param.PqScriptIssueParam;
-import com.njcn.gather.device.script.pojo.po.PqScript;
+import com.njcn.gather.script.pojo.po.PqScript;
-import com.njcn.gather.device.script.pojo.po.PqScriptCheckData;
+import com.njcn.gather.script.pojo.po.PqScriptCheckData;
-import com.njcn.gather.device.script.pojo.po.PqScriptDtls;
+import com.njcn.gather.script.pojo.po.PqScriptDtls;
-import com.njcn.gather.device.script.pojo.po.SourceIssue;
+import com.njcn.gather.script.pojo.po.SourceIssue;
-import com.njcn.gather.device.script.service.IPqScriptCheckDataService;
+import com.njcn.gather.script.service.IPqScriptCheckDataService;
-import com.njcn.gather.device.script.service.IPqScriptDtlsService;
+import com.njcn.gather.script.service.IPqScriptDtlsService;
-import com.njcn.gather.device.script.util.ScriptDtlsDesc;
+import com.njcn.gather.script.util.ScriptDtlsDesc;
 import com.njcn.gather.system.dictionary.pojo.po.DictTree;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -31,7 +31,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @author caozehui

detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptServiceImpl.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.script.service.impl;
+package com.njcn.gather.script.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
-import com.njcn.gather.device.script.mapper.PqScriptMapper;
+import com.njcn.gather.script.mapper.PqScriptMapper;
-import com.njcn.gather.device.script.pojo.param.PqScriptParam;
+import com.njcn.gather.script.pojo.param.PqScriptParam;
-import com.njcn.gather.device.script.pojo.po.PqScript;
+import com.njcn.gather.script.pojo.po.PqScript;
-import com.njcn.gather.device.script.service.IPqScriptDtlsService;
+import com.njcn.gather.script.service.IPqScriptDtlsService;
-import com.njcn.gather.device.script.service.IPqScriptService;
+import com.njcn.gather.script.service.IPqScriptService;
 import com.njcn.web.factory.PageFactory;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

detection/src/main/java/com/njcn/gather/script/util/ScriptDtlsDesc.java

@@ -1,9 +1,9 @@
-package com.njcn.gather.device.script.util;
+package com.njcn.gather.script.util;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.njcn.gather.device.script.pojo.enums.ResultUnitEnum;
+import com.njcn.gather.script.pojo.enums.ResultUnitEnum;
-import com.njcn.gather.device.script.pojo.po.PqScriptDtls;
+import com.njcn.gather.script.pojo.po.PqScriptDtls;
 
 import java.util.Comparator;
 import java.util.LinkedHashMap;

detection/src/main/java/com/njcn/gather/source/controller/PqSourceController.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.source.controller;
+package com.njcn.gather.source.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
@@ -8,11 +8,11 @@ import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.LogUtil;
-import com.njcn.gather.device.source.pojo.param.PqSourceParam;
+import com.njcn.gather.source.pojo.param.PqSourceParam;
-import com.njcn.gather.device.source.pojo.po.PqSource;
+import com.njcn.gather.source.pojo.po.PqSource;
-import com.njcn.gather.device.source.pojo.po.SourceInitialize;
+import com.njcn.gather.source.pojo.po.SourceInitialize;
-import com.njcn.gather.device.source.pojo.po.SourceParam;
+import com.njcn.gather.source.pojo.po.SourceParam;
-import com.njcn.gather.device.source.service.IPqSourceService;
+import com.njcn.gather.source.service.IPqSourceService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.HttpResultUtil;
 import io.swagger.annotations.Api;

detection/src/main/java/com/njcn/gather/source/mapper/PqSourceMapper.java

@@ -1,7 +1,7 @@
-package com.njcn.gather.device.source.mapper;
+package com.njcn.gather.source.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
-import com.njcn.gather.device.source.pojo.po.PqSource;
+import com.njcn.gather.source.pojo.po.PqSource;
 
 /**
  * @author caozehui

detection/src/main/java/com/njcn/gather/source/mapper/mapping/PqSourceMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.gather.device.source.mapper.PqSourceMapper">
+<mapper namespace="com.njcn.gather.source.mapper.PqSourceMapper">
 
 
 </mapper>

detection/src/main/java/com/njcn/gather/source/pojo/param/PqSourceParam.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.source.pojo.param;
+package com.njcn.gather.source.pojo.param;
 
 import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.gather.device.pojo.constant.DevValidMessage;

detection/src/main/java/com/njcn/gather/source/pojo/po/PqSource.java

@@ -1,4 +1,4 @@
-package com.njcn.gather.device.source.pojo.po;
+package com.njcn.gather.source.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.mybatisplus.bo.BaseEntity;