抽取公共代码提供给物联项目使用

pom.xml

@@ -41,9 +41,9 @@
     <properties>
         <!--中间件目标地址-->
         <!--                <middle.server.url>10.95.53.49</middle.server.url>-->
-        <middle.server.url>192.168.1.22</middle.server.url>
+        <middle.server.url>192.168.1.103</middle.server.url>
         <!--微服务模块发布地址-->
-        <service.server.url>192.168.1.127</service.server.url>
+        <service.server.url>127.0.0.1</service.server.url>
         <!--docker仓库地址-->
         <docker.server.url>192.168.1.22</docker.server.url>
         <!--nacos的ip:port-->
@@ -55,7 +55,7 @@
         <!--服务器发布内容为空-->
         <!--                <nacos.namespace></nacos.namespace>-->
         <!--                <nacos.namespace>30c701c4-2a94-49d9-82e1-76aa9456573f</nacos.namespace>-->
-        <nacos.namespace>78588706-e06f-4580-b612-b26d72493fcb</nacos.namespace>
+        <nacos.namespace>6fd2d036-f390-46ee-9c9d-d5a5c00e3314</nacos.namespace>
         <!--        <nacos.namespace>910d0d69-2254-481b-b9f7-7ecf9cb881b0</nacos.namespace>-->
         <!--        sentinel:port-->
         <sentinel.url>${middle.server.url}:8080</sentinel.url>

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/DeviceResponseEnum.java

@@ -32,6 +32,7 @@ public enum DeviceResponseEnum {
 
     DEVICE_SAME_NAME("A0290","设备名称已存在"),
     DEVICE_REPETITION("A0291","设备名称重复"),
+    MODEL_NAME_REPEAT("A00350","名称不可重复"),
     DEVICE_IP_REPETITION("A0292","设备ip端口号重复"),
     DEVICE_SAME_IP("A0293","当前设备ip端口号已存在"),
     DEVICE_EMPTY("A0294","设备为空"),

pqs-device/pq-device/pom.xml

@@ -14,6 +14,7 @@
     <modules>
         <module>pq-device-api</module>
         <module>pq-device-boot</module>
+        <module>pq-device-com</module>
     </modules>
 
     <properties>

pqs-device/pq-device/pq-device-boot/pom.xml

@@ -20,10 +20,9 @@
     <dependencies>
         <dependency>
             <groupId>com.njcn</groupId>
-            <artifactId>pq-device-api</artifactId>
-            <version>${project.version}</version>
+            <artifactId>pq-device-com</artifactId>
+            <version>1.0.0</version>
         </dependency>
-
         <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>system-api</artifactId>
@@ -39,26 +38,10 @@
             <artifactId>common-web</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.njcn</groupId>
-            <artifactId>common-oss</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
 
-        <dependency>
-            <groupId>com.njcn.platform</groupId>
-            <artifactId>message-api</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
 
-        <dependency>
-            <groupId>com.njcn</groupId>
-            <artifactId>supervision-api</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
+
+
 
         <dependency>
             <groupId>com.njcn.platform</groupId>

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommLineController.java

@@ -8,7 +8,7 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.biz.pojo.dto.LineDTO;
 import com.njcn.device.biz.pojo.dto.LineALLInfoDTO;
 import com.njcn.device.biz.pojo.dto.PollutionLineInfoDTO;
-import com.njcn.device.pq.service.LineService;
+import com.njcn.device.line.service.LineService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java

@@ -11,14 +11,12 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.biz.pojo.dto.*;
 import com.njcn.device.biz.pojo.param.DeptGetLineParam;
 import com.njcn.device.biz.pojo.param.SubstationParam;
-import com.njcn.device.biz.pojo.po.Overlimit;
 import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
-import com.njcn.device.pq.mapper.LineDetailMapper;
-import com.njcn.device.pq.mapper.LineMapper;
+import com.njcn.device.line.mapper.LineMapper;
+import com.njcn.device.line.service.LineService;
+import com.njcn.device.line.mapper.LineDetailMapper;
 import com.njcn.device.pq.service.CommTerminalService;
-import com.njcn.device.pq.service.IOverLimitService;
 import com.njcn.device.pq.service.IPqsDeviceUnitService;
-import com.njcn.device.pq.service.LineService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -57,9 +55,6 @@ public class CommTerminalController extends BaseController {
 
     private final IPqsDeviceUnitService iPqsDeviceUnitService;
 
-    private final IOverLimitService iOverLimitService;
-
-
 
     /**
      * 通过部门获取所有子集部门所拥有的监测点基本信息
@@ -241,34 +236,6 @@ public class CommTerminalController extends BaseController {
     }
 
 
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/getOverLimitData")
-    @ApiOperation("根据监测点id获取越限数值")
-    @ApiImplicitParam(name = "id", value = "监测点id", required = true)
-    public HttpResult<Overlimit> getOverLimitData(@RequestParam("id") String id) {
-        String methodDescribe = getMethodDescribe("getOverLimitData");
-        Overlimit result = lineService.getOverLimitData(id);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
-    }
-
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/getAllLineOverLimit")
-    @ApiOperation("获取投运在线的监测点的限值")
-    public HttpResult<List<Overlimit>> getAllLineOverLimit() {
-        String methodDescribe = getMethodDescribe("getAllLineOverLimit");
-        List<Overlimit> result = lineService.getAllLineOverLimit("harmonic-boot", null);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
-    }
-
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/getOverLimitDataByIds")
-    @ApiOperation("根据监测点id集合获取越限数值")
-    @ApiImplicitParam(name = "ids", value = "监测点id集合", required = true)
-    public HttpResult<List<Overlimit>> getOverLimitDataByIds(@RequestBody List<String> ids) {
-        String methodDescribe = getMethodDescribe("getOverLimitDataByIds");
-        List<Overlimit> result = iOverLimitService.listByIds(ids);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
-    }
 
     @PostMapping("/getLineBySubstationRelation")
     @ApiOperation("获取变电站和监测点的关系")

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeptLineController.java

@@ -7,10 +7,10 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
-import com.njcn.device.pq.mapper.DeptLineMapper;
+import com.njcn.device.line.mapper.DeptLineMapper;
+import com.njcn.device.line.service.DeptLineService;
 import com.njcn.device.pq.pojo.po.DeptLine;
 import com.njcn.device.pq.pojo.vo.LineDeviceStateVO;
-import com.njcn.device.pq.service.DeptLineService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.pojo.param.DeptLineParam;
 import io.swagger.annotations.Api;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java

@@ -6,6 +6,8 @@ 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.HttpResultUtil;
+import com.njcn.device.common.service.GeneralDeviceService;
+import com.njcn.device.common.service.TerminalBaseService;
 import com.njcn.device.pq.mapper.RStatOnlinerateDMapper;
 import com.njcn.device.pq.pojo.bo.BaseLineInfo;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
@@ -13,8 +15,6 @@ import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
 import com.njcn.device.pq.pojo.po.TopMsgPO;
 import com.njcn.device.pq.pojo.vo.*;
-import com.njcn.device.pq.service.TerminalBaseService;
-import com.njcn.device.pq.service.impl.GeneralDeviceService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java

@@ -7,20 +7,18 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
+import com.njcn.device.line.service.LineService;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.PqsParam;
 import com.njcn.device.pq.pojo.po.TopMsgPO;
 import com.njcn.device.pq.pojo.vo.*;
-import com.njcn.device.pq.service.LineService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.RequestUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OverLimitController.java

@@ -1,69 +0,0 @@
-package com.njcn.device.pq.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.enums.common.LogEnum;
-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.HttpResultUtil;
-import com.njcn.device.biz.pojo.po.Overlimit;
-import com.njcn.device.pq.pojo.param.AlarmStrategyParam;
-import com.njcn.device.pq.pojo.vo.AlarmStrategyVO;
-import com.njcn.device.pq.service.AlarmStrategyService;
-import com.njcn.device.pq.service.IOverLimitService;
-import com.njcn.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 监测点限值
- * @author cdf
- * @date 2023/6/7
- */
-@Slf4j
-@RestController
-@RequestMapping("/overLimit")
-@Api(tags = "监测点限值")
-@RequiredArgsConstructor
-public class OverLimitController extends BaseController {
-
-    private final IOverLimitService iOverLimitService;
-
-
-
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/getOverLimitByLineIds")
-    @ApiOperation("监测点集合获取限值")
-    @ApiImplicitParam(name = "lineIds", value = "监测点ids", required = true)
-    @ApiIgnore
-    public HttpResult<List<Overlimit>> getOverLimitByLineIds(@RequestBody List<String> lineIds){
-        String methodDescribe = getMethodDescribe("getOverLimitByLineIds");
-        List<Overlimit> overLimitList= iOverLimitService.list(new LambdaQueryWrapper<Overlimit>().in(Overlimit::getId,lineIds));
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, overLimitList, methodDescribe);
-    }
-
-
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/getLimitMapsByLineIds")
-    @ApiOperation("监测点集合获取限值")
-    @ApiImplicitParam(name = "lineIds", value = "监测点ids", required = true)
-    @ApiIgnore
-    public HttpResult<List<Map<String, Object>>> getLimitMapsByLineIds(@RequestBody List<String> lineIds){
-        String methodDescribe = getMethodDescribe("getLimitMapsByLineIds");
-        List<Map<String, Object>> overLimitList= iOverLimitService.listMaps(new LambdaQueryWrapper<Overlimit>().in(Overlimit::getId,lineIds));
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, overLimitList, methodDescribe);
-    }
-
-}

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java

@@ -12,6 +12,9 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
 import com.njcn.device.biz.enums.DeviceResponseEnum;
+import com.njcn.device.common.service.GeneralDeviceService;
+import com.njcn.device.common.service.TerminalBaseService;
+import com.njcn.device.line.service.LineService;
 import com.njcn.device.pq.pojo.bo.DeviceType;
 import com.njcn.device.pq.pojo.bo.excel.TerminalBaseExcel;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
@@ -20,10 +23,6 @@ import com.njcn.device.pq.pojo.dto.PushResultDTO;
 import com.njcn.device.pq.pojo.param.*;
 import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.pq.pojo.vo.*;
-import com.njcn.device.pq.service.LineService;
-import com.njcn.device.pq.service.TerminalBaseService;
-import com.njcn.device.pq.service.impl.GeneralDeviceService;
-import com.njcn.message.constant.DeviceRebootType;
 import com.njcn.poi.util.PoiUtil;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.*;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/job/DeviceComflagTasks.java

@@ -4,21 +4,13 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import com.njcn.dataProcess.api.PqsCommunicateFeignClient;
 import com.njcn.dataProcess.pojo.dto.PqsCommunicateDto;
-import com.njcn.device.pq.constant.Param;
-import com.njcn.device.pq.mapper.LineMapper;
-import com.njcn.device.pq.mapper.NodeMapper;
-import com.njcn.device.pq.mapper.PqsTerminalLogsMapper;
-import com.njcn.device.pq.pojo.dto.DeviceInfo;
-import com.njcn.device.pq.pojo.dto.NodeProcessDeviceTree;
+import com.njcn.device.device.service.DeviceProcessService;
+import com.njcn.device.device.service.IDeviceService;
+import com.njcn.device.node.mapper.NodeMapper;
 import com.njcn.device.pq.pojo.po.Device;
 import com.njcn.device.pq.pojo.po.DeviceProcess;
 import com.njcn.device.pq.pojo.po.Node;
-import com.njcn.device.pq.pojo.po.PqsTerminalLogs;
-import com.njcn.device.pq.service.DeviceProcessService;
-import com.njcn.device.pq.service.IDeviceService;
-import com.njcn.message.constant.DeviceRebootType;
 import com.njcn.redis.utils.RedisUtil;
-import com.njcn.system.api.DicDataFeignClient;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -26,12 +18,9 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
-import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceProcessMapper.java

@@ -1,29 +0,0 @@
-package com.njcn.device.pq.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.device.pq.pojo.po.Device;
-import com.njcn.device.pq.pojo.po.DeviceProcess;
-import com.njcn.device.pq.pojo.vo.DevDetail;
-import com.njcn.device.pq.pojo.vo.LineInfluxDbOnlineVO;
-import com.njcn.device.pq.pojo.vo.RunManageVO;
-import com.njcn.device.pq.pojo.vo.RunTimeVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author cdf
- * @since 2022-01-04
- */
-public interface DeviceProcessMapper extends BaseMapper<DeviceProcess> {
-
-
-
-
-}

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/OverlimitMapper.java

@@ -1,17 +0,0 @@
-package com.njcn.device.pq.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.device.biz.pojo.po.Overlimit;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author cdf
- * @since 2022-01-04
- */
-public interface OverlimitMapper extends BaseMapper<Overlimit> {
-
-}

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/OverlimitMapper.xml

@@ -1,5 +0,0 @@
-<?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.device.pq.mapper.OverlimitMapper">
-
-</mapper>

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IOverLimitService.java

@@ -1,20 +0,0 @@
-package com.njcn.device.pq.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.device.biz.pojo.po.Overlimit;
-import com.njcn.device.pq.pojo.po.RStatIntegrityD;
-
-/**
- * <p>
- * 越限表实体
- * </p>
- *
- * @author hongawen
- * @since 2023-03-28
- */
-public interface IOverLimitService extends IService<Overlimit> {
-
-
-
-}

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java

@@ -10,11 +10,11 @@ import com.njcn.common.utils.EnumUtils;
 import com.njcn.device.biz.pojo.dto.*;
 import com.njcn.device.biz.pojo.param.DeptGetLineParam;
 import com.njcn.device.biz.pojo.param.SubstationParam;
+import com.njcn.device.line.mapper.LineMapper;
+import com.njcn.device.line.service.DeptLineService;
 import com.njcn.device.pq.enums.RunFlagEnum;
-import com.njcn.device.pq.mapper.LineMapper;
 import com.njcn.device.pq.pojo.param.dataClean.MonitorBaseParam;
 import com.njcn.device.pq.service.CommTerminalService;
-import com.njcn.device.pq.service.DeptLineService;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.dto.DeptDTO;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommunicateServiceImpl.java

@@ -3,8 +3,7 @@ package com.njcn.device.pq.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.*;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.njcn.device.pq.mapper.OnlineRateMapper;
-import com.njcn.device.pq.mapper.RStatIntegrityDMapper;
+import com.njcn.device.line.service.LineService;
 import com.njcn.device.pq.mapper.RStatOnlinerateDMapper;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
 import com.njcn.device.pq.pojo.param.PulicTimeParam;
@@ -12,23 +11,17 @@ import com.njcn.device.pq.pojo.param.PulicTimeStatisParam;
 import com.njcn.device.pq.pojo.po.RStatOnlinerateD;
 import com.njcn.device.pq.pojo.vo.*;
 import com.njcn.device.pq.service.CommunicateService;
-import com.njcn.device.pq.service.LineService;
-import com.njcn.device.pq.utils.PublicDateUtil;
+import com.njcn.device.rstatintegrity.mapper.RStatIntegrityDMapper;
 import com.njcn.web.enums.DateFlagEnum;
 import lombok.AllArgsConstructor;
-import lombok.SneakyThrows;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 
 /**

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DataVerifyServiceImpl.java

@@ -4,13 +4,9 @@ package com.njcn.device.pq.service.impl;
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.*;
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.dataProcess.api.DataLimitRateDetailFeignClient;
@@ -21,31 +17,23 @@ import com.njcn.dataProcess.enums.DataCleanEnum;
 import com.njcn.dataProcess.param.DataCleanParam;
 import com.njcn.dataProcess.param.LineCountEvaluateParam;
 import com.njcn.dataProcess.pojo.dto.DataLimitRateDetailDto;
-import com.njcn.dataProcess.pojo.dto.DataLimitRateDto;
 import com.njcn.dataProcess.pojo.dto.DataLimitTargetDto;
 import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
 import com.njcn.device.biz.enums.DeviceResponseEnum;
 import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
-import com.njcn.device.pq.constant.Param;
+import com.njcn.device.line.mapper.LineMapper;
 import com.njcn.device.pq.mapper.DataVerifyMapper;
-import com.njcn.device.pq.mapper.LineDetailMapper;
-import com.njcn.device.pq.mapper.LineMapper;
 import com.njcn.device.pq.mapper.PqDataVerifyBakMapper;
 import com.njcn.device.pq.pojo.param.dataClean.MonitorBaseParam;
 import com.njcn.device.pq.pojo.po.DataVerify;
 
-import com.njcn.device.pq.pojo.po.Line;
-import com.njcn.device.pq.pojo.po.LineDetail;
 import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
 import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
 import com.njcn.device.pq.pojo.vo.dataClean.*;
 import com.njcn.device.pq.service.CommTerminalService;
 import com.njcn.device.pq.service.IDataVerifyService;
-import com.njcn.device.pq.service.LineService;
-import com.njcn.harmonic.pojo.vo.RStatLimitTargetVO;
 import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
-import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.DictTreeFeignClient;
 import com.njcn.system.enums.DicDataEnum;
@@ -58,16 +46,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.Field;
-import java.text.DateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 
 
 /**

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java

@@ -9,7 +9,9 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.njcn.device.pq.mapper.RStatIntegrityDMapper;
+import com.njcn.device.common.service.GeneralDeviceService;
+import com.njcn.device.line.mapper.LineMapper;
+import com.njcn.device.line.service.DeptLineService;
 import com.njcn.device.pq.mapper.RStatOnlinerateDMapper;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.DevRunEvaluateParam;
@@ -23,11 +25,10 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.njcn.device.pq.enums.LineBaseEnum;
 import com.njcn.device.pq.enums.PowerFlagEnum;
 import com.njcn.device.pq.enums.RunFlagEnum;
-import com.njcn.device.pq.mapper.LineMapper;
 import com.njcn.device.pq.pojo.dto.MonitorInfoDTO;
 import com.njcn.device.pq.pojo.vo.TerminalEvaluateAreaVO;
-import com.njcn.device.pq.service.DeptLineService;
 import com.njcn.device.pq.service.DeviceRunEvaluateService;
+import com.njcn.device.rstatintegrity.mapper.RStatIntegrityDMapper;
 import com.njcn.harmonic.api.RStatLimitRateDClient;
 import com.njcn.harmonic.pojo.param.RStatLimitQueryParam;
 import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java

@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,8 +13,11 @@ import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
 import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
 import com.njcn.device.biz.pojo.param.DeptGetLineParam;
-import com.njcn.device.pq.mapper.LineDetailMapper;
-import com.njcn.device.pq.mapper.RStatIntegrityDMapper;
+import com.njcn.device.common.service.GeneralDeviceService;
+import com.njcn.device.device.service.IDeviceService;
+import com.njcn.device.line.mapper.LineDetailMapper;
+import com.njcn.device.line.service.DeptLineService;
+import com.njcn.device.line.service.LineService;
 import com.njcn.device.pq.mapper.RStatOnlinerateDMapper;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.GridDiagramParam;
@@ -25,12 +27,12 @@ import com.njcn.device.pq.pojo.po.*;
 import com.njcn.device.pq.pojo.vo.GridDiagramProVO;
 import com.njcn.device.pq.pojo.vo.GridDiagramVO;
 import com.njcn.device.pq.service.*;
+import com.njcn.device.rstatintegrity.mapper.RStatIntegrityDMapper;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.po.DictData;
 import com.njcn.user.api.DeptFeignClient;
-import com.njcn.user.pojo.dto.DeptDTO;
 import com.njcn.user.pojo.po.Dept;
 
 import java.time.ZoneId;
@@ -39,7 +41,6 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.njcn.web.utils.WebUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LargeScreenServiceImpl.java

@@ -1,6 +1,7 @@
 package com.njcn.device.pq.service.impl;
 
 import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.device.common.service.GeneralDeviceService;
 import com.njcn.device.pq.mapper.LargeScreenMapper;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java

@@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.config.GeneralInfo;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.common.service.GeneralDeviceService;
 import com.njcn.device.pq.api.AlarmClient;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.biz.enums.DeviceResponseEnum;
@@ -15,7 +16,6 @@ import com.njcn.device.pq.enums.LineBaseEnum;
 import com.njcn.device.pq.enums.PowerFlagEnum;
 import com.njcn.device.pq.enums.RunFlagEnum;
 import com.njcn.device.pq.mapper.LineIntegrityDataMapper;
-import com.njcn.device.pq.mapper.RStatIntegrityDMapper;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.dto.PublicDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
@@ -27,6 +27,7 @@ import com.njcn.device.pq.pojo.vo.LineIntegrityDataVO;
 import com.njcn.device.pq.pojo.vo.RStatIntegrityVO;
 import com.njcn.device.pq.service.LineIntegrityDataService;
 import com.njcn.device.pq.utils.DataStatisticsUtil;
+import com.njcn.device.rstatintegrity.mapper.RStatIntegrityDMapper;
 import com.njcn.harmonic.pojo.vo.IntegrityIconVO;
 import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.supervision.pojo.param.user.UserReportParam;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineMarkServiceImpl.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.biz.enums.DeviceResponseEnum;
-import com.njcn.device.pq.mapper.LineDetailMapper;
+import com.njcn.device.line.mapper.LineDetailMapper;
 import com.njcn.device.pq.mapper.LineMarkMapper;
 import com.njcn.device.pq.pojo.bo.excel.LineMark;
 import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LogManageServiceImpl.java

@@ -7,30 +7,20 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Lists;
 import com.njcn.db.constant.DbConstant;
+import com.njcn.device.line.mapper.LineMapper;
 import com.njcn.device.pq.mapper.EventPushLogsMapper;
-import com.njcn.device.pq.mapper.LineMapper;
-import com.njcn.device.pq.mapper.LogManageMapper;
-import com.njcn.device.pq.pojo.constant.DeviceValidMessage;
-import com.njcn.device.pq.pojo.param.DeviceLogParam;
 import com.njcn.device.pq.pojo.param.EventLogParam;
 import com.njcn.device.pq.pojo.po.EventPushLogs;
 import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
-import com.njcn.device.pq.pojo.vo.DeviceLogVO;
 import com.njcn.device.pq.pojo.vo.EventLogVO;
 import com.njcn.device.pq.service.LogManageService;
 import com.njcn.event.api.EventDetailFeignClient;
 import com.njcn.event.pojo.po.EventDetail;
 import lombok.AllArgsConstructor;
-import org.influxdb.dto.QueryResult;
-import org.influxdb.impl.InfluxDBResultMapper;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NewStationServiceImpl.java

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.biz.enums.DeviceResponseEnum;
+import com.njcn.device.line.mapper.LineDetailMapper;
 import com.njcn.device.pq.enums.PvDeviceResponseEnum;
-import com.njcn.device.pq.mapper.LineDetailMapper;
 import com.njcn.device.pq.mapper.NewStationMapper;
 import com.njcn.device.pq.pojo.param.NewStationQueryParam;
 import com.njcn.device.pq.pojo.po.NewStation;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/OverLimitServiceImpl.java

@@ -1,20 +0,0 @@
-package com.njcn.device.pq.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.device.biz.pojo.po.Overlimit;
-import com.njcn.device.pq.mapper.OverlimitMapper;
-import com.njcn.device.pq.service.IOverLimitService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2023/6/7
- */
-@Service
-@RequiredArgsConstructor
-public class OverLimitServiceImpl extends ServiceImpl<OverlimitMapper, Overlimit> implements IOverLimitService {
-
-}

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDataVerifyBakServiceImpl.java

@@ -17,15 +17,11 @@ import com.njcn.dataProcess.api.PqReasonableRangeFeignClient;
 import com.njcn.dataProcess.enums.DataCleanEnum;
 import com.njcn.dataProcess.param.DataCleanParam;
 import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
-import com.njcn.device.biz.enums.DeviceResponseEnum;
-import com.njcn.device.biz.enums.LineFlagEnum;
-import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
+import com.njcn.device.line.mapper.LineMapper;
 import com.njcn.device.pq.constant.Param;
 import com.njcn.device.pq.enums.LineBaseEnum;
-import com.njcn.device.pq.mapper.LineMapper;
 import com.njcn.device.pq.mapper.PqDataVerifyBakMapper;
 import com.njcn.device.pq.pojo.param.dataClean.MonitorBaseParam;
-import com.njcn.device.pq.pojo.po.DataVerify;
 import com.njcn.device.pq.pojo.po.PqDataVerifyBak;
 import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
 import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
@@ -35,8 +31,6 @@ import com.njcn.device.pq.pojo.vo.dataClean.VerifyMonitorVO;
 import com.njcn.device.pq.pojo.vo.dataClean.VerifyTargetVO;
 import com.njcn.device.pq.service.CommTerminalService;
 import com.njcn.device.pq.service.IPqDataVerifyBakService;
-import com.njcn.harmonic.enums.HarmonicResponseEnum;
-import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.utils.FileStorageUtil;
 import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
@@ -45,13 +39,10 @@ import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.pojo.po.SysDicTreePO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.io.InputStream;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqIcdPathServiceImpl.java

@@ -9,18 +9,17 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.bpm.utils.CollectionUtils;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.device.service.IDeviceService;
+import com.njcn.device.device.service.PqDevTypeService;
+import com.njcn.device.line.mapper.LineMapper;
 import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
 import com.njcn.device.pq.constant.Param;
-import com.njcn.device.pq.mapper.LineMapper;
-import com.njcn.device.pq.mapper.PqsTerminalLogsMapper;
 import com.njcn.device.pq.pojo.dto.PqIcdPathDTO;
 import com.njcn.device.pq.pojo.param.PqIcdPathParam;
 import com.njcn.device.pq.pojo.po.*;
-import com.njcn.device.pq.service.IDeviceService;
-import com.njcn.device.pq.service.PqDevTypeService;
+import com.njcn.device.terminal.mapper.PqsTerminalLogsMapper;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
@@ -59,7 +58,7 @@ public class PqIcdPathServiceImpl extends ServiceImpl<PqIcdPathMapper, PqIcdPath
     private final IDeviceService deviceService;
     private final PqsTerminalLogsMapper pqsTerminalLogsMapper;
     private final DicDataFeignClient dicDataFeignClient;
-    private  final LineMapper lineMapper;
+    private final LineMapper lineMapper;
 
     @Override
     public List<PqIcdPathDTO> icdPathList(List<String> devType) {
@@ -152,9 +151,9 @@ public class PqIcdPathServiceImpl extends ServiceImpl<PqIcdPathMapper, PqIcdPath
         icdPath.setPath(param.getFilePath());
         //查询绑定的icd的设备型号
         List<PqDevType> pqDevTypeList = devTypeService.lambdaQuery().eq(PqDevType::getIcdId, param.getId()).eq(PqDevType::getState, 1).list();
-        if(!CollectionUtil.isEmpty(pqDevTypeList)) {
+        if (!CollectionUtil.isEmpty(pqDevTypeList)) {
             List<String> collect = pqDevTypeList.stream().map(PqDevType::getId).collect(Collectors.toList());
-            List<Device> list = deviceService.lambdaQuery().in(Device::getDevType,collect).eq(Device::getRunFlag, 0).list();
+            List<Device> list = deviceService.lambdaQuery().in(Device::getDevType, collect).eq(Device::getRunFlag, 0).list();
             list.forEach(temp -> {
                 //记录日志
                 DictData dataDic = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.DEV_PARAMETER.getCode(), DicDataTypeEnum.DEV_OPS.getCode()).getData();

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsDeviceUnitServiceImpl.java

@@ -2,8 +2,8 @@ package com.njcn.device.pq.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.device.line.mapper.LineMapper;
 import com.njcn.device.pq.enums.LineBaseEnum;
-import com.njcn.device.pq.mapper.LineMapper;
 import com.njcn.device.pq.mapper.PqsDeviceUnitMapper;
 import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.biz.pojo.po.PqsDeviceUnit;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsLineWeightServiceImpl.java

@@ -11,7 +11,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.device.pq.mapper.LineMapper;
+import com.njcn.device.line.mapper.LineMapper;
 import com.njcn.device.pq.mapper.PqsLineWeightMapper;
 import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;
 import com.njcn.device.pq.pojo.po.PqsLineWeight;
@@ -19,7 +19,7 @@ import com.njcn.device.pq.pojo.vo.PqsLineWeightVo;
 import com.njcn.device.pq.pojo.vo.TerminalTree;
 import com.njcn.device.pq.service.IPqsLineWeightService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.device.pq.utils.ExcelStyleUtil;
+import com.njcn.device.utils.ExcelStyleUtil;
 import com.njcn.poi.excel.ExcelUtil;
 import com.njcn.poi.util.PoiUtil;
 import lombok.RequiredArgsConstructor;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsTransformerServiceImpl.java

@@ -9,9 +9,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.line.mapper.LineMapper;
 import com.njcn.device.pq.enums.LineBaseEnum;
 import com.njcn.device.pq.enums.PvDeviceResponseEnum;
-import com.njcn.device.pq.mapper.LineMapper;
 import com.njcn.device.pq.mapper.PqsTflgassMapper;
 import com.njcn.device.pq.mapper.PqsTransformerMapper;
 import com.njcn.device.pq.pojo.dto.transformer.EntityLogicDTO;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java

@@ -6,11 +6,9 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.njcn.device.pq.mapper.LineDetailMapper;
-import com.njcn.device.pq.mapper.LineMapper;
-import com.njcn.device.pq.mapper.RStatIntegrityDMapper;
+import com.njcn.device.line.mapper.LineDetailMapper;
+import com.njcn.device.line.mapper.LineMapper;
 import com.njcn.device.pq.mapper.RStatOnlinerateDMapper;
 import com.njcn.device.pq.pojo.dto.LineDataQualityDTO;
 import com.njcn.device.pq.pojo.dto.MonitorIntegrityDTO;
@@ -21,6 +19,7 @@ import com.njcn.device.pq.pojo.po.RStatIntegrityD;
 import com.njcn.device.pq.pojo.po.RStatOnlinerateD;
 import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
 import com.njcn.device.pq.service.IRStatIntegrityDService;
+import com.njcn.device.rstatintegrity.mapper.RStatIntegrityDMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java

@@ -8,11 +8,13 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.dto.SimpleDTO;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.common.service.GeneralDeviceService;
+import com.njcn.device.common.service.TerminalBaseService;
+import com.njcn.device.device.mapper.DeviceMapper;
+import com.njcn.device.line.mapper.LineDetailMapper;
+import com.njcn.device.line.service.LineService;
 import com.njcn.device.pq.enums.LineBaseEnum;
-import com.njcn.device.pq.mapper.DeviceMapper;
-import com.njcn.device.pq.mapper.LineDetailMapper;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.RunManageParam;
@@ -22,12 +24,9 @@ import com.njcn.device.pq.pojo.vo.LineInfluxDbOnlineVO;
 import com.njcn.device.pq.pojo.vo.RunManageVO;
 import com.njcn.device.pq.pojo.vo.RunTimeVO;
 import com.njcn.device.pq.pojo.vo.TerminalLedgerVO;
-import com.njcn.device.pq.service.LineService;
 import com.njcn.device.pq.service.RunManageService;
-import com.njcn.device.pq.service.TerminalBaseService;
 import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
-import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.enums.StatisticsEnum;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/SubstationExpendServiceImpl.java

@@ -4,13 +4,14 @@ package com.njcn.device.pq.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import com.njcn.device.common.service.GeneralDeviceService;
+import com.njcn.device.common.service.TerminalBaseService;
 import com.njcn.device.pq.pojo.bo.DeviceType;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.vo.CommunicateVO;
 import com.njcn.device.pq.pojo.vo.TerminalBaseVO;
 import com.njcn.device.pq.service.ISubstationExpendService;
-import com.njcn.device.pq.service.TerminalBaseService;
 import com.njcn.influx.imapper.PqsCommunicateMapper;
 import com.njcn.influx.pojo.constant.InfluxDBTableConstant;
 import com.njcn.influx.pojo.po.PqsCommunicate;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/SubstationServiceImpl.java

@@ -5,22 +5,19 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.device.line.mapper.LineDetailMapper;
+import com.njcn.device.line.mapper.LineMapper;
 import com.njcn.device.pq.enums.LineBaseEnum;
-import com.njcn.device.pq.enums.PowerFlagEnum;
-import com.njcn.device.pq.mapper.LineDetailMapper;
-import com.njcn.device.pq.mapper.LineMapper;
-import com.njcn.device.pq.mapper.SubstationMapper;
-import com.njcn.device.pq.mapper.VoltageMapper;
 import com.njcn.device.pq.pojo.dto.SubstationDTO;
 import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.pq.pojo.po.LineDetail;
 import com.njcn.device.pq.pojo.po.Substation;
 import com.njcn.device.pq.pojo.po.Voltage;
 import com.njcn.device.pq.pojo.vo.LedgerSelectVO;
-import com.njcn.device.pq.pojo.vo.LineDetailVO;
 import com.njcn.device.pq.service.ISubstationService;
+import com.njcn.device.substation.mapper.SubstationMapper;
+import com.njcn.device.subvoltage.mapper.VoltageMapper;
 import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.po.DictData;
 import lombok.RequiredArgsConstructor;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.njcn.common.config.GeneralInfo;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.common.service.GeneralDeviceService;
 import com.njcn.device.pq.api.AlarmClient;
 import com.njcn.device.biz.enums.DeviceResponseEnum;
 import com.njcn.device.pq.enums.LineBaseEnum;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java

@@ -9,10 +9,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.common.pojo.enums.common.ServerEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.biz.pojo.vo.TerminalSelectTreeVO;
+import com.njcn.device.common.service.GeneralDeviceService;
+import com.njcn.device.line.mapper.DeptLineMapper;
+import com.njcn.device.line.mapper.LineDetailMapper;
+import com.njcn.device.line.mapper.LineMapper;
 import com.njcn.device.pq.enums.LineBaseEnum;
-import com.njcn.device.pq.mapper.DeptLineMapper;
-import com.njcn.device.pq.mapper.LineDetailMapper;
-import com.njcn.device.pq.mapper.LineMapper;
 import com.njcn.device.pq.mapper.TreeMapper;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
@@ -25,7 +26,6 @@ import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import com.njcn.system.api.AreaFeignClient;
-import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.pojo.enums.StatisticsEnum;
 import com.njcn.system.pojo.po.Area;
 import com.njcn.web.utils.RequestUtil;

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/YwZtSubstationServiceImpl.java

@@ -5,13 +5,13 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.device.biz.pojo.dto.SubGetBase;
 import com.njcn.device.biz.pojo.param.SubstationParam;
-import com.njcn.device.pq.mapper.SubstationMapper;
 import com.njcn.device.pq.mapper.YwZtSubstationMapper;
 import com.njcn.device.pq.pojo.po.Substation;
 import com.njcn.device.pq.pojo.po.YwZtSubstation;
 import com.njcn.device.pq.service.ISubstationService;
 import com.njcn.device.pq.service.IYwZtSubstationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.device.substation.mapper.SubstationMapper;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.dto.DeptDTO;
 import com.njcn.user.pojo.po.Dept;

pqs-device/pq-device/pq-device-com/pom.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.njcn</groupId>
+        <artifactId>pq-device</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>pq-device-com</artifactId>
+    <name>传统设备通用业务</name>
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>pq-device-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>common-web</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>supervision-api</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>common-oss</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.njcn.platform</groupId>
+            <artifactId>message-api</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+</project>

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/mapper/SuperDataMapper.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.mapper;
+package com.njcn.device.common.mapper;
 
 
 import com.njcn.device.pq.pojo.param.BaseReamParam;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/mapper/TopMsgMapper.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.mapper;
+package com.njcn.device.common.mapper;
 
 
 import cn.hutool.core.date.DateTime;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/mapper/mapping/SuperDataMapper.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.device.pq.mapper.SuperDataMapper">
+<mapper namespace="com.njcn.device.common.mapper.SuperDataMapper">
 
 
     <select id="getPointSuper" resultType="com.njcn.device.pq.pojo.param.SuperDataParam">

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/mapper/mapping/TopMagMapper.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.device.pq.mapper.TopMsgMapper">
+<mapper namespace="com.njcn.device.common.mapper.TopMsgMapper">
 
     <select id="dailyDeviceAbnormalStatistics" resultType="com.njcn.device.pq.pojo.po.TopMsgPO">
         SELECT

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/GeneralDeviceService.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.service.impl;
+package com.njcn.device.common.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
@@ -9,24 +9,24 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.enums.common.ServerEnum;
 import com.njcn.common.utils.EnumUtils;
+import com.njcn.device.common.mapper.TopMsgMapper;
+import com.njcn.device.device.mapper.DeviceMapper;
+import com.njcn.device.line.mapper.LineMapper;
+import com.njcn.device.line.service.DeptLineService;
 import com.njcn.device.pq.enums.LineBaseEnum;
 import com.njcn.device.pq.enums.PowerFlagEnum;
-import com.njcn.device.pq.mapper.DeviceMapper;
-import com.njcn.device.pq.mapper.LineMapper;
-import com.njcn.device.pq.mapper.TopMsgMapper;
-import com.njcn.device.pq.pojo.bo.BaseLineInfo;
 import com.njcn.device.pq.pojo.bo.DeviceType;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
-import com.njcn.device.pq.pojo.po.*;
+import com.njcn.device.pq.pojo.po.DeptLine;
+import com.njcn.device.pq.pojo.po.Device;
+import com.njcn.device.pq.pojo.po.Line;
+import com.njcn.device.pq.pojo.po.TopMsgPO;
 import com.njcn.device.pq.pojo.vo.DeptDeviceDetailVO;
 import com.njcn.device.pq.pojo.vo.DeptSubstationDetailVO;
 import com.njcn.device.pq.pojo.vo.DevDetail;
 import com.njcn.device.pq.pojo.vo.ExceptionDeviceInfoVO;
-import com.njcn.device.pq.service.DeptLineService;
-import com.njcn.device.pq.service.TerminalBaseService;
-import com.njcn.redis.utils.RedisUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
@@ -66,11 +66,10 @@ public class GeneralDeviceService {
 
     private final DicDataFeignClient dicDataFeignClient;
 
-    private final RedisUtil redisUtil;
-
     private final DeviceMapper deviceMapper;
 
     private final LineMapper lineMapper;
+
     private final TopMsgMapper topMsgMapper;
 
 

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/TerminalBaseService.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.service;
+package com.njcn.device.common.service;
 
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.device.pq.pojo.bo.BaseLineInfo;
@@ -8,7 +8,6 @@ import com.njcn.device.pq.pojo.dto.PreCommandDTO;
 import com.njcn.device.pq.pojo.dto.PushResultDTO;
 import com.njcn.device.pq.pojo.param.*;
 import com.njcn.device.pq.pojo.po.Line;
-import com.njcn.device.pq.pojo.vo.DevStatusNumVO;
 import com.njcn.device.pq.pojo.vo.LineWiringDiagramVO;
 import com.njcn.device.pq.pojo.vo.TerminalBaseVO;
 import com.njcn.device.pq.pojo.vo.TerminalVO;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.service.impl;
+package com.njcn.device.common.service.impl;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
@@ -16,9 +16,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
@@ -32,10 +29,22 @@ import com.njcn.device.biz.pojo.dto.LineDTO;
 import com.njcn.device.biz.pojo.po.DeviceBak;
 import com.njcn.device.biz.pojo.po.Overlimit;
 import com.njcn.device.biz.utils.COverlimitUtil;
+import com.njcn.device.common.mapper.SuperDataMapper;
+import com.njcn.device.common.service.TerminalBaseService;
+import com.njcn.device.device.mapper.DevFuctionMapper;
+import com.njcn.device.device.mapper.DeviceMapper;
+import com.njcn.device.device.service.DeviceBakService;
+import com.njcn.device.device.service.DeviceProcessService;
+import com.njcn.device.device.service.NodeDeviceService;
+import com.njcn.device.line.mapper.DeptLineMapper;
+import com.njcn.device.line.mapper.LineDetailMapper;
+import com.njcn.device.line.mapper.LineMapper;
+import com.njcn.device.line.service.LineBakService;
+import com.njcn.device.node.service.INodeService;
+import com.njcn.device.overlimit.mapper.OverlimitMapper;
 import com.njcn.device.pq.constant.Param;
 import com.njcn.device.pq.enums.LineBaseEnum;
 import com.njcn.device.pq.enums.PvDeviceResponseEnum;
-import com.njcn.device.pq.mapper.*;
 import com.njcn.device.pq.pojo.bo.BaseLineInfo;
 import com.njcn.device.pq.pojo.bo.DeviceType;
 import com.njcn.device.pq.pojo.bo.excel.NodeExcel;
@@ -47,9 +56,11 @@ import com.njcn.device.pq.pojo.param.*;
 import com.njcn.device.pq.pojo.param.oracle.*;
 import com.njcn.device.pq.pojo.po.*;
 import com.njcn.device.pq.pojo.vo.*;
-import com.njcn.device.pq.service.*;
 import com.njcn.device.pq.utils.DeviceUtil;
-import com.njcn.device.pq.utils.ExcelStyleUtil;
+import com.njcn.device.substation.mapper.SubstationMapper;
+import com.njcn.device.subvoltage.mapper.VoltageMapper;
+import com.njcn.device.terminal.mapper.PqsTerminalLogsMapper;
+import com.njcn.device.utils.ExcelStyleUtil;
 import com.njcn.message.api.ProduceFeignClient;
 import com.njcn.message.constant.DeviceRebootType;
 import com.njcn.message.constant.RedisKeyPrefix;
@@ -63,12 +74,10 @@ import com.njcn.poi.util.PoiUtil;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
-import com.njcn.supervision.pojo.vo.user.UserReportVO;
 import com.njcn.system.api.AreaFeignClient;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
-import com.njcn.system.enums.DicTreeEnum;
 import com.njcn.system.pojo.po.Area;
 import com.njcn.system.pojo.po.DictData;
 import com.njcn.web.utils.RequestUtil;
@@ -92,8 +101,6 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -4129,8 +4136,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
             pushResultDTO.setCode("2");
             pushResultDTO.setResult("");
         }else {
-
-
             TopicReplyDTO topicReplyDTO =JSONObject.parseObject(stringByKey,TopicReplyDTO.class);
             pushResultDTO.setCode("1");
             pushResultDTO.setResult(topicReplyDTO.getResult());

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/DeviceController.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.controller;
+package com.njcn.device.device.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Console;
@@ -12,6 +12,8 @@ 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.HttpResultUtil;
+import com.njcn.device.common.service.GeneralDeviceService;
+import com.njcn.device.device.service.IDeviceService;
 import com.njcn.device.pq.pojo.dto.DevComFlagDTO;
 import com.njcn.device.pq.pojo.dto.DeviceDTO;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
@@ -19,8 +21,6 @@ import com.njcn.device.pq.pojo.param.ConstantValueParam;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.po.Device;
 import com.njcn.device.pq.pojo.vo.DevStatusNumVO;
-import com.njcn.device.pq.service.IDeviceService;
-import com.njcn.device.pq.service.impl.GeneralDeviceService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.RequestUtil;
 import io.swagger.annotations.Api;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/DeviceVersionController.java

@@ -1,14 +1,14 @@
-package com.njcn.device.pq.controller;
+package com.njcn.device.device.controller;
 
 import com.njcn.common.pojo.annotation.OperateInfo;
 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.HttpResultUtil;
+import com.njcn.device.device.service.TerminalVersionService;
 import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;
 import com.njcn.device.pq.pojo.po.DevVersion;
 import com.njcn.device.pq.pojo.vo.TerminalVersionVO;
-import com.njcn.device.pq.service.TerminalVersionService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,7 +29,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/version")
 @RequiredArgsConstructor
-public class TerminalVersionController extends BaseController {
+public class DeviceVersionController extends BaseController {
 
     private final TerminalVersionService terminalVersionService;
 

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/NodeDeviceController.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.controller;
+package com.njcn.device.device.controller;
 
 
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -6,15 +6,13 @@ 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.HttpResultUtil;
+import com.njcn.device.device.service.NodeDeviceService;
 import com.njcn.device.pq.pojo.dto.DeviceInfo;
 import com.njcn.device.pq.pojo.dto.NodeProcessDeviceTree;
 import com.njcn.device.pq.pojo.param.NodeDeviceParam;
-
 import com.njcn.device.pq.pojo.po.DeviceProcess;
-import com.njcn.device.pq.service.NodeDeviceService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
-
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/PqDevTypeController.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.controller;
+package com.njcn.device.device.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -10,16 +10,19 @@ 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.HttpResultUtil;
+import com.njcn.device.device.service.PqDevTypeService;
 import com.njcn.device.pq.pojo.param.PqDevTypeParam;
 import com.njcn.device.pq.pojo.po.PqDevType;
-import com.njcn.device.pq.service.PqDevTypeService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
+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 java.util.List;
 

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/ProgramVersionController.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.controller;
+package com.njcn.device.device.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -7,9 +7,9 @@ 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.HttpResultUtil;
+import com.njcn.device.device.service.ProgramVersionService;
 import com.njcn.device.pq.pojo.param.ProgramParam;
 import com.njcn.device.pq.pojo.vo.VersionVO;
-import com.njcn.device.pq.service.ProgramVersionService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DevFuctionMapper.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.mapper;
+package com.njcn.device.device.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DevMealMapper.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.mapper;
+package com.njcn.device.device.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DevStrategyMapper.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.mapper;
+package com.njcn.device.device.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DevVersionMapper.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.mapper;
+package com.njcn.device.device.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DeviceBakMapper.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.mapper;
+package com.njcn.device.device.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DeviceMapper.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.mapper;
+package com.njcn.device.device.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DeviceProcessMapper.java

@@ -0,0 +1,20 @@
+package com.njcn.device.device.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pq.pojo.po.DeviceProcess;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-01-04
+ */
+public interface DeviceProcessMapper extends BaseMapper<DeviceProcess> {
+
+
+
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/PqDevTypeMapper.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.mapper;
+package com.njcn.device.device.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pq.pojo.po.PqDevType;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/ProgramVersionMapper.java

@@ -1,9 +1,8 @@
-package com.njcn.device.pq.mapper;
+package com.njcn.device.device.mapper;
 
 import com.njcn.device.pq.pojo.param.ProgramParam;
 import com.njcn.device.pq.pojo.vo.ShowVersionVO;
 import com.njcn.device.pq.pojo.vo.VersionVO;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/TerminalVersionMapper.java

@@ -1,8 +1,7 @@
-package com.njcn.device.pq.mapper;
+package com.njcn.device.device.mapper;
 
 import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;
 import com.njcn.device.pq.pojo.po.DevVersion;
-import com.njcn.device.pq.pojo.vo.TerminalMaintainVO;
 import com.njcn.device.pq.pojo.vo.TerminalVersionVO;
 import org.apache.ibatis.annotations.Param;
 

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/VersionMapper.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.mapper;
+package com.njcn.device.device.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DevFuctionMapper.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.device.pq.mapper.DevFuctionMapper">
+<mapper namespace="com.njcn.device.device.mapper.DevFuctionMapper">
 
     <insert id="addBatch">
         insert into cld_dev_fuction (id,line_id,fuc_name) values

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DevMealMapper.xml

@@ -1,5 +1,5 @@
 <?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.device.pq.mapper.DevStrategyMapper">
+<mapper namespace="com.njcn.device.device.mapper.DevMealMapper">
 
 </mapper>

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DevStrategyMapper.xml

@@ -1,5 +1,5 @@
 <?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.device.pq.mapper.DevMealMapper">
+<mapper namespace="com.njcn.device.device.mapper.DevStrategyMapper">
 
 </mapper>

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DevVersionMapper.xml

@@ -1,5 +1,5 @@
 <?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.device.pq.mapper.DevVersionMapper">
+<mapper namespace="com.njcn.device.device.mapper.DevVersionMapper">
 
 </mapper>

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceBakMapper.xml

@@ -1,7 +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.device.pq.mapper.DeviceProcessMapper">
-
+<mapper namespace="com.njcn.device.device.mapper.DeviceBakMapper">
 
 
 </mapper>

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.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.device.pq.mapper.DeviceMapper">
+<mapper namespace="com.njcn.device.device.mapper.DeviceMapper">
 
 
     <select id="getDeviceBySubId" resultType="com.njcn.device.pq.pojo.po.Device">

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceProcessMapper.xml

@@ -1,6 +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.device.pq.mapper.DeviceBakMapper">
+<mapper namespace="com.njcn.device.device.mapper.DeviceProcessMapper">
+
 
 
 </mapper>

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/PqDevTypeMapper.xml

@@ -1,5 +1,5 @@
 <?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.device.pq.mapper.PqDevTypeMapper">
+<mapper namespace="com.njcn.device.device.mapper.PqDevTypeMapper">
  
 </mapper>

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/ProgramVersionMapper.xml

@@ -1,7 +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.device.pq.mapper.ProgramVersionMapper">
+<mapper namespace="com.njcn.device.device.mapper.ProgramVersionMapper">
 
     <select id="getVersion" resultType="VersionVO">
         SELECT

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/TerminalVersionMapper.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.device.pq.mapper.TerminalVersionMapper">
+<mapper namespace="com.njcn.device.device.mapper.TerminalVersionMapper">
 
 
     <select id="getTerminalVersionInfo" resultType="TerminalVersionVO">

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/VersionMapper.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.device.pq.mapper.VersionMapper">
+<mapper namespace="com.njcn.device.device.mapper.VersionMapper">
 
     <select id="selectVersion" resultType="com.njcn.device.pq.pojo.vo.VersionVO">
         select

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/DevFuctionService.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.service;
+package com.njcn.device.device.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.device.pq.pojo.po.DevFuction;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/DeviceBakService.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.service;
+package com.njcn.device.device.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/DeviceProcessService.java

@@ -1,8 +1,7 @@
-package com.njcn.device.pq.service;
+package com.njcn.device.device.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.device.biz.pojo.po.DeviceBak;
 import com.njcn.device.pq.pojo.po.DeviceProcess;
 
 /**

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/IDevMealService.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.service;
+package com.njcn.device.device.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/IDevStrategyService.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.service;
+package com.njcn.device.device.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/IDeviceService.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.service;
+package com.njcn.device.device.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/NodeDeviceService.java

@@ -1,10 +1,9 @@
-package com.njcn.device.pq.service;
+package com.njcn.device.device.service;
 
 import com.njcn.device.pq.pojo.dto.DeviceInfo;
 import com.njcn.device.pq.pojo.dto.NodeProcessDeviceTree;
 import com.njcn.device.pq.pojo.param.NodeDeviceParam;
 import com.njcn.device.pq.pojo.po.DeviceProcess;
-import org.springframework.stereotype.Service;
 
 import java.util.List;
 

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/PqDevTypeService.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.service;
+package com.njcn.device.device.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/ProgramVersionService.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.service;
+package com.njcn.device.device.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/TerminalVersionService.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.service;
+package com.njcn.device.device.service;
 
 import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;
 import com.njcn.device.pq.pojo.po.DevVersion;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DevFuctionServiceImpl.java

@@ -1,10 +1,9 @@
-package com.njcn.device.pq.service.impl;
+package com.njcn.device.device.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.device.pq.mapper.DevFuctionMapper;
+import com.njcn.device.device.mapper.DevFuctionMapper;
 import com.njcn.device.pq.pojo.po.DevFuction;
-import com.njcn.device.pq.service.DevFuctionService;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,6 +12,6 @@ import org.springframework.stereotype.Service;
  * @date 2022/05/24
  */
 @Service
-public class DevFuctionServiceImpl extends ServiceImpl<DevFuctionMapper, DevFuction> implements DevFuctionService {
+public class DevFuctionServiceImpl extends ServiceImpl<DevFuctionMapper, DevFuction> implements IService<DevFuction> {
 
 }

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DevMealServiceImpl.java

@@ -1,10 +1,10 @@
-package com.njcn.device.pq.service.impl;
+package com.njcn.device.device.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.device.pq.mapper.DevMealMapper;
+import com.njcn.device.device.mapper.DevMealMapper;
+import com.njcn.device.device.service.IDevMealService;
 import com.njcn.device.pq.pojo.po.DevMeal;
-import com.njcn.device.pq.service.IDevMealService;
 import org.springframework.stereotype.Service;
 
 /**

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DevStrategyServiceImpl.java

@@ -1,10 +1,11 @@
-package com.njcn.device.pq.service.impl;
+package com.njcn.device.device.service.impl;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.device.pq.mapper.DevStrategyMapper;
+import com.njcn.device.device.mapper.DevStrategyMapper;
+import com.njcn.device.device.service.IDevStrategyService;
 import com.njcn.device.pq.pojo.po.DevStrategy;
-import com.njcn.device.pq.service.IDevStrategyService;
 import org.springframework.stereotype.Service;
 
 /**

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DeviceBakServiceImpl.java

@@ -1,9 +1,10 @@
-package com.njcn.device.pq.service.impl;
+package com.njcn.device.device.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.device.pq.mapper.DeviceBakMapper;
 import com.njcn.device.biz.pojo.po.DeviceBak;
-import com.njcn.device.pq.service.DeviceBakService;
+import com.njcn.device.device.mapper.DeviceBakMapper;
+import com.njcn.device.device.service.DeviceBakService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DeviceProcessServiceImpl.java

@@ -1,12 +1,10 @@
-package com.njcn.device.pq.service.impl;
+package com.njcn.device.device.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.device.biz.pojo.po.DeviceBak;
-import com.njcn.device.pq.mapper.DeviceBakMapper;
-import com.njcn.device.pq.mapper.DeviceProcessMapper;
-import com.njcn.device.pq.pojo.po.Device;
+import com.njcn.device.device.mapper.DeviceProcessMapper;
+import com.njcn.device.device.service.DeviceProcessService;
 import com.njcn.device.pq.pojo.po.DeviceProcess;
-import com.njcn.device.pq.service.DeviceProcessService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DeviceServiceImpl.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.service.impl;
+package com.njcn.device.device.service.impl;
 
 
 import cn.hutool.core.collection.CollUtil;
@@ -9,9 +9,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.device.biz.enums.RunFlagEnum;
-import com.njcn.device.pq.mapper.DevVersionMapper;
-import com.njcn.device.pq.mapper.DeviceMapper;
-import com.njcn.device.pq.mapper.LineMapper;
+import com.njcn.device.device.mapper.DevVersionMapper;
+import com.njcn.device.device.mapper.DeviceMapper;
+import com.njcn.device.device.service.IDeviceService;
+import com.njcn.device.device.service.ProgramVersionService;
+import com.njcn.device.line.mapper.LineMapper;
 import com.njcn.device.pq.pojo.advanced.*;
 import com.njcn.device.pq.pojo.param.ConstantValueParam;
 import com.njcn.device.pq.pojo.po.DevVersion;
@@ -20,9 +22,7 @@ import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.pq.pojo.po.Version;
 import com.njcn.device.pq.pojo.vo.DevStatusNumVO;
 import com.njcn.device.pq.pojo.vo.DeviceIpRVO;
-import com.njcn.device.pq.service.IDeviceService;
-import com.njcn.device.pq.service.ProgramVersionService;
-import com.njcn.device.pq.utils.SocketClient;
+import com.njcn.device.utils.SocketClient;
 import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
@@ -230,7 +230,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
             JSONObject jsonObject = new JSONObject();
             jsonObject.set("LineId", lineIndex);
             jsonObject.set("type", 0);
-            cn.hutool.json.JSONObject jsonObject1 = new cn.hutool.json.JSONObject();
+            JSONObject jsonObject1 = new JSONObject();
             jsonObject1.set("len",0);
             jsonObject1.set("data",jsonObject);
             socketClient.realTimeData(jsonObject1.toString(),host,socketPort,lineIndex);
@@ -243,7 +243,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
         JSONObject jsonObject = new JSONObject();
         jsonObject.set("LineId", lineIndex);
         jsonObject.set("type", 1);
-        cn.hutool.json.JSONObject jsonObject1 = new cn.hutool.json.JSONObject();
+        JSONObject jsonObject1 = new JSONObject();
         jsonObject1.set("len", 0);
         jsonObject1.set("data", jsonObject);
         String host = lineMapper.getNodeIp(lineIndex,0);

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/NodeDeviceServiceImpl.java

@@ -1,22 +1,21 @@
-package com.njcn.device.pq.service.impl;
+package com.njcn.device.device.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.device.service.DeviceProcessService;
+import com.njcn.device.device.service.IDeviceService;
+import com.njcn.device.device.service.NodeDeviceService;
+import com.njcn.device.line.mapper.LineMapper;
+import com.njcn.device.node.mapper.NodeMapper;
 import com.njcn.device.pq.constant.Param;
 import com.njcn.device.pq.enums.PvDeviceResponseEnum;
-import com.njcn.device.pq.mapper.DeviceMapper;
-import com.njcn.device.pq.mapper.LineMapper;
-import com.njcn.device.pq.mapper.NodeMapper;
-import com.njcn.device.pq.mapper.PqsTerminalLogsMapper;
 import com.njcn.device.pq.pojo.dto.DeviceInfo;
 import com.njcn.device.pq.pojo.dto.MonitorInfo;
 import com.njcn.device.pq.pojo.dto.NodeProcessDeviceTree;
 import com.njcn.device.pq.pojo.param.NodeDeviceParam;
 import com.njcn.device.pq.pojo.po.*;
-import com.njcn.device.pq.service.DeviceProcessService;
-import com.njcn.device.pq.service.IDeviceService;
-import com.njcn.device.pq.service.NodeDeviceService;
+import com.njcn.device.terminal.mapper.PqsTerminalLogsMapper;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
@@ -29,10 +28,12 @@ import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static com.njcn.device.pq.enums.LineBaseEnum.SUB_LEVEL;
 

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/PqDevTypeServiceImpl.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.service.impl;
+package com.njcn.device.device.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
@@ -10,18 +10,18 @@ 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.device.pms.enums.PmsDeviceResponseEnum;
+import com.njcn.device.biz.enums.DeviceResponseEnum;
+import com.njcn.device.device.mapper.PqDevTypeMapper;
+import com.njcn.device.device.service.IDeviceService;
+import com.njcn.device.device.service.PqDevTypeService;
+import com.njcn.device.line.mapper.LineMapper;
 import com.njcn.device.pq.constant.Param;
-import com.njcn.device.pq.mapper.LineMapper;
-import com.njcn.device.pq.mapper.PqDevTypeMapper;
-import com.njcn.device.pq.mapper.PqsTerminalLogsMapper;
 import com.njcn.device.pq.pojo.param.PqDevTypeParam;
 import com.njcn.device.pq.pojo.po.Device;
 import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.pq.pojo.po.PqDevType;
 import com.njcn.device.pq.pojo.po.PqsTerminalLogs;
-import com.njcn.device.pq.service.IDeviceService;
-import com.njcn.device.pq.service.PqDevTypeService;
+import com.njcn.device.terminal.mapper.PqsTerminalLogsMapper;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
@@ -99,7 +99,7 @@ public class PqDevTypeServiceImpl extends ServiceImpl<PqDevTypeMapper, PqDevType
                 .eq(PqDevType::getState, DataStateEnum.ENABLE.getCode())
                 .eq(PqDevType::getName, param.getName()).count();
         if (count > 0) {
-            throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT);
+            throw new BusinessException(DeviceResponseEnum.MODEL_NAME_REPEAT);
         }
         PqDevType devType = new PqDevType();
         devType.setName(param.getName());
@@ -118,7 +118,7 @@ public class PqDevTypeServiceImpl extends ServiceImpl<PqDevTypeMapper, PqDevType
                 )
         );
         if (count > 0) {
-            throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT);
+            throw new BusinessException(DeviceResponseEnum.MODEL_NAME_REPEAT);
         }
         PqDevType pqDevType = BeanUtil.copyProperties(param, PqDevType.class);
         //修改icd文件记录日志重启前置

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/ProgramVersionServiceImpl.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.service.impl;
+package com.njcn.device.device.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -8,13 +8,13 @@ import com.google.common.collect.Lists;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.biz.enums.DeviceResponseEnum;
-import com.njcn.device.pq.mapper.ProgramVersionMapper;
-import com.njcn.device.pq.mapper.VersionMapper;
+import com.njcn.device.device.mapper.ProgramVersionMapper;
+import com.njcn.device.device.mapper.VersionMapper;
+import com.njcn.device.device.service.ProgramVersionService;
 import com.njcn.device.pq.pojo.param.ProgramParam;
 import com.njcn.device.pq.pojo.po.Version;
 import com.njcn.device.pq.pojo.vo.ShowVersionVO;
 import com.njcn.device.pq.pojo.vo.VersionVO;
-import com.njcn.device.pq.service.ProgramVersionService;
 import com.njcn.web.utils.RequestUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/TerminalVersionServiceImpl.java

@@ -1,14 +1,14 @@
-package com.njcn.device.pq.service.impl;
+package com.njcn.device.device.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.biz.enums.DeviceResponseEnum;
-import com.njcn.device.pq.mapper.DevVersionMapper;
-import com.njcn.device.pq.mapper.TerminalVersionMapper;
+import com.njcn.device.device.mapper.DevVersionMapper;
+import com.njcn.device.device.mapper.TerminalVersionMapper;
+import com.njcn.device.device.service.TerminalVersionService;
 import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;
 import com.njcn.device.pq.pojo.po.DevVersion;
 import com.njcn.device.pq.pojo.vo.TerminalVersionVO;
-import com.njcn.device.pq.service.TerminalVersionService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/controller/LineController.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.controller;
+package com.njcn.device.line.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -11,17 +11,21 @@ import com.njcn.common.utils.LogUtil;
 import com.njcn.device.biz.enums.DeviceResponseEnum;
 import com.njcn.device.biz.pojo.dto.PollutionLineDTO;
 import com.njcn.device.biz.pojo.po.Overlimit;
-import com.njcn.device.pq.mapper.DeviceMapper;
-import com.njcn.device.pq.mapper.LineDetailMapper;
-import com.njcn.device.pq.mapper.LineMapper;
-import com.njcn.device.pq.mapper.RStatIntegrityDMapper;
-import com.njcn.device.pq.pojo.dto.*;
+import com.njcn.device.device.mapper.DeviceMapper;
+import com.njcn.device.line.mapper.LineMapper;
+import com.njcn.device.line.service.LineService;
+import com.njcn.device.line.mapper.LineDetailMapper;
+import com.njcn.device.overlimit.service.IOverLimitService;
+import com.njcn.device.pq.pojo.dto.OverLimitLineDTO;
+import com.njcn.device.pq.pojo.dto.PollutionParamDTO;
+import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO;
+import com.njcn.device.pq.pojo.dto.WarningSubstationDTO;
 import com.njcn.device.pq.pojo.param.*;
 import com.njcn.device.pq.pojo.po.Device;
 import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.pq.pojo.po.LineDetail;
 import com.njcn.device.pq.pojo.vo.*;
-import com.njcn.device.pq.service.LineService;
+import com.njcn.device.rstatintegrity.mapper.RStatIntegrityDMapper;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
@@ -57,6 +61,8 @@ public class LineController extends BaseController {
 
     private final RStatIntegrityDMapper integrityDMapper;
 
+    private final IOverLimitService overLimitService;
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getLineDetailData")
     @ApiOperation("根据监测点id获取监测点详情")
@@ -78,16 +84,6 @@ public class LineController extends BaseController {
     }
 
 
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/getLineOverLimitData")
-    @ApiOperation("根据监测点id获取越限详情")
-    @ApiImplicitParam(name = "id", value = "监测点id", required = true)
-    public HttpResult<LineOverLimitVO> getLineOverLimitData(@RequestParam("id") String id) {
-        String methodDescribe = getMethodDescribe("getLineOverLimitData");
-        LineOverLimitVO result = lineService.getLineOverLimitData(id);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
-    }
-
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getSubstationData")
     @ApiOperation("根据变电站id获取变电站详情")
@@ -149,18 +145,6 @@ public class LineController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
-
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/getOverLimitData")
-    @ApiOperation("根据监测点id获取越限数值")
-    @ApiImplicitParam(name = "id", value = "监测点id", required = true)
-    public HttpResult<Overlimit> getOverLimitData(@RequestParam("id") String id) {
-        String methodDescribe = getMethodDescribe("getOverLimitData");
-        Overlimit result = lineService.getOverLimitData(id);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
-    }
-
-
     /**
      * 获取投运在线的监测点的限值
      *
@@ -176,7 +160,7 @@ public class LineController extends BaseController {
     })
     public HttpResult<List<Overlimit>> getAllLineOverLimit(@RequestParam("serverName") String serverName, @RequestParam(value = "deptId", required = false) String deptId) {
         String methodDescribe = getMethodDescribe("getAllLineOverLimit");
-        List<Overlimit> result = lineService.getAllLineOverLimit(serverName, deptId);
+        List<Overlimit> result = overLimitService.getAllLineOverLimit(serverName, deptId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/DeptLineMapper.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.mapper;
+package com.njcn.device.line.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/LineBakMapper.java

@@ -1,8 +1,8 @@
-package com.njcn.device.pq.mapper;
+package com.njcn.device.line.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.device.pq.pojo.po.*;
+import com.njcn.device.pq.pojo.po.LineBak;
 
 /**
  * <p>

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/LineDetailMapper.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.mapper;
+package com.njcn.device.line.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/LineMapper.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pq.mapper;
+package com.njcn.device.line.mapper;
 
 
 import cn.hutool.core.date.DateTime;
@@ -7,25 +7,24 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.device.biz.pojo.dto.LineDTO;
 import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
-import com.njcn.device.biz.pojo.po.Overlimit;
+import com.njcn.device.biz.pojo.dto.PollutionLineDTO;
 import com.njcn.device.pq.pojo.advanced.UpDevVO;
 import com.njcn.device.pq.pojo.bo.BaseLineInfo;
 import com.njcn.device.pq.pojo.bo.DeviceType;
 import com.njcn.device.pq.pojo.bo.excel.TerminalBaseExcel;
 import com.njcn.device.pq.pojo.dto.*;
-import com.njcn.device.pq.pojo.dto.OverLimitLineDTO;
-import com.njcn.device.biz.pojo.dto.PollutionLineDTO;
-import com.njcn.device.pq.pojo.dto.WarningSubstationDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.LineBaseQueryParam;
 import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;
-import com.njcn.device.pq.pojo.po.*;
+import com.njcn.device.pq.pojo.po.Device;
+import com.njcn.device.pq.pojo.po.Line;
+import com.njcn.device.pq.pojo.po.LineDetail;
+import com.njcn.device.pq.pojo.po.Voltage;
 import com.njcn.device.pq.pojo.vo.*;
 import com.njcn.web.pojo.vo.LineDataVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -200,14 +199,6 @@ public interface LineMapper extends BaseMapper<Line> {
     List<String> getDeviceIdByManufacturer(@Param("deviceIds") List<String> deviceIds, @Param("manufacturer") String manufacturer);
 
 
-    /**
-     * 获取所有在线投运的监测点限值
-     *
-     * @author cdf
-     * @date 2022/3/23
-     */
-    List<Overlimit> getAllLineOverLimit(@Param("list") List<Integer> list);
-
     /**
      * 根据监测点集合查询基础信息
      *

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/DeptLineMapper.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.device.pq.mapper.DeptLineMapper">
+<mapper namespace="com.njcn.device.line.mapper.DeptLineMapper">
 
     <update id="deptChangeBindLine" >
     update pq_dept_line set id = #{id} where Line_Id = #{lineId}