From 319120d0488269d27df9aed7a523aabc4f5dec20 Mon Sep 17 00:00:00 2001
From: zhangbaojian <1065122561@qq.com>
Date: Tue, 11 Apr 2023 15:14:48 +0800
Subject: [PATCH 01/10] =?UTF-8?q?zbj//1.=E6=9A=82=E9=99=8D=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E6=97=B6=E9=97=B4=E7=BB=9F=E8=AE=A1=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/majornetwork/Impl/LargeScreenServiceImpl.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java
index a1edeaf5d..35be5a530 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java
@@ -232,7 +232,12 @@ public class LargeScreenServiceImpl implements LargeScreenService {
             downTimeVO.setCount(resultMap.get(s));
             result.add(downTimeVO);
         }
-        return result;
+        //集合反向循环
+        List<DownTimeVO> list = new ArrayList<>();
+        for (int i = result.size() - 1; i >= 0; i--) {
+            list.add(result.get(i));
+        }
+        return list;
     }
 
     /**

From e50ec819ff6ea53c2afbfcb49ef354574c655875 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Tue, 11 Apr 2023 15:14:54 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pqs-gateway/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pqs-gateway/pom.xml b/pqs-gateway/pom.xml
index 68071219a..f1e2580c4 100644
--- a/pqs-gateway/pom.xml
+++ b/pqs-gateway/pom.xml
@@ -21,6 +21,12 @@
             <groupId>com.njcn</groupId>
             <artifactId>common-core</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-to-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>

From 5092a3520505f912ef4f3c8edaf4deb8d4e41c59 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Tue, 11 Apr 2023 15:20:08 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pqs-gateway/pom.xml | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pqs-gateway/pom.xml b/pqs-gateway/pom.xml
index f1e2580c4..6b2d0fb14 100644
--- a/pqs-gateway/pom.xml
+++ b/pqs-gateway/pom.xml
@@ -21,12 +21,12 @@
             <groupId>com.njcn</groupId>
             <artifactId>common-core</artifactId>
             <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.logging.log4j</groupId>
-                    <artifactId>log4j-to-slf4j</artifactId>
-                </exclusion>
-            </exclusions>
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.apache.logging.log4j</groupId>-->
+<!--                    <artifactId>log4j-to-slf4j</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
@@ -41,6 +41,12 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-gateway</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- Sentinel流量控制、熔断降级 -->
         <dependency>
@@ -74,6 +80,12 @@
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-spring-boot-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

From f0a6a3f64765ade29ac28a7a5e5d7507ada560a3 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Tue, 11 Apr 2023 15:24:23 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pqs-gateway/pom.xml | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/pqs-gateway/pom.xml b/pqs-gateway/pom.xml
index 6b2d0fb14..0f5e5ad48 100644
--- a/pqs-gateway/pom.xml
+++ b/pqs-gateway/pom.xml
@@ -21,12 +21,12 @@
             <groupId>com.njcn</groupId>
             <artifactId>common-core</artifactId>
             <version>${project.version}</version>
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <groupId>org.apache.logging.log4j</groupId>-->
-<!--                    <artifactId>log4j-to-slf4j</artifactId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
@@ -52,15 +52,33 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-alibaba-sentinel-gateway</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>com.alibaba.csp</groupId>
             <artifactId>sentinel-datasource-nacos</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- OAuth2资源服务器-->
@@ -75,6 +93,12 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-oauth2-jose</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- Api文档 -->
         <dependency>

From b85b20aa76a54e80d250ce1bf1fe0801579eac9a Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Tue, 11 Apr 2023 15:28:39 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../algorithm/api/DevModelFeignClient.java    | 28 ++++++++++
 .../DevModelFeignClientFallbackFactory.java   | 52 +++++++++++++++++++
 .../prepare/harmonic/utils/PublicUtil.java    |  1 +
 3 files changed, 81 insertions(+)
 create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/DevModelFeignClient.java
 create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/fallback/DevModelFeignClientFallbackFactory.java

diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/DevModelFeignClient.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/DevModelFeignClient.java
new file mode 100644
index 000000000..1896efdc7
--- /dev/null
+++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/DevModelFeignClient.java
@@ -0,0 +1,28 @@
+package com.njcn.algorithm.api;
+
+import com.njcn.algorithm.api.fallback.DevModelFeignClientFallbackFactory;
+import com.njcn.algorithm.pojo.param.CsDevModelAddParm;
+import com.njcn.algorithm.pojo.param.CsDevModelQueryListParm;
+import com.njcn.algorithm.pojo.vo.CsDevModelPageVO;
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.ALGORITHM_BOOT, path = "/devmodel", fallbackFactory = DevModelFeignClientFallbackFactory.class,contextId = "devmodel")
+
+public interface DevModelFeignClient {
+
+    @PostMapping("/addDevModel")
+    HttpResult<Boolean> addDevModel(@RequestBody @Validated CsDevModelAddParm csDevModelAddParm);
+
+    @PostMapping("/queryEquipmentByProject")
+    HttpResult<List<CsDevModelPageVO>> queryEquipmentByProject(@RequestBody CsDevModelQueryListParm csDevModelQueryListParm);
+}
diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/fallback/DevModelFeignClientFallbackFactory.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/fallback/DevModelFeignClientFallbackFactory.java
new file mode 100644
index 000000000..09cd656d0
--- /dev/null
+++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/fallback/DevModelFeignClientFallbackFactory.java
@@ -0,0 +1,52 @@
+package com.njcn.algorithm.api.fallback;
+
+import com.njcn.algorithm.api.DevModelFeignClient;
+import com.njcn.algorithm.api.EquipmentFeignClient;
+import com.njcn.algorithm.pojo.param.CsDevModelAddParm;
+import com.njcn.algorithm.pojo.param.CsDevModelQueryListParm;
+import com.njcn.algorithm.pojo.vo.CsDevModelPageVO;
+import com.njcn.algorithm.pojo.vo.CsEquipmentDeliveryVO;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/4/10 20:09
+ */
+@Slf4j
+@Component
+public class DevModelFeignClientFallbackFactory implements FallbackFactory<DevModelFeignClient> {
+    @Override
+    public DevModelFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+//            exceptionEnum = UserEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new DevModelFeignClient() {
+
+            @Override
+            public HttpResult<Boolean> addDevModel(CsDevModelAddParm csDevModelAddParm) {
+                log.error("{}异常，降级处理，异常为：{}","新增装置模板版本信息",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<CsDevModelPageVO>> queryEquipmentByProject(CsDevModelQueryListParm csDevModelQueryListParm) {
+                log.error("{}异常，降级处理，异常为：{}","查询模板版本信息",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java
index 1c7e6e960..f81e01769 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java
@@ -120,6 +120,7 @@ public class PublicUtil {
             if(month>=10 && i>=10){
                 date = year +"-"+month+"-"+i;
             }
+            date = date + " 00:00:00";
             list.add(date);
         }
         return list;

From 4be7639a5788645703407d1ddc9cad2765205400 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Tue, 11 Apr 2023 15:35:26 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pqs-prepare/prepare-boot/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pqs-prepare/prepare-boot/pom.xml b/pqs-prepare/prepare-boot/pom.xml
index 493710416..b41c95056 100644
--- a/pqs-prepare/prepare-boot/pom.xml
+++ b/pqs-prepare/prepare-boot/pom.xml
@@ -28,6 +28,12 @@
             <groupId>com.njcn</groupId>
             <artifactId>common-core</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>

From 826778a2b82b03a42d173e5247748c21092cf435 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Tue, 11 Apr 2023 15:56:41 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/njcn/device/pq/pojo/po/RStatOnlinerateD.java | 2 +-
 .../main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java  | 1 -
 .../harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java | 3 ++-
 .../service/mysql/Impl/line/OnlineRateServiceImpl.java         | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatOnlinerateD.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatOnlinerateD.java
index 6380f4d05..9d354161a 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatOnlinerateD.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatOnlinerateD.java
@@ -19,7 +19,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_stat_onlinerate_d")
-public class RStatOnlinerateD extends BaseEntity {
+public class RStatOnlinerateD {
 
     private static final long serialVersionUID = 1L;
     @MppMultiId
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java
index f81e01769..1c7e6e960 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java
@@ -120,7 +120,6 @@ public class PublicUtil {
             if(month>=10 && i>=10){
                 date = year +"-"+month+"-"+i;
             }
-            date = date + " 00:00:00";
             list.add(date);
         }
         return list;
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java
index d30892348..debc71fbd 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java
@@ -85,7 +85,8 @@ public class IntegrityServiceImpl extends MppServiceImpl<RStatIntegrityDMapper,
     @Async("asyncExecutor")
     public void dataIntegrity(LineParam lineParam,String time) {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        LocalDateTime dateTime = LocalDateTime.parse(time,df);
+        String data = time + " 00:00:00";
+        LocalDateTime dateTime = LocalDateTime.parse(data,df);
         List<LineDetail> lineDetailList = new ArrayList<>();
         if (CollUtil.isEmpty(lineParam.getLineIds())){
             List<Overlimit> overLimitList = getAllLinesLimitData();
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/OnlineRateServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/OnlineRateServiceImpl.java
index 8b6b8271d..ed0573a3f 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/OnlineRateServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/OnlineRateServiceImpl.java
@@ -84,7 +84,8 @@ public class OnlineRateServiceImpl extends MppServiceImpl<RStatOnlineRateDMapper
     @Async("asyncExecutor")
     public void onlineRateData(LineParam lineParam,String time) {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        LocalDateTime dateTime = LocalDateTime.parse(time,df);
+        String data = time + " 00:00:00";
+        LocalDateTime dateTime = LocalDateTime.parse(data,df);
         List<String> lineIdList = lineParam.getLineIds();
         if (CollUtil.isEmpty(lineParam.getLineIds())){
             lineIdList = lineFeignClient.getDeviceList().getData();

From bedbebabc30f6f07253b337b23107236dd088d3a Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Tue, 11 Apr 2023 16:05:00 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=90=E6=B3=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/device/pq/mapper/mapping/DeviceMapper.xml | 10 ++++++++--
 .../pq/service/impl/TerminalTreeServiceImpl.java       |  9 ++++++++-
 .../harmonic/service/impl/THDistortionServiceImpl.java |  7 ++++---
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
index 043a32d6c..a37dc9b92 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
@@ -113,7 +113,11 @@
             OR dev.name LIKE #{searchValueLike}
             OR line.NAME LIKE #{searchValueLike}
         </if>
-        ORDER BY areaId.NAME
+        ORDER BY
+            gdName,
+            bdName,
+            devNAME,
+            objName;
     </select>
 
     <select id="getRunManageDevList" resultType="com.njcn.device.pq.pojo.vo.RunTimeVO">
@@ -184,7 +188,9 @@
             OR device.IP LIKE #{searchValueLike}
         </if>
         ORDER BY
-        areaId.NAME
+            gdName,
+            bdName,
+            devName;
     </select>
     <select id="getOnlineEvaluate" resultType="com.njcn.device.pq.pojo.vo.LineInfluxDbOnlineVO">
         SELECT
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java
index 4d1368f33..1e9733f3b 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java
@@ -167,7 +167,14 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
             groupLine = childrenData.stream().collect(Collectors.groupingBy(TerminalTree::getPid));
         }
         targetData = targetData.stream().peek(terminalTree -> {
-            terminalTree.setChildren(groupLine.get(terminalTree.getId()));
+            if(isLine){
+                //监测点的数量
+                int size = groupLine.get(terminalTree.getId()).size();
+                terminalTree.setName(terminalTree.getName()+"（"+size+"台装置）");
+                terminalTree.setChildren(groupLine.get(terminalTree.getId()));
+            }else{
+                terminalTree.setChildren(groupLine.get(terminalTree.getId()));
+            }
         }).collect(Collectors.toList());
     }
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java
index 51866a459..06d13b8d5 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java
@@ -135,9 +135,10 @@ public class THDistortionServiceImpl implements THDistortionService {
         /*监测点ID扁平化*/
         List<String> collect = deviceList.stream ( ).map (GeneralDeviceDTO::getLineIndexes).flatMap (Collection::stream).distinct ( ).collect (Collectors.toList ( ));
         QueryWrapper<RMpVThd> wrapper = new QueryWrapper<>();
-        wrapper.in ("measurement_point_id",collect).
-                between ("data_date", statisticsBizBaseParam.getStartTime (), statisticsBizBaseParam.getEndTime ()).
-                orderByDesc ("v_thd");
+        wrapper.in ("measurement_point_id",collect)
+                .between ("data_date", statisticsBizBaseParam.getStartTime (), statisticsBizBaseParam.getEndTime ())
+                .eq("data_type",1)
+                .orderByDesc ("v_thd");
         List<RMpVThd> rMpVThdList = rMpVThdMapper.selectList (wrapper);
         rMpVThdVOList = rMpVThdList.stream ( ).limit (topNum).map (rMpVThd -> {
             RMpVThdVO rMpVThdVO = new RMpVThdVO ( );

From eb8daa6f8fc3d5e74fa4105d89e758d3dfdb60b8 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Tue, 11 Apr 2023 16:05:56 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pqs-job/job-executor/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pqs-job/job-executor/pom.xml b/pqs-job/job-executor/pom.xml
index 6a39aaa1e..3866e91c2 100644
--- a/pqs-job/job-executor/pom.xml
+++ b/pqs-job/job-executor/pom.xml
@@ -27,6 +27,12 @@
             <groupId>com.njcn</groupId>
             <artifactId>common-core</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>

From 3af30403b78321125b75b4b2ee107f76cb1a2f05 Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Tue, 11 Apr 2023 16:18:14 +0800
Subject: [PATCH 10/10] ...

---
 .../harmonic/service/THDistortionService.java | 17 ++--
 .../service/impl/THDistortionServiceImpl.java | 96 ++++++-------------
 2 files changed, 41 insertions(+), 72 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/THDistortionService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/THDistortionService.java
index b20520f07..1516f643e 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/THDistortionService.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/THDistortionService.java
@@ -17,6 +17,7 @@ public interface THDistortionService {
 
     /**
      * 功能描述: 获取谐波总畸变率
+     *
      * @param thDistortionParam
      * @return
      */
@@ -25,16 +26,18 @@ public interface THDistortionService {
 
     /**
      * 功能描述: 获取总畸变率图表
+     *
      * @param thDistortionCensusParam
      * @return
      */
     THDistortionCensusVO getTHDistortionCensus(DeviceInfoParam.BusinessParam thDistortionCensusParam);
+
     /**
-    * @Description: 谐波总畸变率前topNum列表
-    * @Param: [statisticsBizBaseParam]
-    * @return: java.util.List<com.njcn.harmonic.pojo.vo.RMpVThdVO>
-    * @Author: clam
-    * @Date: 2022/11/7
-    */
-    List<RMpVThdVO> getTHDTopTenData(StatisticsBizBaseParam statisticsBizBaseParam,Integer topNum);
+     * @Description: 谐波总畸变率前topNum列表
+     * @Param: [statisticsBizBaseParam]
+     * @return: java.util.List<com.njcn.harmonic.pojo.vo.RMpVThdVO>
+     * @Author: clam
+     * @Date: 2022/11/7
+     */
+    List<RMpVThdVO> getTHDTopTenData(StatisticsBizBaseParam statisticsBizBaseParam, Integer topNum);
 }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java
index 06d13b8d5..ec3d0dbdd 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java
@@ -57,6 +57,7 @@ public class THDistortionServiceImpl implements THDistortionService {
     private final RMpVThdMapper rMpVThdMapper;
     private final LineFeignClient lineFeignClient;
     private final IRStatDataVDService statDataVDService;
+
     @Override
     public List<THDistortionVO> getTHDistortionData(DeviceInfoParam.BusinessParam thDistortionParam) {
         List<THDistortionVO> thDistortionVOS = new ArrayList<>();
@@ -72,7 +73,7 @@ public class THDistortionServiceImpl implements THDistortionService {
             THDistortionVO thDistortionVO = new THDistortionVO();
             thDistortionVO.setId(generalDeviceDTO.getIndex());
             thDistortionVO.setName(generalDeviceDTO.getName());
-            if (!CollectionUtils.isEmpty(generalDeviceDTO.getLineIndexes())){
+            if (!CollectionUtils.isEmpty(generalDeviceDTO.getLineIndexes())) {
                 List<String> lineIndexes = generalDeviceDTO.getLineIndexes();
 
                 //查找畸变率
@@ -121,33 +122,33 @@ public class THDistortionServiceImpl implements THDistortionService {
      * @Date: 2022/10/10
      */
     @Override
-    public List<RMpVThdVO> getTHDTopTenData(StatisticsBizBaseParam statisticsBizBaseParam,Integer topNum) {
+    public List<RMpVThdVO> getTHDTopTenData(StatisticsBizBaseParam statisticsBizBaseParam, Integer topNum) {
 
-        List<RMpVThdVO> rMpVThdVOList = new ArrayList<> ();
-        DeviceInfoParam deviceInfoParam = new DeviceInfoParam ();
-        deviceInfoParam.setDeptIndex (statisticsBizBaseParam.getId ());
-        deviceInfoParam.setStatisticalType (new SimpleDTO ());
-        deviceInfoParam.setServerName (generalInfo.getMicroServiceName());
-        deviceInfoParam.setPowerFlag (0);
-        deviceInfoParam.setMonitorFlag (0);
+        List<RMpVThdVO> rMpVThdVOList = new ArrayList<>();
+        DeviceInfoParam deviceInfoParam = new DeviceInfoParam();
+        deviceInfoParam.setDeptIndex(statisticsBizBaseParam.getId());
+        deviceInfoParam.setStatisticalType(new SimpleDTO());
+        deviceInfoParam.setServerName(generalInfo.getMicroServiceName());
+        deviceInfoParam.setPowerFlag(0);
+        deviceInfoParam.setMonitorFlag(0);
         /*获取按部门分类的实际所有终端综合信息*/
-        List<GeneralDeviceDTO> deviceList = generalDeviceInfoClient.getPracticalAllDeviceInfoAsDept (deviceInfoParam).getData ();
+        List<GeneralDeviceDTO> deviceList = generalDeviceInfoClient.getPracticalAllDeviceInfoAsDept(deviceInfoParam).getData();
         /*监测点ID扁平化*/
-        List<String> collect = deviceList.stream ( ).map (GeneralDeviceDTO::getLineIndexes).flatMap (Collection::stream).distinct ( ).collect (Collectors.toList ( ));
+        List<String> collect = deviceList.stream().map(GeneralDeviceDTO::getLineIndexes).flatMap(Collection::stream).distinct().collect(Collectors.toList());
         QueryWrapper<RMpVThd> wrapper = new QueryWrapper<>();
-        wrapper.in ("measurement_point_id",collect)
-                .between ("data_date", statisticsBizBaseParam.getStartTime (), statisticsBizBaseParam.getEndTime ())
-                .eq("data_type",1)
-                .orderByDesc ("v_thd");
-        List<RMpVThd> rMpVThdList = rMpVThdMapper.selectList (wrapper);
-        rMpVThdVOList = rMpVThdList.stream ( ).limit (topNum).map (rMpVThd -> {
-            RMpVThdVO rMpVThdVO = new RMpVThdVO ( );
-            BeanUtils.copyProperties (rMpVThd, rMpVThdVO);
+        wrapper.in("measurement_point_id", collect)
+                .between("data_date", statisticsBizBaseParam.getStartTime(), statisticsBizBaseParam.getEndTime())
+                .eq("data_type", 1)
+                .orderByDesc("v_thd");
+        List<RMpVThd> rMpVThdList = rMpVThdMapper.selectList(wrapper);
+        rMpVThdVOList = rMpVThdList.stream().limit(topNum).map(rMpVThd -> {
+            RMpVThdVO rMpVThdVO = new RMpVThdVO();
+            BeanUtils.copyProperties(rMpVThd, rMpVThdVO);
             /*查询监测点详情获取名称*/
-            LineDetailDataVO data = lineFeignClient.getLineDetailData (rMpVThd.getMeasurementPointId ( )).getData ( );
-            rMpVThdVO.setName (data.getLineName ());
+            LineDetailDataVO data = lineFeignClient.getLineDetailData(rMpVThd.getMeasurementPointId()).getData();
+            rMpVThdVO.setName(data.getLineName());
             return rMpVThdVO;
-        }).collect (Collectors.toList ( ));
+        }).collect(Collectors.toList());
 
         return rMpVThdVOList;
     }
@@ -174,6 +175,7 @@ public class THDistortionServiceImpl implements THDistortionService {
     private List<THDistortionVO> getChildCategoryList(THDistortionVO item, List<THDistortionVO> child) {
         return child.stream().filter(allItem -> allItem.getPid().equals(item.getId())).collect(Collectors.toList());
     }
+
     private void setChildesList(List<THDistortionVO> item, List<THDistortionVO> childes) {
         //groupLine变电站索引和监测点集合
         Map<String, List<THDistortionVO>> groupLine;
@@ -215,7 +217,7 @@ public class THDistortionServiceImpl implements THDistortionService {
             // busBarList.stream().peek(item -> item.setChildren(getChildCategoryList(item, monitorList))).collect(Collectors.toList());
             // deviceList.stream().peek(item -> item.setChildren(getChildCategoryList(item, busBarList))).collect(Collectors.toList());
             // substationList.stream().peek(item -> item.setChildren(getChildesList(item, monitorList))).collect(Collectors.toList());
-            setChildesList(substationList,monitorList);
+            setChildesList(substationList, monitorList);
             setFatherDistortion(substationList);
             powerCompanyList.stream().peek(item -> item.setChildren(getChildCategoryList(item, substationList))).collect(Collectors.toList());
             setFatherDistortion(powerCompanyList);
@@ -227,13 +229,14 @@ public class THDistortionServiceImpl implements THDistortionService {
 
     /**
      * influxDB查询畸变率
+     *
      * @param lineIndexes
      * @param startTime
      * @param endTime
      */
     private List<PublicDTO> getCondition(List<String> lineIndexes, String startTime, String endTime) {
         List<PublicDTO> publicDTOList = new ArrayList<>();
-        List<String> phasicType=new ArrayList<>();
+        List<String> phasicType = new ArrayList<>();
         phasicType.add(Param.PHASIC_TYPEA);
         phasicType.add(Param.PHASIC_TYPEB);
         phasicType.add(Param.PHASIC_TYPEC);
@@ -247,11 +250,11 @@ public class THDistortionServiceImpl implements THDistortionService {
                 .in(RStatDataVD::getPhasicType, phasicType)
                 .eq(RStatDataVD::getValueType, Param.VALUE_TYPEAVG)
         );
-        if (CollUtil.isNotEmpty(info)){
+        if (CollUtil.isNotEmpty(info)) {
             //根据id分组，先乘以100.在取平均值，在四舍五入
-            Map<String, Double> vthdMap = info.stream().filter(x-> x.getVThd()!=null).collect(Collectors.groupingBy(RStatDataVD::getLineId,
-                    Collectors.averagingDouble(x->x.getVThd().multiply(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue())));
-            PublicDTO publicDTO ;
+            Map<String, Double> vthdMap = info.stream().filter(x -> x.getVThd() != null).collect(Collectors.groupingBy(RStatDataVD::getLineId,
+                    Collectors.averagingDouble(x -> x.getVThd().multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())));
+            PublicDTO publicDTO;
             for (Map.Entry<String, Double> entry : vthdMap.entrySet()) {
                 publicDTO = new PublicDTO();
                 publicDTO.setId(entry.getKey());
@@ -260,43 +263,6 @@ public class THDistortionServiceImpl implements THDistortionService {
             }
         }
         return publicDTOList;
-
-                //组装sql语句
-//        StringBuilder string = new StringBuilder();
-//        string.append(Param.QualityFlag + "='1' and (" + Param.PHASIC_TYPE + "='" + Param.PHASIC_TYPEA + "' or " + Param.PHASIC_TYPE + "='" + Param.PHASIC_TYPEB + "' or " + Param.PHASIC_TYPE + "='" + Param.PHASIC_TYPEC + "') and "+ Param.VALUETYPE + "='AVG' and ");
-//        StringBuilder timeId = new StringBuilder();
-//        timeId.append(Param.TIME + " >= '" + startTime + Param.START_TIME + "' and " + Param.TIME + " <= '" + endTime + Param.END_TIME + "' and (");
-//        for (int i = 0; i < lineIndexes.size(); i++) {
-//            if (lineIndexes.size() - i != 1) {
-//                timeId.append(Param.LINE_ID + "='").append(lineIndexes.get(i)).append("' or ");
-//            } else {
-//                timeId.append(Param.LINE_ID + "='").append(lineIndexes.get(i)).append("')");
-//            }
-//        }
-//        // String a = "SELECT MEAN(V_THD) AS distortion FROM Data_V WHERE QualityFlag='1' and (phasic_type='A' or phasic_type='B' or phasic_type='C')and value_type='AVG' and time >= '2022-03-20 00:00:00' and time <= '2022-03-21 23:59:59' and  (lineid ='1e3b8531483b2a8cbee6747f1f641cf9') group by lineid;";
-//        //sql语句
-//        String sql = "SELECT MEAN(" + Param.V_THD + ")*100 AS distortion FROM Data_V WHERE " + string + timeId + " group by " + Param.LINE_ID;
-//        //结果集
-//        QueryResult result = influxDbUtils.query(sql);
-//        //处理结果集
-//        List<QueryResult.Series> list = result.getResults().get(0).getSeries();
-//        if (!CollectionUtils.isEmpty(list)){
-//            list.forEach(po->{
-//                PublicDTO publicDTO = new PublicDTO();
-//                List<List<Object>> valueList = po.getValues();
-//                String index = po.getTags().get(Param.LINE_ID);
-//                if (!CollectionUtils.isEmpty(valueList)){
-//                    for (List<Object> value : valueList) {
-//                        //谐波畸变率 保留两位小数
-//                        Double distortion = value.get(1) == null ? null : BigDecimal.valueOf(Double.parseDouble(value.get(1).toString())).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-//                        publicDTO.setId(index);
-//                        publicDTO.setData(distortion);
-//                    }
-//                }
-//                publicDTOList.add(publicDTO);
-//            });
-//        }
-//        return publicDTOList;
     }