1.冀北终端在线率代码提交

- 添加越限程度概率分布接口及实现
- 添加越限时间概率分布接口及实现

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-common/common-db/pom.xml

@@ -57,6 +57,11 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+        <!--vastbase驱动用postgresql-->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
         <!--达梦驱动-->
         <dependency>
             <groupId>com.dameng</groupId>

pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java

@@ -81,7 +81,8 @@ public class Knife4jSwaggerConfig {
                 "com.njcn.supervision.controller",
                 "com.njcn.algorithm",
                 "com.njcn.dataProcess",
-                "com.njcn.migration"
+                "com.njcn.migration",
+                "com.njcn.harmonic.rstatlimitrate.controller"
                 )
                 .collect(Collectors.toList());
         List<GrantType> grantTypes = new ArrayList<>();

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/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/PollutionLineInfoDTO.java

@@ -74,7 +74,10 @@ public class PollutionLineInfoDTO {
      * 电压等级
      */
     private String lineVoltage;
-
+    /**
+     * 变电站电压等级
+     */
+    private String subVoltage;
     /**
      * 装置id
      */

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-api/src/main/java/com/njcn/device/pq/constant/Param.java

@@ -55,7 +55,11 @@ public interface Param {
     //长时间闪变值
     String pst = "DataFlicker-pst";
 
+    //电压暂降
+    String Voltage_Dip = "r_mp_event_detail-Voltage_Dip";
+    //电压暂升
     String Voltage_Rise = "r_mp_event_detail-Voltage_Rise";
+
     String pf = "DataHarmPowerP-pf";
 
 

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineParam.java

@@ -124,11 +124,11 @@ public class LineParam {
     private String objId;
 
     @ApiModelProperty(name = "bigObjType",value = "对象大类")
-    @NotBlank(message = "对象大类不可为空")
+//    @NotBlank(message = "对象大类不可为空")
     private String bigObjType;
 
     @ApiModelProperty(name = "smallObjType",value = "对象小类")
-    @NotBlank(message = "对象小类不可为空")
+//    @NotBlank(message = "对象小类不可为空")
     private String smallObjType;
 
     /**

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/PqDataVerifyBak.java

@@ -137,6 +137,16 @@ public class PqDataVerifyBak {
      */
     private Integer pst;
 
+    /**
+     * 电压暂降(0:正常 1:异常)
+     */
+    private Integer dip;
+
+    /**
+     * 电压暂升(0:正常 1:异常)
+     */
+    private Integer rise;
+
     /**
      * 判断所有指标 0:无异常 1:有异常
      */

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DevDetail.java

@@ -27,6 +27,9 @@ public class DevDetail {
     @ApiModelProperty("供电公司")
     private String gdName;
 
+    @ApiModelProperty("所属部门")
+    private String deptName;
+
     @ApiModelProperty("变电站名称")
     private String bdzName;
 
@@ -37,9 +40,15 @@ public class DevDetail {
     @ApiModelProperty("终端等级")
     private String lineGrade;
 
+    @ApiModelProperty("终端厂商")
+    private String manufacturer;
+
     @ApiModelProperty("通讯状态（0：中断；1：正常）")
     private Integer comFlag;
 
+    @ApiModelProperty("运行状态（0：运行；1：检修；2：停运；3：调试；4：退运）")
+    private Integer runFlag;
+
     @ApiModelProperty("定检时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate nextTimeCheck;

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/RStatOnlinerateVO.java

@@ -1,6 +1,5 @@
 package com.njcn.device.pq.pojo.vo;
 
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import lombok.Data;
 
 import java.time.LocalDateTime;

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/common/DeviceOnlineRate.java

@@ -0,0 +1,84 @@
+package com.njcn.device.pq.pojo.vo.common;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author wr
+ * @description
+ * @date 2025/11/26 11:00
+ */
+
+@Data
+public class DeviceOnlineRate {
+
+    @ApiModelProperty("总终端数量")
+    private Integer totalNum;
+
+    @ApiModelProperty("低于90终端数据")
+    private Integer belowNum;
+
+    @ApiModelProperty("总终端在线率")
+    private String totalOnlineRate;
+
+    @ApiModelProperty("统计信息")
+    List<CitDetail> citDetailList;
+
+    @Data
+    public static class CitDetail {
+
+        @ApiModelProperty("地市")
+        private String citName;
+
+        @ApiModelProperty("总终端数量")
+        private Integer citTotalNum;
+
+        @ApiModelProperty("低于90终端数据")
+        private Integer citBelowNum;
+
+        @ApiModelProperty("总终端在线率")
+        private String citTotalOnlineRate;
+
+        @ApiModelProperty("统计信息")
+        List<?> detailList;
+    }
+
+
+    @Data
+    public static class Detail {
+
+        @ApiModelProperty("地市")
+        private String cit;
+
+        @ApiModelProperty("供电公司")
+        private String company;
+
+        @ApiModelProperty("变电站")
+        private String subStation;
+
+        @ApiModelProperty("终端ID")
+        private String deviceId;
+
+        @ApiModelProperty("终端名称")
+        private String deviceName;
+
+        @ApiModelProperty("终端厂家")
+        private String manufacturer;
+
+        @ApiModelProperty("终端IP")
+        private String ip;
+
+        @ApiModelProperty("终端运行状态")
+        private Integer runFlag;
+
+        @ApiModelProperty("终端运行状态")
+        private Integer comFlag;
+
+        @ApiModelProperty("在线率")
+        private String onlineRate;
+    }
+
+}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/DetailAbnormalVO.java

@@ -50,6 +50,8 @@ public class DetailAbnormalVO {
         private String avg;
         //CP95
         private String cp95;
+        //幅值
+        private String featureAmplitude;
 
     }
 
@@ -73,6 +75,7 @@ public class DetailAbnormalVO {
         //最大
         private String val;
 
-
+        //限值
+        private float overLimitValue;
     }
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/JsonBaseVO.java

@@ -9,14 +9,29 @@ import lombok.Data;
  */
 @Data
 public class JsonBaseVO {
-
+    /**
+     * 超标时间
+     */
     private String time;
 
+    /**
+     * 异常值
+     */
     private String value;
 
+    /**
+     * 相别
+     */
     private String phasic;
 
+    /**
+     * 数据类型(最大值：max、最小值：min、平均值：avg、95值：cp95)
+     */
     private String valueType;
 
+    /**
+     * 限值
+     */
+    private float overLimitValue;
 
 }

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

@@ -20,10 +20,9 @@
     <dependencies>
         <dependency>
             <groupId>com.njcn</groupId>
-            <artifactId>pq-device-api</artifactId>
+            <artifactId>pq-device-com</artifactId>
-            <version>${project.version}</version>
+            <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.line.mapper.LineMapper;
-import com.njcn.device.pq.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/controller/TerminalTreeController.java

@@ -54,7 +54,7 @@ public class TerminalTreeController extends BaseController {
         String methodDescribe = getMethodDescribe("getTerminalTree");
         List<TerminalTree> tree;
         if(isJb){
-            tree= terminalTreeService.getJbTerminalTree();
+            tree= terminalTreeService.getJbNewTerminalTree();
         }else{
             tree= terminalTreeService.getTerminalTree();
         }

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.device.service.DeviceProcessService;
-import com.njcn.device.pq.mapper.LineMapper;
+import com.njcn.device.device.service.IDeviceService;
-import com.njcn.device.pq.mapper.NodeMapper;
+import com.njcn.device.node.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.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/TerminalTreeService.java

@@ -49,4 +49,7 @@ public interface TerminalTreeService {
      * @return
      */
     List<TerminalTree> getJbTerminalTree();
+
+
+    List<TerminalTree> getJbNewTerminalTree();
 }

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.line.service.LineService;
-import com.njcn.device.pq.mapper.RStatIntegrityDMapper;
 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.rstatintegrity.mapper.RStatIntegrityDMapper;
-import com.njcn.device.pq.utils.PublicDateUtil;
 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;
-
 
 
 /**
@@ -525,6 +509,7 @@ public class DataVerifyServiceImpl extends ServiceImpl<DataVerifyMapper, DataVer
                         vo.setVal(valArr[i]);
                         vo.setPhaseType(phasic);
                         vo.setTargetName(StrUtil.isNotBlank(count) ? count + "次" + targetName : targetName);
+                        vo.setOverLimitValue(it.getOverLimitValue());
                         result.add(vo);
                     }
                 });

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.common.service.GeneralDeviceService;
-import com.njcn.device.pq.mapper.RStatIntegrityDMapper;
+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;
@@ -243,7 +244,6 @@ public class GridDiagramServiceImpl implements GridDiagramService {
     public GridDiagramVO getGridDiagramDev(GridDiagramParam param) {
         //获取电压等级
         List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData();
-
         List<DictData> v = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PANORAMIC_VOLTAGE.getCode()).getData();
         List<String> voltageIds;
         //获取电压等级550 220 110 35
@@ -263,7 +263,6 @@ public class GridDiagramServiceImpl implements GridDiagramService {
         List<Dept> data = deptFeignClient.getDirectSonSelf(param.getOrgId()).getData();
         DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
         deptGetLineParam.setDeptId(param.getOrgId());
-        deptGetLineParam.setLineRunFlag(0);
         List<DeptGetChildrenMoreDTO> deptGetChildrenMoreDTOS = commTerminalService.deptGetLine(deptGetLineParam);
 
 

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.line.mapper.LineMapper;
-import com.njcn.device.biz.enums.LineFlagEnum;
-import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
 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;
@@ -484,7 +475,7 @@ public class PqDataVerifyBakServiceImpl extends ServiceImpl<PqDataVerifyBakMappe
                         vo.setTargetKey(targetKey);
                         vo.setPhaseType(phaseKey);
 
-                        if ((pqReasonableRangeDto.getInfluxdbTableName() + SEPARATOR + pqReasonableRangeDto.getIndexCode()).equals(targetKey)) {
+                        if ((DataCleanEnum.DataI.getCode() + SEPARATOR + DataCleanEnum.RmsI.getCode() ).equals(targetKey)) {
                             vo.setRangeDesc(pqReasonableRangeDto.getMinValue() + unit + " ~ " + pqReasonableRangeDto.getMaxValue() + "*CT1" + unit);
                         } else {
                             vo.setRangeDesc(pqReasonableRangeDto.getMinValue() + unit + " ~ " + pqReasonableRangeDto.getMaxValue() + unit);
@@ -502,6 +493,8 @@ public class PqDataVerifyBakServiceImpl extends ServiceImpl<PqDataVerifyBakMappe
                                     break;
                                 case "CP95":
                                     vo.setCp95(ites.getVal());
+                                case "Feature_Amplitude":
+                                    vo.setFeatureAmplitude(ites.getVal());
                                     break;
                             }
                         });
@@ -527,7 +520,7 @@ public class PqDataVerifyBakServiceImpl extends ServiceImpl<PqDataVerifyBakMappe
         queryWrapper.select("line_id as lineId,sum(freq) as freq,sum(freq_Dev) as freqDev,sum(v_Rms) as vRms,sum(v_Pos) as vPos,sum(v_Neg) as vNeg," +
                         "sum(v_Zero) as vZero,sum(v_Unbalance) as vUnbalance,sum(rms_Lvr) as rmsLvr,sum(vu_Dev) as vuDev,sum(vl_Dev) as vlDev," +
                         "sum(v_Thd) as vThd,sum(v) as v,sum(i_Rms) as iRms,sum(plt) as plt,sum(v_Inharm) as vInharm,sum(v_Harm) as vHarm,sum(pf) as pf," +
-                        "sum(v_Phasic) as vPhasic,sum(v1_Phasic) as v1Phasic,sum(fluc) as fluc,sum(pst) as pst,sum(state) as state")
+                        "sum(v_Phasic) as vPhasic,sum(v1_Phasic) as v1Phasic,sum(fluc) as fluc,sum(pst) as pst,sum(dip) as dip,sum(rise) as rise,sum(state) as state")
                 .lambda().between(PqDataVerifyBak::getTimeId, DateUtil.beginOfDay(DateUtil.parse(monitorBaseParam.getSearchBeginTime())), DateUtil.endOfDay(DateUtil.parse(monitorBaseParam.getSearchEndTime())))
                 .in(PqDataVerifyBak::getLineId, monitorIds)
                 .eq(PqDataVerifyBak::getState, 1)
@@ -661,6 +654,14 @@ public class PqDataVerifyBakServiceImpl extends ServiceImpl<PqDataVerifyBakMappe
                     ids = dataVerifyList.stream().filter(it -> it.getPf() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
                     assembleEntity(ids, dto, result);
                     break;
+                case Param.Voltage_Dip:
+                    ids = dataVerifyList.stream().filter(it -> it.getDip() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
+                    assembleEntity(ids, dto, result);
+                    break;
+                case Param.Voltage_Rise:
+                    ids = dataVerifyList.stream().filter(it -> it.getRise() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
+                    assembleEntity(ids, dto, result);
+                    break;
                 default:
                     log.error("未匹配到异常数据指标");
                     break;

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.terminal.mapper.PqsTerminalLogsMapper;
-import com.njcn.device.pq.service.PqDevTypeService;
 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

@@ -8,10 +8,11 @@ import cn.hutool.core.util.StrUtil;
 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.enums.common.DataStateEnum;
 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;
@@ -176,9 +177,9 @@ public class PqsTransformerServiceImpl extends ServiceImpl<PqsTransformerMapper,
                                     .eq(PqsTflgass::getLogicNext, param.getDownNode())
                     )
             );
-            if(ObjectUtil.isNotNull(tflgass)){
+            if (ObjectUtil.isNotNull(tflgass)) {
                 throw new BusinessException(PvDeviceResponseEnum.TRANSFORMER_NAME_REPEAT);
-            }else{
+            } else {
                 fly = iPqsTflgassService.save(ass);
             }
 
@@ -198,59 +199,182 @@ public class PqsTransformerServiceImpl extends ServiceImpl<PqsTransformerMapper,
         PqsTflgass one = iPqsTflgassService.getOne(new LambdaQueryWrapper<PqsTflgass>()
                 .eq(PqsTflgass::getTfIndex, id));
 
-        //1.获取当前变电站下，所拥有的母线条数
+        List<String> arr = new ArrayList<>();
-        List<TerminalTree> downVoltage = lineMapper.getvoltage(subId, 1);
+        if (Objects.nonNull(one)) {
-        //获取母线id
+            arr.add(one.getLogicBefore());
-        List<String> ids = downVoltage.stream().map(TerminalTree::getId).collect(Collectors.toList());
+            arr.add(one.getLogicNext());
-        //查询节点是否绑定
-        List<PqsTflgass> pqsTflgasses = pqsTflgassMapper.selectFlgass(subId, ids);
-
-
-        String[][] arr = new String[pqsTflgasses.size()][2];
-        if (CollUtil.isNotEmpty(pqsTflgasses) && ids.size() > 2) {
-            for (int i = 0; i < pqsTflgasses.size(); i++) {
-                arr[i][0] = pqsTflgasses.get(i).getLogicBefore();
-                arr[i][1] = pqsTflgasses.get(i).getLogicNext();
-            }
-
         }
         voltage.put("bind", arr);
 
-        Stream<String> beforeStream = pqsTflgasses.stream().map(PqsTflgass::getLogicBefore);
+        //1.获取当前变电站下，所拥有的母线条数
-        Stream<String> nextStream = pqsTflgasses.stream().map(PqsTflgass::getLogicNext);
+        List<TerminalTree> downVoltage = lineMapper.getvoltage(subId, 1);
-        //合并节点，要是母线都存在，说明是跨变电站，反之是本变电站
+        if(CollUtil.isNotEmpty(arr)) {
-        List<String> merge = Stream.concat(beforeStream, nextStream)
+            downVoltage.forEach(item->{
-                .distinct()
+                if(Objects.equals(item.getId(),arr.get(1))){
-                .collect(Collectors.toList());
+                    item.setLevel(LineBaseEnum.SUB_V_LEVEL.getCode());
-        //查看已经绑定的母线
+                }
-        List<String> bindList = merge.stream().filter(x -> ids.contains(x)).collect(Collectors.toList());
+            });
-
+        }
-        //绑定母线，如有绑定的母线下不存在这个母线，说明是有跨变电站数据，则新增母线节点，为最底层节点往后，拼接
+        //获取所有母线层级
-        List<String> straddleList = merge.stream().filter(x -> !ids.contains(x)).collect(Collectors.toList());
+        List<Line> UpBusList = lineMapper.selectList(new LambdaQueryWrapper<Line>().eq(Line::getLevel, LineBaseEnum.SUB_V_LEVEL.getCode()).eq(Line::getState, DataStateEnum.ENABLE.getCode()).orderByAsc(Line::getSort));
-        //判断当前母线下是否还存在，没绑定节点
+        List<TerminalTree> upTreeList = UpBusList.stream().map(it -> {
-        List<String> not = ids.stream().filter(x -> !bindList.contains(x)).collect(Collectors.toList());
+            TerminalTree terminalTree = new TerminalTree();
+            terminalTree.setId(it.getId());
+            terminalTree.setName(it.getName());
+            terminalTree.setPid(it.getPids().split(StrUtil.COMMA)[LineBaseEnum.SUB_LEVEL.getCode()]);
+            terminalTree.setSort(it.getSort());
+            if(CollUtil.isNotEmpty(arr)) {
+                if (it.getId().equals(arr.get(0))) {
+                    terminalTree.setLevel(LineBaseEnum.SUB_V_LEVEL.getCode());
+                }
+            }
+            return terminalTree;
+        }).collect(Collectors.toList());
 
 
+        //获取母线id
+        //List<String> ids = downVoltage.stream().map(TerminalTree::getId).collect(Collectors.toList());
+
+        List<TerminalTree> upList = TreedChildren(upTreeList, "变压器上节点设备树", subId);
+        voltage.put("upNode", upList);
+        List<TerminalTree> downList = TreedChildren(downVoltage, "变压器下节点设备树", subId);
+        voltage.put("downNode", downList);
+        return voltage;
+
+    }
+
+
+
+
+public Map<String, Object> getGeneratrixOld(String subId, String id) {
+    Map<String, Object> voltage = new HashMap<>();
+    //先判断当前，变电站是否已添加了节点
+    PqsTflgass one = iPqsTflgassService.getOne(new LambdaQueryWrapper<PqsTflgass>()
+            .eq(PqsTflgass::getTfIndex, id));
+
+    //1.获取当前变电站下，所拥有的母线条数
+    List<TerminalTree> downVoltage = lineMapper.getvoltage(subId, 1);
+    //获取母线id
+    List<String> ids = downVoltage.stream().map(TerminalTree::getId).collect(Collectors.toList());
+    //查询节点是否绑定
+    List<PqsTflgass> pqsTflgasses = pqsTflgassMapper.selectFlgass(subId, ids);
+
+
+    String[][] arr = new String[pqsTflgasses.size()][2];
+    if (CollUtil.isNotEmpty(pqsTflgasses) && ids.size() > 2) {
+        for (int i = 0; i < pqsTflgasses.size(); i++) {
+            arr[i][0] = pqsTflgasses.get(i).getLogicBefore();
+            arr[i][1] = pqsTflgasses.get(i).getLogicNext();
+        }
+
+    }
+    voltage.put("bind", arr);
+
+    Stream<String> beforeStream = pqsTflgasses.stream().map(PqsTflgass::getLogicBefore);
+    Stream<String> nextStream = pqsTflgasses.stream().map(PqsTflgass::getLogicNext);
+    //合并节点，要是母线都存在，说明是跨变电站，反之是本变电站
+    List<String> merge = Stream.concat(beforeStream, nextStream)
+            .distinct()
+            .collect(Collectors.toList());
+    //查看已经绑定的母线
+    List<String> bindList = merge.stream().filter(x -> ids.contains(x)).collect(Collectors.toList());
+
+    //绑定母线，如有绑定的母线下不存在这个母线，说明是有跨变电站数据，则新增母线节点，为最底层节点往后，拼接
+    List<String> straddleList = merge.stream().filter(x -> !ids.contains(x)).collect(Collectors.toList());
+    //判断当前母线下是否还存在，没绑定节点
+    List<String> not = ids.stream().filter(x -> !bindList.contains(x)).collect(Collectors.toList());
+
+
+    /**
+     * 当母线节点+1等于去重之后的绑定节点说明，节点已经全部绑定了
+     *
+     * 跨变电站
+     *      1.1当母线小于俩条时为跨
+     *      1.2当都所有节点都绑定时，只有最起始节点为跨
+     * 本变电站
+     *      1.1当有俩条时或者大于俩条时时为本
+     *      1.2当已绑定有跨变电站时，则上节点为最底层节点母线，下节点为没绑定的母线信息
+     */
+
+
+    if (ObjectUtil.isNotNull(one)) {
+        List<String> collect = ids.stream().filter(x -> x.equals(one.getLogicBefore())).collect(Collectors.toList());
         /**
-         * 当母线节点+1等于去重之后的绑定节点说明，节点已经全部绑定了
+         * 本
-         *
+         *  1.当母线大于俩条
-         * 跨变电站
+         *  2.当所有母线没有绑定是
-         *      1.1当母线小于俩条时为跨
-         *      1.2当都所有节点都绑定时，只有最起始节点为跨
-         * 本变电站
-         *      1.1当有俩条时或者大于俩条时时为本
-         *      1.2当已绑定有跨变电站时，则上节点为最底层节点母线，下节点为没绑定的母线信息
          */
+        if (collect.size() > 0) {
+            List<TerminalTree> upVOList;
+            if (straddleList.size() > 0 && not.size() > 0) {
+                String s = mostNext(pqsTflgasses);
+                upVOList = downVoltage.stream().filter(x -> s.equals(x.getId())).collect(Collectors.toList());
+            } else {
+                //上节点id
+                List<String> upIDs = pqsTflgasses.stream().map(PqsTflgass::getLogicBefore).collect(Collectors.toList());
+                upVOList = downVoltage.stream().filter(x -> !upIDs.contains(x.getId())).collect(Collectors.toList());
+            }
 
+            //下节点id
+            List<String> downIDs = pqsTflgasses.stream().map(PqsTflgass::getLogicNext).collect(Collectors.toList());
+            List<TerminalTree> downVOList = downVoltage.stream().filter(x -> !downIDs.contains(x.getId())).collect(Collectors.toList());
 
-        if (ObjectUtil.isNotNull(one)) {
+            if (ObjectUtil.isNotNull(one)) {
-            List<String> collect = ids.stream().filter(x -> x.equals(one.getLogicBefore())).collect(Collectors.toList());
+                TerminalTree beforeTree = addTree(one.getLogicBefore());
-            /**
+                TerminalTree nextTree = addTree(one.getLogicNext());
-             * 本
+                upVOList.add(beforeTree);
-             *  1.当母线大于俩条
+                downVOList.add(nextTree);
-             *  2.当所有母线没有绑定是
+            }
-             */
+            List<TerminalTree> upList = TreedChildren(upVOList, "变压器上节点设备树", subId);
-            if (collect.size() > 0) {
+            voltage.put("upNode", upList);
+            List<TerminalTree> downList = TreedChildren(downVOList, "变压器下节点设备树", subId);
+            voltage.put("downNode", downList);
+            return voltage;
+        } else {
+            //查询所有变电站下母线信息
+            List<TerminalTree> upVoltage = lineMapper.getvoltage(subId, 0);
+            if (merge.size() == ids.size()) {
+                String s = mostBefore(pqsTflgasses);
+                downVoltage = downVoltage.stream().filter(x -> x.getId().equals(s)).collect(Collectors.toList());
+
+            }
+            if (ObjectUtil.isNotNull(one)) {
+                TerminalTree beforeTree = addTree(one.getLogicBefore());
+                TerminalTree nextTree = addTree(one.getLogicNext());
+                upVoltage = upVoltage.stream().filter(x -> !x.getId().equals(beforeTree.getId())).collect(Collectors.toList());
+                upVoltage.add(beforeTree);
+
+                downVoltage.clear();
+                downVoltage.add(nextTree);
+            }
+            List<TerminalTree> upList = TreedChildren(upVoltage, "变压器上节点设备树", null);
+            voltage.put("upNode", upList);
+            List<TerminalTree> downList = TreedChildren(downVoltage, "变压器下节点设备树", subId);
+            voltage.put("downNode", downList);
+            return voltage;
+        }
+
+    } else {
+        //判断是否已经全部绑定
+        String chain = chain(pqsTflgasses);
+        String chain2 = chain2(pqsTflgasses);
+        if (StrUtil.isNotBlank(chain) && not.size() == 0 && pqsTflgasses.size() + 1 != ids.size() && straddleList.size() == 0
+                || StrUtil.isNotBlank(chain2) && not.size() == 0 && pqsTflgasses.size() + 1 != ids.size() && straddleList.size() == 0) {
+            List<String> logicBefore = pqsTflgasses.stream().map(PqsTflgass::getLogicBefore).collect(Collectors.toList());
+            List<String> logicNext = pqsTflgasses.stream().map(PqsTflgass::getLogicNext).collect(Collectors.toList());
+            List<TerminalTree> up = downVoltage.stream().filter(x -> !logicBefore.contains(x.getId())).collect(Collectors.toList());
+            List<TerminalTree> upList = TreedChildren(up, "变压器上节点设备树", subId);
+            voltage.put("upNode", upList);
+
+            List<TerminalTree> down = downVoltage.stream().filter(x -> !logicNext.contains(x.getId())).collect(Collectors.toList());
+            List<TerminalTree> downList = TreedChildren(down, "变压器下节点设备树", subId);
+            voltage.put("downNode", downList);
+            return voltage;
+        } else {
+            if (downVoltage.size() > 1 && straddleList.size() == 0 && bindList.size() != ids.size()
+                    || straddleList.size() > 0 && not.size() > 0
+
+            ) {
                 List<TerminalTree> upVOList;
                 if (straddleList.size() > 0 && not.size() > 0) {
                     String s = mostNext(pqsTflgasses);
@@ -263,20 +387,24 @@ public class PqsTransformerServiceImpl extends ServiceImpl<PqsTransformerMapper,
 
                 //下节点id
                 List<String> downIDs = pqsTflgasses.stream().map(PqsTflgass::getLogicNext).collect(Collectors.toList());
-                List<TerminalTree> downVOList = downVoltage.stream().filter(x -> !downIDs.contains(x.getId())).collect(Collectors.toList());
 
-                if (ObjectUtil.isNotNull(one)) {
+                List<TerminalTree> downVOList = downVoltage.stream().filter(x -> !downIDs.contains(x.getId())).collect(Collectors.toList());
-                    TerminalTree beforeTree = addTree(one.getLogicBefore());
+                if (not.size() == 1) {
-                    TerminalTree nextTree = addTree(one.getLogicNext());
+                    List<String> logicBefore = pqsTflgasses.stream().map(PqsTflgass::getLogicBefore).collect(Collectors.toList());
-                    upVOList.add(beforeTree);
+                    downVOList = downVOList.stream().filter(x -> !logicBefore.contains(x.getId())).collect(Collectors.toList());
-                    downVOList.add(nextTree);
                 }
                 List<TerminalTree> upList = TreedChildren(upVOList, "变压器上节点设备树", subId);
                 voltage.put("upNode", upList);
                 List<TerminalTree> downList = TreedChildren(downVOList, "变压器下节点设备树", subId);
                 voltage.put("downNode", downList);
-                return voltage;
+            }
-            } else {
+
+            /**
+             * 跨
+             *  1.当母线小于2条跨
+             *  2.当所有母线都绑定为跨
+             */
+            else {
                 //查询所有变电站下母线信息
                 List<TerminalTree> upVoltage = lineMapper.getvoltage(subId, 0);
                 if (merge.size() == ids.size()) {
@@ -284,304 +412,231 @@ public class PqsTransformerServiceImpl extends ServiceImpl<PqsTransformerMapper,
                     downVoltage = downVoltage.stream().filter(x -> x.getId().equals(s)).collect(Collectors.toList());
 
                 }
-                if (ObjectUtil.isNotNull(one)) {
+                //下节点id
-                    TerminalTree beforeTree = addTree(one.getLogicBefore());
+                List<String> downIDs = pqsTflgasses.stream().map(PqsTflgass::getLogicNext).collect(Collectors.toList());
-                    TerminalTree nextTree = addTree(one.getLogicNext());
+                List<TerminalTree> downVOList = downVoltage.stream().filter(x -> !downIDs.contains(x.getId())).collect(Collectors.toList());
-                    upVoltage = upVoltage.stream().filter(x -> !x.getId().equals(beforeTree.getId())).collect(Collectors.toList());
-                    upVoltage.add(beforeTree);
 
-                    downVoltage.clear();
-                    downVoltage.add(nextTree);
-                }
                 List<TerminalTree> upList = TreedChildren(upVoltage, "变压器上节点设备树", null);
                 voltage.put("upNode", upList);
-                List<TerminalTree> downList = TreedChildren(downVoltage, "变压器下节点设备树", subId);
+                List<TerminalTree> downList = TreedChildren(downVOList, "变压器下节点设备树", subId);
                 voltage.put("downNode", downList);
                 return voltage;
             }
+        }
+    }
+    return voltage;
+}
 
+
+@Override
+public List<TerminalTree> getTransformerTree() {
+    List<TerminalTree> terminalTrees = this.baseMapper.listTransformer();
+    return TreedChildren(terminalTrees, "变压器设备树", null);
+}
+
+@Override
+public List<EntityLogicDTO> getLogic() {
+    return pqsTflgassMapper.getLogic();
+}
+
+/**
+ * 获取全部子节点
+ *
+ * @author cdf
+ * @date 2021/7/19
+ */
+public List<TerminalTree> getChildren(TerminalTree item, List<TerminalTree> all) {
+    return all.stream().filter(allItem -> allItem.getPid().equals(item.getId())).collect(Collectors.toList());
+}
+
+/**
+ * 初始化设备树
+ *
+ * @param children 子节点
+ * @param name     节点名称
+ * @param subId    不为空则只展示，当前变电站节点的信息，为空则展示所有信息
+ * @return
+ */
+public List<TerminalTree> TreedChildren(List<TerminalTree> children, String name, String subId) {
+    List<TerminalTree> taiZhang = new ArrayList<>();
+    List<TerminalTree> allList = lineMapper.getAllList();
+
+    List<TerminalTree> gdList;
+    List<TerminalTree> subList;
+    List<TerminalTree> provinceList;
+    if (StrUtil.isBlank(subId)) {
+        subList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.SUB_LEVEL.getCode())).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
+        gdList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.GD_LEVEL.getCode())).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
+        provinceList = lineMapper.getProvinceList(null, 0);
+    } else {
+        subList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.SUB_LEVEL.getCode())
+                && item.getId().equals(subId)
+        ).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
+        gdList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.GD_LEVEL.getCode())
+                && item.getId().equals(subList.get(0).getPid())
+        ).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
+        provinceList = lineMapper.getProvinceList(Arrays.asList(gdList.get(0).getPid()), 1);
+    }
+    List<TerminalTree> terminal = children.stream().sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
+
+    subList.forEach(sub -> sub.setChildren(getChildren(sub, terminal)));
+    gdList.forEach(gd -> gd.setChildren(getChildren(gd, subList)));
+    provinceList.forEach(province -> province.setChildren(getChildren(province, gdList)));
+
+    if (CollectionUtil.isNotEmpty(allList)) {
+        TerminalTree terminalTree = new TerminalTree();
+        terminalTree.setId("9999999");
+        terminalTree.setLevel(0);
+        terminalTree.setName(name);
+        if (CollectionUtil.isNotEmpty(provinceList)) {
+            terminalTree.setChildren(provinceList);
+        }
+        taiZhang.add(terminalTree);
+    }
+    return taiZhang;
+}
+
+/**
+ * 查找最顶层节点信息
+ *
+ * @param pqsTflgasses
+ * @return
+ */
+private static String mostBefore(List<PqsTflgass> pqsTflgasses) {
+    String logicBefore = null;
+    for (PqsTflgass pqsTflgass : pqsTflgasses) {
+        //根据获取的的上节点判断是否存在，这上节点是否是尾节点
+        if (ObjectUtil.isNull(logicBefore)) {
+            logicBefore = pqsTflgass.getLogicBefore();
         } else {
-            //判断是否已经全部绑定
+            while (true) {
-            String chain = chain(pqsTflgasses);
+                for (int i1 = 0; i1 < pqsTflgasses.size(); i1++) {
-            String chain2 = chain2(pqsTflgasses);
+                    String logicNext = pqsTflgasses.get(i1).getLogicNext();
-            if (StrUtil.isNotBlank(chain) && not.size() == 0&& pqsTflgasses.size()+1!=ids.size()&&straddleList.size()==0
+                    if (logicBefore.equals(logicNext)) {
-                    || StrUtil.isNotBlank(chain2) && not.size() == 0&& pqsTflgasses.size()+1!=ids.size()&&straddleList.size()==0) {
+                        logicBefore = pqsTflgasses.get(i1).getLogicBefore();
-                List<String> logicBefore = pqsTflgasses.stream().map(PqsTflgass::getLogicBefore).collect(Collectors.toList());
+                        break;
-                List<String> logicNext = pqsTflgasses.stream().map(PqsTflgass::getLogicNext).collect(Collectors.toList());
-                List<TerminalTree> up = downVoltage.stream().filter(x -> !logicBefore.contains(x.getId())).collect(Collectors.toList());
-                List<TerminalTree> upList = TreedChildren(up, "变压器上节点设备树", subId);
-                voltage.put("upNode", upList);
-
-                List<TerminalTree> down = downVoltage.stream().filter(x -> !logicNext.contains(x.getId())).collect(Collectors.toList());
-                List<TerminalTree> downList = TreedChildren(down, "变压器下节点设备树", subId);
-                voltage.put("downNode", downList);
-                return voltage;
-            } else {
-                if (downVoltage.size() > 1 && straddleList.size() == 0 && bindList.size() != ids.size()
-                        || straddleList.size() > 0 && not.size() > 0
-
-                ) {
-                    List<TerminalTree> upVOList;
-                    if (straddleList.size() > 0 && not.size() > 0) {
-                        String s = mostNext(pqsTflgasses);
-                        upVOList = downVoltage.stream().filter(x -> s.equals(x.getId())).collect(Collectors.toList());
                     } else {
-                        //上节点id
+                        if (i1 == pqsTflgasses.size()) {
-                        List<String> upIDs = pqsTflgasses.stream().map(PqsTflgass::getLogicBefore).collect(Collectors.toList());
+                            break;
-                        upVOList = downVoltage.stream().filter(x -> !upIDs.contains(x.getId())).collect(Collectors.toList());
+                        }
                     }
-
-                    //下节点id
-                    List<String> downIDs = pqsTflgasses.stream().map(PqsTflgass::getLogicNext).collect(Collectors.toList());
-
-                    List<TerminalTree> downVOList = downVoltage.stream().filter(x -> !downIDs.contains(x.getId())).collect(Collectors.toList());
-                    if(not.size() ==1){
-                        List<String> logicBefore = pqsTflgasses.stream().map(PqsTflgass::getLogicBefore).collect(Collectors.toList());
-                         downVOList = downVOList.stream().filter(x -> !logicBefore.contains(x.getId())).collect(Collectors.toList());
-                    }
-                    List<TerminalTree> upList = TreedChildren(upVOList, "变压器上节点设备树", subId);
-                    voltage.put("upNode", upList);
-                    List<TerminalTree> downList = TreedChildren(downVOList, "变压器下节点设备树", subId);
-                    voltage.put("downNode", downList);
-                }
-
-                /**
-                 * 跨
-                 *  1.当母线小于2条跨
-                 *  2.当所有母线都绑定为跨
-                 */
-                else {
-                    //查询所有变电站下母线信息
-                    List<TerminalTree> upVoltage = lineMapper.getvoltage(subId, 0);
-                    if (merge.size() == ids.size()) {
-                        String s = mostBefore(pqsTflgasses);
-                        downVoltage = downVoltage.stream().filter(x -> x.getId().equals(s)).collect(Collectors.toList());
-
-                    }
-                    //下节点id
-                    List<String> downIDs = pqsTflgasses.stream().map(PqsTflgass::getLogicNext).collect(Collectors.toList());
-                    List<TerminalTree> downVOList = downVoltage.stream().filter(x -> !downIDs.contains(x.getId())).collect(Collectors.toList());
-
-                    List<TerminalTree> upList = TreedChildren(upVoltage, "变压器上节点设备树", null);
-                    voltage.put("upNode", upList);
-                    List<TerminalTree> downList = TreedChildren(downVOList, "变压器下节点设备树", subId);
-                    voltage.put("downNode", downList);
-                    return voltage;
                 }
+                break;
             }
         }
-        return voltage;
     }
+    return logicBefore;
+}
 
-    @Override
+/**
-    public List<TerminalTree> getTransformerTree() {
+ * 查找最底层节点信息
-        List<TerminalTree> terminalTrees = this.baseMapper.listTransformer();
+ *
-        return TreedChildren(terminalTrees, "变压器设备树", null);
+ * @param pqsTflgasses
-    }
+ * @return
-
+ */
-    @Override
+private static String mostNext(List<PqsTflgass> pqsTflgasses) {
-    public List<EntityLogicDTO> getLogic() {
+    String logicNext = null;
-       return pqsTflgassMapper.getLogic();
+    for (PqsTflgass pqsTflgass : pqsTflgasses) {
-    }
+        //根据获取的的上节点判断是否存在，这上节点是否是尾节点
-
+        if (ObjectUtil.isNull(logicNext)) {
-    /**
+            logicNext = pqsTflgass.getLogicNext();
-     * 获取全部子节点
-     *
-     * @author cdf
-     * @date 2021/7/19
-     */
-    public List<TerminalTree> getChildren(TerminalTree item, List<TerminalTree> all) {
-        return all.stream().filter(allItem -> allItem.getPid().equals(item.getId())).collect(Collectors.toList());
-    }
-
-    /**
-     * 初始化设备树
-     *
-     * @param children 子节点
-     * @param name     节点名称
-     * @param subId    不为空则只展示，当前变电站节点的信息，为空则展示所有信息
-     * @return
-     */
-    public List<TerminalTree> TreedChildren(List<TerminalTree> children, String name, String subId) {
-        List<TerminalTree> taiZhang = new ArrayList<>();
-        List<TerminalTree> allList = lineMapper.getAllList();
-
-        List<TerminalTree> gdList;
-        List<TerminalTree> subList;
-        List<TerminalTree> provinceList;
-        if (StrUtil.isBlank(subId)) {
-            subList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.SUB_LEVEL.getCode())).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
-            gdList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.GD_LEVEL.getCode())).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
-            provinceList = lineMapper.getProvinceList(null, 0);
         } else {
-            subList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.SUB_LEVEL.getCode())
+            while (true) {
-                    && item.getId().equals(subId)
+                for (int i1 = 0; i1 < pqsTflgasses.size(); i1++) {
-            ).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
+                    String logicBefore = pqsTflgasses.get(i1).getLogicBefore();
-            gdList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.GD_LEVEL.getCode())
+                    if (logicNext.equals(logicBefore)) {
-                    && item.getId().equals(subList.get(0).getPid())
+                        logicNext = pqsTflgasses.get(i1).getLogicNext();
-            ).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
+                        break;
-            provinceList = lineMapper.getProvinceList(Arrays.asList(gdList.get(0).getPid()), 1);
+                    } else {
-        }
+                        if (i1 == pqsTflgasses.size()) {
-        List<TerminalTree> terminal = children.stream().sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
-
-        subList.forEach(sub -> sub.setChildren(getChildren(sub, terminal)));
-        gdList.forEach(gd -> gd.setChildren(getChildren(gd, subList)));
-        provinceList.forEach(province -> province.setChildren(getChildren(province, gdList)));
-
-        if (CollectionUtil.isNotEmpty(allList)) {
-            TerminalTree terminalTree = new TerminalTree();
-            terminalTree.setId("9999999");
-            terminalTree.setLevel(0);
-            terminalTree.setName(name);
-            if (CollectionUtil.isNotEmpty(provinceList)) {
-                terminalTree.setChildren(provinceList);
-            }
-            taiZhang.add(terminalTree);
-        }
-        return taiZhang;
-    }
-
-    /**
-     * 查找最顶层节点信息
-     *
-     * @param pqsTflgasses
-     * @return
-     */
-    private static String mostBefore(List<PqsTflgass> pqsTflgasses) {
-        String logicBefore = null;
-        for (PqsTflgass pqsTflgass : pqsTflgasses) {
-            //根据获取的的上节点判断是否存在，这上节点是否是尾节点
-            if (ObjectUtil.isNull(logicBefore)) {
-                logicBefore = pqsTflgass.getLogicBefore();
-            } else {
-                while (true) {
-                    for (int i1 = 0; i1 < pqsTflgasses.size(); i1++) {
-                        String logicNext = pqsTflgasses.get(i1).getLogicNext();
-                        if (logicBefore.equals(logicNext)) {
-                            logicBefore = pqsTflgasses.get(i1).getLogicBefore();
                             break;
-                        } else {
-                            if (i1 == pqsTflgasses.size()) {
-                                break;
-                            }
                         }
                     }
-                    break;
                 }
+                break;
             }
         }
-        return logicBefore;
     }
+    return logicNext;
+}
 
-    /**
+/**
-     * 查找最底层节点信息
+ * 判断是否已经成为链行
-     *
+ *
-     * @param pqsTflgasses
+ * @param pqsTflgasses
-     * @return
+ * @return
-     */
+ */
-    private static String mostNext(List<PqsTflgass> pqsTflgasses) {
+private static String chain(List<PqsTflgass> pqsTflgasses) {
-        String logicNext = null;
+    if (pqsTflgasses.size() < 2) {
-        for (PqsTflgass pqsTflgass : pqsTflgasses) {
+        return null;
-            //根据获取的的上节点判断是否存在，这上节点是否是尾节点
+    }
-            if (ObjectUtil.isNull(logicNext)) {
+    String logicNext = null;
-                logicNext = pqsTflgass.getLogicNext();
+    for (PqsTflgass pqsTflgass : pqsTflgasses) {
-            } else {
+        //根据获取的的下节点判断是否存在，这下节点是否是首节点
-                while (true) {
+        if (ObjectUtil.isNull(logicNext)) {
-                    for (int i1 = 0; i1 < pqsTflgasses.size(); i1++) {
+            logicNext = pqsTflgass.getLogicNext();
-                        String logicBefore = pqsTflgasses.get(i1).getLogicBefore();
+        } else {
-                        if (logicNext.equals(logicBefore)) {
+            while (true) {
-                            logicNext = pqsTflgasses.get(i1).getLogicNext();
+                for (int i1 = 0; i1 < pqsTflgasses.size(); i1++) {
-                            break;
+                    String logicBefore = pqsTflgasses.get(i1).getLogicBefore();
-                        } else {
+                    if (logicNext.equals(logicBefore)) {
-                            if (i1 == pqsTflgasses.size()) {
+                        logicNext = pqsTflgasses.get(i1).getLogicNext();
-                                break;
+                        break;
-                            }
+                    } else {
+                        if (i1 == pqsTflgasses.size() - 1) {
+                            return logicNext;
                         }
                     }
-                    break;
                 }
+                break;
             }
-        }
-        return logicNext;
-    }
 
-    /**
-     * 判断是否已经成为链行
-     *
-     * @param pqsTflgasses
-     * @return
-     */
-    private static String chain(List<PqsTflgass> pqsTflgasses) {
-        if(pqsTflgasses.size()<2){
-            return null;
         }
-        String logicNext = null;
+    }
-        for (PqsTflgass pqsTflgass : pqsTflgasses) {
+    return logicNext;
-            //根据获取的的下节点判断是否存在，这下节点是否是首节点
+}
-            if (ObjectUtil.isNull(logicNext)) {
+
-                logicNext = pqsTflgass.getLogicNext();
+private static String chain2(List<PqsTflgass> pqsTflgasses) {
-            } else {
+    if (pqsTflgasses.size() < 2) {
-                while (true) {
+        return null;
-                    for (int i1 = 0; i1 < pqsTflgasses.size(); i1++) {
+    }
-                        String logicBefore = pqsTflgasses.get(i1).getLogicBefore();
+    String logicBefore = null;
-                        if (logicNext.equals(logicBefore)) {
+    for (PqsTflgass pqsTflgass : pqsTflgasses) {
-                            logicNext = pqsTflgasses.get(i1).getLogicNext();
+        //根据获取的的下节点判断是否存在，这下节点是否是首节点
-                            break;
+        if (ObjectUtil.isNull(logicBefore)) {
-                        } else {
+            logicBefore = pqsTflgass.getLogicBefore();
-                            if (i1 == pqsTflgasses.size() - 1) {
+        } else {
-                                return logicNext;
+            while (true) {
-                            }
+                for (int i1 = 0; i1 < pqsTflgasses.size(); i1++) {
+                    String logicNext = pqsTflgasses.get(i1).getLogicNext();
+                    if (logicBefore.equals(logicNext)) {
+                        logicBefore = pqsTflgasses.get(i1).getLogicBefore();
+                        break;
+                    } else {
+                        if (i1 == pqsTflgasses.size() - 1) {
+                            return logicBefore;
                         }
                     }
-                    break;
                 }
-
+                break;
             }
-        }
-        return logicNext;
-    }
 
-    private static String chain2(List<PqsTflgass> pqsTflgasses) {
-        if(pqsTflgasses.size()<2){
-            return null;
         }
-        String logicBefore = null;
-        for (PqsTflgass pqsTflgass : pqsTflgasses) {
-            //根据获取的的下节点判断是否存在，这下节点是否是首节点
-            if (ObjectUtil.isNull(logicBefore)) {
-                logicBefore = pqsTflgass.getLogicBefore();
-            } else {
-                while (true) {
-                    for (int i1 = 0; i1 < pqsTflgasses.size(); i1++) {
-                        String logicNext = pqsTflgasses.get(i1).getLogicNext();
-                        if (logicBefore.equals(logicNext)) {
-                            logicBefore = pqsTflgasses.get(i1).getLogicBefore();
-                            break;
-                        } else {
-                            if (i1 == pqsTflgasses.size() - 1) {
-                                return logicBefore;
-                            }
-                        }
-                    }
-                    break;
-                }
-
-            }
-        }
-        return logicBefore;
     }
+    return logicBefore;
+}
 
-    /**
+/**
-     * 根据母线获取信息
+ * 根据母线获取信息
-     *
+ *
-     * @param id
+ * @param id
-     * @return
+ * @return
-     */
+ */
-    public TerminalTree addTree(String id) {
+public TerminalTree addTree(String id) {
-        List<TerminalTree> getvoltage = lineMapper.getvoltage(id, 2);
+    List<TerminalTree> getvoltage = lineMapper.getvoltage(id, 2);
-        getvoltage.get(0).setLevel(5);
+    getvoltage.get(0).setLevel(5);
-        return getvoltage.get(0);
+    return getvoltage.get(0);
-    }
+}
 
 
 

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.line.mapper.LineDetailMapper;
-import com.njcn.device.pq.mapper.LineMapper;
+import com.njcn.device.line.mapper.LineMapper;
-import com.njcn.device.pq.mapper.RStatIntegrityDMapper;
 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;
@@ -134,11 +133,6 @@ public class RunManageServiceImpl implements RunManageService {
         DeviceInfoParam deviceInfoParam = new DeviceInfoParam();
         BeanUtil.copyProperties(runManageParam, deviceInfoParam);
         deviceInfoParam.setServerName("pqs-common");
-        if(CollUtil.isNotEmpty(runManageParam.getRunFlag())){
-            if(runManageParam.getRunFlag().get(0)==0){
-                deviceInfoParam.setLineRunFlag(0);
-            }
-        }
         List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, runManageParam.getRunFlag(), Stream.of(1).collect(Collectors.toList()));
         if (CollectionUtils.isEmpty(generalDeviceDTOList)) {
             throw new BusinessException("当前部门没有装置台账");

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

@@ -3,16 +3,18 @@ package com.njcn.device.pq.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 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 +27,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;
@@ -138,7 +139,12 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
 
     private List<TerminalTree> specialDealSubChildren(TerminalTree sub,List<TerminalTree> lineUserList,List<TerminalTree> devOtherList,List<TerminalTree> busBarList,List<TerminalTree> devAllList,List<UserLedgerVO> userReportPOList){
         List<TerminalTree> list = new ArrayList<>();
-
+        //电网侧
+        List<TerminalTree> devTree = devOtherList.stream().filter(it->it.getPid().equals(sub.getId())).collect(Collectors.toList());
+        if(CollectionUtil.isNotEmpty(devTree)){
+            list.addAll(devTree);
+        }
+        //非电网侧
         if(CollUtil.isNotEmpty(userReportPOList)) {
             Map<String, UserLedgerVO> userLedgerVOMap = userReportPOList.stream().collect(Collectors.toMap(UserLedgerVO::getId, Function.identity()));
 
@@ -160,6 +166,7 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
                     busCopy.setName(it.getName());
                     busCopy.setId(it.getId());
                     busCopy.setPid(it.getPid());
+                    busCopy.setSort(it.getSort());
                     busCopy.setChildren(getChildren(it, lineList));
                     busCopy.setPowerFlag(1);
                     busCopy.setLevel(LineBaseEnum.SUB_V_LEVEL.getCode());
@@ -175,6 +182,7 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
                     devCopy.setName(it.getName());
                     devCopy.setId(it.getId());
                     devCopy.setPid(it.getPid());
+                    devCopy.setSort(it.getSort());
                     devCopy.setChildren(getChildren(it, temBus));
                     devCopy.setPowerFlag(1);
                     devCopy.setLevel(LineBaseEnum.DEVICE_LEVEL.getCode());
@@ -192,18 +200,11 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
                 terminalTree.setPowerFlag(1);
                 terminalTree.setLevel(LineBaseEnum.USER_LEVEL.getCode());
                 terminalTree.setChildren(temDevList);
+                terminalTree.setSort(0);
                 list.add(terminalTree);
             });
 
         }
-
-
-
-        List<TerminalTree> devTree = devOtherList.stream().filter(it->it.getPid().equals(sub.getId())).collect(Collectors.toList());
-        if(CollectionUtil.isNotEmpty(devTree)){
-            list.addAll(devTree);
-        }
-
         return list;
     }
 
@@ -521,6 +522,7 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
                 sub.setId(collect.get(0).getId());
                 sub.setName(collect.get(0).getName());
                 sub.setPid(collect.get(0).getPid());
+                sub.setSort(0);
                 sub.setChildren(valueList);
 
                 TerminalTree powerTree=new TerminalTree();
@@ -551,7 +553,7 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
                         sub.setId(child.getId());
                         sub.setName(child.getName());
                         sub.setPid(child.getPid());
-
+                        sub.setSort(0);
                         TerminalTree powerTree=new TerminalTree();
                         powerTree.setName("电网侧");
                         powerTree.setId(child.getId());
@@ -581,7 +583,7 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
                         sub.setId(child.getId());
                         sub.setName(child.getName());
                         sub.setPid(child.getPid());
-
+                        sub.setSort(0);
                         TerminalTree powerTree = new TerminalTree();
                         powerTree.setName("电网侧");
                         powerTree.setId(child.getId());
@@ -620,7 +622,7 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
                 sub.setId(notSub.getId());
                 sub.setName(notSub.getName());
                 sub.setPid(notSub.getPid());
-
+                sub.setSort(0);
                 TerminalTree powerTree = new TerminalTree();
                 powerTree.setId(notSub.getId());
                 powerTree.setName("电网侧");
@@ -655,6 +657,49 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
         return taiZhang;
     }
 
+    @Override
+    public List<TerminalTree> getJbNewTerminalTree() {
+        List<TerminalTree> allList = lineMapper.getAllList();
+        List<TerminalTree> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
+        List<TerminalTree> provinceList = lineMapper.getProvinceList(null, 0);
+
+        List<TerminalTree> gdList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.GD_LEVEL.getCode())).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
+        List<TerminalTree> subList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.SUB_LEVEL.getCode())).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
+        List<TerminalTree> devList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.DEVICE_LEVEL.getCode())).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
+        List<TerminalTree> subvList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.SUB_V_LEVEL.getCode())).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
+
+        List<TerminalTree> linepowerList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.LINE_LEVEL.getCode())&&item.getPowerFlag() != 1).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
+        List<TerminalTree> lineNotPowerList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.LINE_LEVEL.getCode())&&item.getPowerFlag() == 1).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
+
+
+
+        subvList.forEach(subv ->{
+                    if(CollUtil.isEmpty(subv.getChildren())){
+                        subv.setChildren(getRecursionChildren(subv, linepowerList));
+                    }
+                }
+            );
+
+        subvList.forEach(subv -> {
+                    if(CollUtil.isEmpty(subv.getChildren())){
+                        subv.setChildren(getRecursionChildren(subv, lineNotPowerList));
+                    }
+                }
+        );
+        subvList.stream().filter(x-> ObjUtil.isNull(x.getPowerFlag())).forEach(x->x.setPowerFlag(0));
+        devList.forEach(dev -> dev.setChildren(getRecursionChildren(dev, subvList)));
+        devList.stream().filter(x-> ObjUtil.isNull(x.getPowerFlag())).forEach(x->x.setPowerFlag(0));
+
+
+
+        subList.forEach(sub -> sub.setChildren(getRecursionChildrenCs(sub, devList)));
+        gdList.forEach(gd -> gd.setChildren(getChildren(gd, subList)));
+        provinceList.forEach(province -> province.setChildren(getChildren(province, gdList)));
+        projectList.forEach(project -> project.setChildren(getChildren(project, provinceList)));
+
+        return projectList;
+
+    }
 
     /**
      * 获取全部子节点
@@ -663,7 +708,40 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
      * @date 2021/7/19
      */
     public List<TerminalTree> getChildren(TerminalTree item, List<TerminalTree> all) {
-        return all.stream().filter(allItem -> allItem.getPid().equals(item.getId())).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
+        List<TerminalTree> collect = all.stream().filter(allItem -> allItem.getPid().equals(item.getId())).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
+        if(CollUtil.isNotEmpty(collect)){
+            long sortSize = collect.stream().filter(x->ObjUtil.isNotNull(x.getSort())).filter(x -> x.getSort() == 0).count();
+            if(collect.size()-sortSize/collect.size()>50){
+                collect.sort(Comparator.comparing(x->x.getName()));
+            }
+        }
+        return collect;
+    }
+
+    public List<TerminalTree> getRecursionChildrenCs(TerminalTree item, List<TerminalTree> all){
+        List<TerminalTree> collect = all.stream().filter(allItem -> allItem.getPid().equals(item.getId())).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
+        List<TerminalTree> list=new ArrayList<>();
+        TerminalTree power=new TerminalTree();
+        power.setName("电网侧");
+        power.setSort(0);
+        power.setChildren(collect.stream().filter(x -> 1 != x.getPowerFlag()).collect(Collectors.toList()));
+        list.add(power);
+
+
+
+        TerminalTree notPower=new TerminalTree();
+        notPower.setName("非电网侧");
+        notPower.setSort(1);
+        notPower.setChildren(collect.stream().filter(x -> 1 == x.getPowerFlag()).collect(Collectors.toList()));
+        list.add(notPower);
+        return list;
+    }
+    public List<TerminalTree> getRecursionChildren(TerminalTree item, List<TerminalTree> all){
+        List<TerminalTree> list = all.stream().filter(allItem -> allItem.getPid().equals(item.getId())).sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList());
+        if(CollUtil.isNotEmpty(list)){
+            item.setPowerFlag(list.get(0).getPowerFlag());
+        }
+        return list;
     }
 
     /**

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/mapper/onlinerate/OnLineRateMapper.java

@@ -0,0 +1,31 @@
+package com.njcn.device.common.mapper.onlinerate;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pq.pojo.param.OnlineRateParam;
+import com.njcn.device.pq.pojo.po.RStatOnlinerateD;
+import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 在线率日表 Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2023-03-28
+ */
+public interface OnLineRateMapper extends BaseMapper<RStatOnlinerateD> {
+
+    /***
+     * 获取设备在线率
+     * @author wr
+     * @date 2023-04-03 10:10
+     * @param param
+     * @return List<OnlineRate>
+     */
+    List<RStatOnlinerateVO> getOnlineRateByDevIds(@Param("param") OnlineRateParam param);
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/mapper/onlinerate/mapping/OnLineRateMapper.xml

@@ -0,0 +1,50 @@
+<?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.common.mapper.onlinerate.OnLineRateMapper">
+    <select id="getOnlineRateByDevIds" resultType="com.njcn.device.pq.pojo.vo.RStatOnlinerateVO">
+        select
+        dev_index,
+        sum(online_min) as onlineMin,
+        sum(offline_min) as offlineMin,
+        ROUND( sum(online_min)*1.0/(sum(online_min) + sum(offline_min))*100,2) as onlineRate
+        from r_stat_onlinerate_d
+        <where>
+            <if test="param!=null and param.ids != null and param.ids.size > 0">
+                AND dev_index IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test=" param.startTime != null and param.startTime !=''">
+                AND  time_id >= #{param.startTime}
+            </if>
+            <if test="param.endTime != null and param.endTime != ''">
+                AND  time_id &lt;= #{param.endTime}
+            </if>
+        </where>
+        group by dev_index ;
+    </select>
+    <select id="getTotalOnlineRates" resultType="java.lang.Float">
+        select
+        if( sum( online_min )/( sum( online_min ) + sum( offline_min ))* 100 > 100,
+                    100,
+        IFNULL( ROUND( sum( online_min )/( sum( online_min ) + sum( offline_min ))* 100, 2 ), 0 ))
+           as online_rate
+        from r_stat_onlinerate_d
+        <where>
+            <if test="param!=null and param.ids != null and param.ids.size > 0">
+                AND dev_index IN
+                <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test=" param.startTime != null and param.startTime !=''">
+                AND  time_id >= #{param.startTime}
+            </if>
+            <if test="param.endTime != null and param.endTime != ''">
+                AND  time_id &lt;= #{param.endTime}
+            </if>
+        </where>
+
+    </select>
+</mapper>

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;
@@ -34,6 +34,7 @@ import com.njcn.system.pojo.enums.StatisticsEnum;
 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 com.njcn.web.utils.WebUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -66,11 +67,10 @@ public class GeneralDeviceService {
 
     private final DicDataFeignClient dicDataFeignClient;
 
-    private final RedisUtil redisUtil;
-
     private final DeviceMapper deviceMapper;
 
     private final LineMapper lineMapper;
+
     private final TopMsgMapper topMsgMapper;
 
 
@@ -409,7 +409,7 @@ public class GeneralDeviceService {
             return generalDeviceDTO;
         }
         // 提取该部门及其子部门所有监测点id
-        List<String> lineIds = deptLines.stream().map(DeptLine::getLineId).collect(Collectors.toList());
+        List<String> lineIds = deptLines.stream().map(DeptLine::getLineId).distinct().collect(Collectors.toList());
         // 获取line详细数据 ：根据监测点id，获取所有监测点 联查 pq_line、pq_line_detail
         List<Line> lines = terminalBaseService.getLineByCondition(lineIds, deviceInfoParam);
         // 返回空数据
@@ -418,17 +418,17 @@ public class GeneralDeviceService {
         }
 
         //1.筛选出母线id，理论上监测点的pids中第六个id为母线id 联查： pq_line t1 ,pq_voltage t2
-        List<String> voltageIds=lines.stream().map(Line::getPid).collect(Collectors.toList());
+        List<String> voltageIds=lines.stream().map(Line::getPid).distinct().collect(Collectors.toList());
         //再根据电压等级筛选合法母线信息
         List<Line> voltages = terminalBaseService.getVoltageByCondition(voltageIds, deviceInfoParam.getScale());
 
         //2.筛选出终端id，理论上监测点的pids中第五个id为终端id
-        List<String> devIds=voltages.stream().map(Line::getPid).collect(Collectors.toList());
+        List<String> devIds=voltages.stream().map(Line::getPid).distinct().collect(Collectors.toList());
         // 再根据终端条件筛选合法终端信息 联查：pq_line t1,pq_device t2
         List<Line> devices = terminalBaseService.getDeviceByCondition(devIds, deviceType, deviceInfoParam.getManufacturer());
 
         //3.筛选出变电站id，理论上监测点的pids中第四个id为变电站id 联查： pq_line t1 ,pq_substation t2
-        List<String> subIds=devices.stream().map(Line::getPid).collect(Collectors.toList());
+        List<String> subIds=devices.stream().map(Line::getPid).distinct().collect(Collectors.toList());
         List<Line> sub = terminalBaseService.getSubByCondition(subIds, new ArrayList<>());
 
         //筛选最终的数据
@@ -797,12 +797,25 @@ public class GeneralDeviceService {
         List<DictData> gradeType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_GRADE.getCode()).getData();
         Map<String, Integer> gradeMap = gradeType.stream().collect(Collectors.toMap(DictData::getId, DictData::getAlgoDescribe));
 
+        List<DictData> manufacturerList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_MANUFACTURER.getCode()).getData();
+        Map<String, String> manufacturerMap = manufacturerList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName));
+
+        List<Dept> deptList = deptFeignClient.getAllDept().getData();
+        Map<String, String> deptMap = deptList.stream().collect(Collectors.toMap(Dept::getId, Dept::getName));
         List<DevDetail> devDetails = deviceMapper.selectDevByIds(devIds);
         for (DevDetail devDetail : devDetails) {
             //终端等级
             if(gradeMap.containsKey(devDetail.getLineGrade())){
                 devDetail.setLineGrade(String.valueOf(gradeMap.get(devDetail.getLineGrade())));
             }
+            //部门
+            if(deptMap.containsKey(devDetail.getDeptName())){
+                devDetail.setDeptName(deptMap.get(devDetail.getDeptName()));
+            }
+            //终端厂商
+            if(manufacturerMap.containsKey(devDetail.getManufacturer())){
+                devDetail.setManufacturer(manufacturerMap.get(devDetail.getManufacturer()));
+            }
         }
         return devDetails;
     }

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/OnLineRateController.java

@@ -0,0 +1,46 @@
+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.OnLineRateService;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.vo.common.DeviceOnlineRate;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+
+
+/**
+ * @Description: 终端在线率
+ * @Author: wr
+ * @Date: 2025/11/26 10:28
+ */
+@Slf4j
+@Api(tags = "终端在线率")
+@RestController
+@RequestMapping("/onLineRate")
+@RequiredArgsConstructor
+public class OnLineRateController extends BaseController {
+
+    private final OnLineRateService onLineRateService;
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/deviceOnlineRateInfo")
+    @ApiOperation("终端在线率列表(冀北)")
+    public HttpResult<DeviceOnlineRate> deviceOnlineRateInfo(@RequestBody DeviceInfoParam.BusinessParam deviceInfoParam) {
+        String methodDescribe = getMethodDescribe("deviceOnlineRateInfo");
+        DeviceOnlineRate rate = onLineRateService.deviceOnlineRateInfo(deviceInfoParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rate, methodDescribe);
+    }
+
+}
+

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">
@@ -121,9 +121,9 @@
         </if>
         <if test="searchValue != '' and searchValue != null ">
             <bind name="searchValueLike" value="'%'+searchValue+'%'"/>
-            AND sub.NAME LIKE #{searchValueLike}
+            AND (sub.NAME LIKE #{searchValueLike}
             OR dev.name LIKE #{searchValueLike}
-            OR line.NAME LIKE #{searchValueLike}
+            OR line.NAME LIKE #{searchValueLike})
         </if>
         ORDER BY
         gdName,
@@ -229,6 +229,7 @@
     <select id="selectDevByIds" resultType="com.njcn.device.pq.pojo.vo.DevDetail">
         SELECT DISTINCT
             device.id as devIndex,
+            pd.Id  as deptName,
             gd.NAME as gdName,
             substation.NAME as bdzName,
             device.NAME as devName,
@@ -236,9 +237,12 @@
             deviceDetail.Update_Time AS timeID,
             deviceDetail.ip as ip,
             deviceDetail.Com_Flag as comFlag,
+            deviceDetail.run_Flag as runFlag,
+            deviceDetail.Manufacturer as manufacturer,
             deviceDetail.Next_Time_Check as nextTimeCheck
         FROM
             pq_line line,
+            pq_dept_line pd,
             pq_line voltage,
             pq_line device,
             pq_line substation,
@@ -253,6 +257,7 @@
                 </foreach>
             </if>
             AND line.pid = voltage.id
+            AND line.id = pd.Line_Id
             AND voltage.pid = device.id
             AND device.pid = substation.id
             AND substation.pid = gd.id
@@ -364,6 +369,7 @@
         deviceDetail.login_Time AS loginTime,
         deviceDetail.id deviceId,
         pv.scale lineVoltage,
+        pqsub.scale subVoltage,
         lineDetail.monitor_id monitorId
         FROM
         pq_line line,
@@ -372,6 +378,7 @@
         pq_line device,
         pq_device deviceDetail,
         pq_line substation,
+        pq_substation pqsub,
         pq_line gdinfo,
         pq_voltage pv
         WHERE line.id in
@@ -384,6 +391,7 @@
         AND device.id = deviceDetail.id
         AND device.pid = substation.id
         AND substation.pid = gdinfo.id
+        AND substation.id = pqsub.id
         AND subv.id = pv.id
     </select>
 

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/OnLineRateService.java

@@ -0,0 +1,21 @@
+package com.njcn.device.device.service;
+
+
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.vo.common.DeviceOnlineRate;
+
+/**
+ * @Description: 终端在线率
+ * @Author: wr
+ * @Date: 2025/11/26 10:27
+ */
+public interface OnLineRateService {
+
+
+    /**
+     * 终端详情列表
+     * @param deviceInfoParam
+     * @return
+     */
+    DeviceOnlineRate  deviceOnlineRateInfo(DeviceInfoParam.BusinessParam deviceInfoParam);
+}

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;