From a72fc337fe95e2193fd9b72fccad6bff88f41fe1 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Wed, 6 Sep 2023 14:21:16 +0800
Subject: [PATCH 01/14] =?UTF-8?q?1.=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/process/pojo/vo/SupvProblemVO.java   | 126 ++++++------------
 .../mapper/mapping/SupvProblemMapper.xml      |   2 +-
 .../impl/SupvAlarmBackServiceImpl.java        |   2 +-
 .../service/impl/SupvAlarmServiceImpl.java    |   2 +-
 .../service/impl/SupvPlanHisServiceImpl.java  |   2 +-
 .../service/impl/SupvPlanServiceImpl.java     |   2 +-
 .../service/impl/SupvProblemServiceImpl.java  |  27 +++-
 7 files changed, 72 insertions(+), 91 deletions(-)

diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvProblemVO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvProblemVO.java
index 8696cfcab..a06a209f0 100644
--- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvProblemVO.java
+++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvProblemVO.java
@@ -25,129 +25,89 @@ public class SupvProblemVO  {
     private static final long serialVersionUID = 1L;
 
 
-    @Excel(name = "",width = 15)
-    private String problemId;
 
-    @Excel(name = "",width = 15)
+    @Excel(name = "计划名称",width = 40)
     private String workPlanName;
 
-    @Excel(name = "",width = 15)
-    private String provinceId;
-
-    @Excel(name = "",width = 15)
-    private String planId;
-
-    @Excel(name = "",width = 15)
+    @Excel(name = "责任单位编号",width = 15)
     private String dutyOrgId;
 
-    @Excel(name = "",width = 15)
+    @Excel(name = "责任单位名称",width = 15)
     private String dutyOrgName;
 
-    @Excel(name = "",width = 15)
+    @Excel(name = "监测点类型",width = 15)
     private String monitorType;
 
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
-    @Excel(name = "",width = 15)
-    private LocalDateTime rectificationTime;
-
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "",width = 15)
-    private LocalDateTime planRectificationTime;
-
-    /**
-     * 是否发布预告警
-     */
-    @Excel(name = "",width = 15)
+    @Excel(name = "是否发布预告警",width = 15,replace= {"否_0", "是_1"})
     private Integer ifReleaseWarning;
 
-    /**
-     * 问题简要描述
-     */
-    @Excel(name = "",width = 15)
-    private String simpleProblemDesc;
+    @Excel(name = "计划整改时间",width = 15)
+    private String planRectificationTime;
 
-    /**
-     * 监督标准序号
-     */
-    @Excel(name = "",width = 15)
+    @Excel(name = "整改情况",width = 15,replace = {"已整改_01","未整改_02"})
+    private String rectificationStatus;
+
+    @Excel(name = "整改时间",width = 15)
+    private String rectificationTime;
+
+
+    @Excel(name = "监督标准",width = 15)
+    private String supvStandard;
+
+
+    @Excel(name = "监督标准序号",width = 15)
     private String supvStandardSort;
 
-    /**
-     * 问题描述
-     */
-    @Excel(name = "",width = 15)
+    @Excel(name = "标准出处",width = 15)
+    private String supvResouce;
+
+    @Excel(name = "问题等级",width = 15)
+    private String problemLevel;
+
+
+    @Excel(name = "问题类型",width = 15)
+    private String problemType;
+
+
+    @Excel(name = "问题简要描述",width = 40)
+    private String simpleProblemDesc;
+
+
+    @Excel(name = "问题描述",width = 200)
     private String problemDesc;
 
     /**
-     * 监督标准
+     * 问题发现时间
      */
-    private String supvStandard;
-
-    /**
-     * 标准出处
-     */
-    private String supvResouce;
-
-    /**
-     * 问题等级	01 一般，02 较大
-     */
-    private String problemLevel;
+    @Excel(name = "问题发现时间",width = 15)
+    private String discoveryTime;
 
     /**
      * 定级依据
      */
+    @Excel(name = "定级依据",width = 15)
     private String problemLevelReason;
 
-    /**
-     * 问题类型
-     */
-    private String problemType;
 
     /**
      * 整改方案
      */
+    @Excel(name = "整改方案",width = 50)
     private String rectificationProgramme;
 
-    /**
-     * 整改情况01已整改，02未整改
-     */
-    private String rectificationStatus;
+
 
 
     /**
      * 整改措施
      */
+    @Excel(name = "整改措施",width = 40)
     private String rectificationMeasure;
 
-
-    /**
-     * 0.以上送 1.未上送 2.取消上送
-     */
-    private Integer isUploadHead;
-
     /**
      * 备注
      */
+    @Excel(name = "备注",width = 40)
     private String remark;
 
-    @TableField(exist = false)
-    @ApiModelProperty(name = "attachmentName", value = "盖章报告")
-    private String attachmentName;
-
-
-    @TableField(exist = false)
-    @ApiModelProperty(name = "attachmentNameTwo", value = "佐证材料")
-    private String attachmentNameTwo;
-
-    /**
-     * 问题发现时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime discoveryTime;
-
-
-
 }
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvProblemMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvProblemMapper.xml
index c1178b56c..512c44e4e 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvProblemMapper.xml
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvProblemMapper.xml
@@ -8,7 +8,7 @@
     <select id="listDerive" resultType="com.njcn.process.pojo.vo.SupvProblemVO">
         select
             work_plan_name,
-            sp.*
+            spm.*
         from
             supv_problem spm
         INNER JOIN supv_plan  sp on sp.plan_Id=spm.plan_id
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvAlarmBackServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvAlarmBackServiceImpl.java
index 25914a0ce..e2415e2a9 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvAlarmBackServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvAlarmBackServiceImpl.java
@@ -60,7 +60,7 @@ public class SupvAlarmBackServiceImpl extends ServiceImpl<SupvAlarmBackMapper, S
     @Override
     public boolean delAlarmBack(List<String> ids) {
         LambdaQueryWrapper<SupvAlarmBack> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.ne(SupvAlarmBack::getIsUploadHead, 0).eq(SupvAlarmBack::getWorkAlarmId, ids);
+        lambdaQueryWrapper.ne(SupvAlarmBack::getIsUploadHead, 0).in(SupvAlarmBack::getWorkAlarmId, ids);
         int count = this.count(lambdaQueryWrapper);
         if (count > 0) {
             throw new BusinessException("请选择未上送国网的删除");
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvAlarmServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvAlarmServiceImpl.java
index ac8cd3585..01fd065f6 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvAlarmServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvAlarmServiceImpl.java
@@ -59,7 +59,7 @@ public class SupvAlarmServiceImpl extends ServiceImpl<SupvAlarmMapper, SupvAlarm
     @Override
     public boolean delAlarm(List<String> planIds) {
         LambdaQueryWrapper<SupvAlarm> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.ne(SupvAlarm::getIsUploadHead, 0).eq(SupvAlarm::getAlarmId, planIds);
+        lambdaQueryWrapper.ne(SupvAlarm::getIsUploadHead, 0).in(SupvAlarm::getAlarmId, planIds);
         int count = this.count(lambdaQueryWrapper);
         if (count > 0) {
             throw new BusinessException("请选择未上送国网的删除");
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanHisServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanHisServiceImpl.java
index 042a76ff1..acd2593bc 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanHisServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanHisServiceImpl.java
@@ -59,7 +59,7 @@ public class SupvPlanHisServiceImpl extends ServiceImpl<SupvPlanHisMapper, SupvP
     @Override
     public boolean delPlanHis(List<String> planIds) {
         LambdaQueryWrapper<SupvPlanHis> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(SupvPlanHis::getIsUploadHead, 1).eq(SupvPlanHis::getId, planIds);
+        lambdaQueryWrapper.ne(SupvPlanHis::getIsUploadHead, 0).in(SupvPlanHis::getId, planIds);
         int count = this.count(lambdaQueryWrapper);
         if (count > 0) {
             throw new BusinessException("请选择未上送国网的删除");
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java
index da6f99308..2c0f3702a 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java
@@ -211,7 +211,7 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> i
     @Transactional(rollbackFor = Exception.class)
     public boolean delPlan(List<String> planIds) {
         LambdaQueryWrapper<SupvPlan> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.ne(SupvPlan::getIsUploadHead, 0).eq(SupvPlan::getPlanId, planIds);
+        lambdaQueryWrapper.ne(SupvPlan::getIsUploadHead, 0).in(SupvPlan::getPlanId, planIds);
         int count = this.count(lambdaQueryWrapper);
         if (count > 0) {
             throw new BusinessException("请选择未上送国网的删除");
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvProblemServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvProblemServiceImpl.java
index f6f41f80e..6c83674c0 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvProblemServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvProblemServiceImpl.java
@@ -20,7 +20,10 @@ import com.njcn.process.pojo.po.SupvProblem;
 import com.njcn.process.pojo.vo.SupvProblemVO;
 import com.njcn.process.service.ISupvProblemService;
 import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
 import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.po.Dept;
 import com.njcn.user.pojo.vo.PvTerminalTreeVO;
 import com.njcn.web.factory.PageFactory;
 import lombok.RequiredArgsConstructor;
@@ -87,7 +90,7 @@ public class SupvProblemServiceImpl extends ServiceImpl<SupvProblemMapper, SupvP
     @Transactional(rollbackFor = Exception.class)
     public boolean delProblem(List<String> problemIds) {
         LambdaQueryWrapper<SupvProblem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.ne(SupvProblem::getIsUploadHead, 0).eq(SupvProblem::getProblemId, problemIds);
+        lambdaQueryWrapper.ne(SupvProblem::getIsUploadHead, 0).in(SupvProblem::getProblemId, problemIds);
         int count = this.count(lambdaQueryWrapper);
         if (count > 0) {
             throw new BusinessException("请选择未上送国网的删除");
@@ -136,8 +139,26 @@ public class SupvProblemServiceImpl extends ServiceImpl<SupvProblemMapper, SupvP
     @Override
     public void problemList(SupvProblemParam supvProblemParam) {
         List<SupvProblemVO> supvProblemVOS = this.baseMapper.listDerive(supvProblemParam);
-//        List<PqsLineWeightVo.WeightExcel> weightExcels = this.baseMapper.selectWeights(terminalMainQueryParam);
-//        ExcelUtil.exportExcel("监测点权重信息.xlsx",PqsLineWeightVo.WeightExcel.class,weightExcels);
+        //监测点状态
+        List<DictData> monitorTypeList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.MONITOR_TYPE.getCode()).getData();
+        Map<String, DictData> mapMonitorType = monitorTypeList.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
+        //问题类型
+        List<DictData> problemTypeList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.SUPV_PROBLEM_TYPE.getCode()).getData();
+        Map<String, DictData> mapProblemType = problemTypeList.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
+
+        for (SupvProblemVO supvProblem : supvProblemVOS) {
+            Dept dept = deptFeignClient.getDeptByCode(supvProblem.getDutyOrgId()).getData();
+            supvProblem.setDutyOrgName(dept.getName());
+
+            if (mapMonitorType.containsKey(supvProblem.getMonitorType())) {
+                supvProblem.setMonitorType(mapMonitorType.get(supvProblem.getMonitorType()).getName());
+            }
+            if (mapProblemType.containsKey(supvProblem.getProblemType())) {
+                supvProblem.setProblemType(mapProblemType.get(supvProblem.getProblemType()).getName());
+            }
+        }
+
+        ExcelUtil.exportExcel("实施问题信息.xlsx",SupvProblemVO.class,supvProblemVOS);
 
     }
 

From 7751bccbcff605a5fe5ac812bca9d99ba6ad30ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Wed, 6 Sep 2023 18:30:13 +0800
Subject: [PATCH 02/14] =?UTF-8?q?pms-device=E6=8D=A2pq=5Fdevice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pqs-device/device-boot/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pqs-device/device-boot/pom.xml b/pqs-device/device-boot/pom.xml
index 55971cfc5..8ef1c1113 100644
--- a/pqs-device/device-boot/pom.xml
+++ b/pqs-device/device-boot/pom.xml
@@ -21,16 +21,16 @@
     <dependencies>
 
         <!--pq-device-boot和pms-device-boot只能选择一个-->
-  <!--      <dependency>
+        <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>pq-device-boot</artifactId>
             <version>${project.version}</version>
-        </dependency>-->
-        <dependency>
+        </dependency>
+    <!--    <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>pms-device-boot</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>com.njcn</groupId>

From 92be2982fe28671266ea2ac87c1db658535fd59c Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Wed, 6 Sep 2023 20:27:35 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E5=9B=BD=E7=BD=91=E4=B8=8A=E9=80=81bug?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/njcn/process/pojo/vo/gw/PlanVO.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/gw/PlanVO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/gw/PlanVO.java
index c80cd4c33..0a1ffe110 100644
--- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/gw/PlanVO.java
+++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/gw/PlanVO.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.db.bo.BaseEntity;
 import lombok.Getter;
 
 import java.time.LocalDate;
@@ -17,7 +18,7 @@ import java.time.LocalDateTime;
  * @date 2023/9/6 9:33
  */
 @Getter
-public class PlanVO {
+public class PlanVO extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     @TableId

From a44659ce983970905b944c80b18c5635f5542095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Thu, 7 Sep 2023 09:00:09 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8D=95=E4=BD=8D=EF=BC=8Cbug=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/HarmonicServiceImpl.java     |  8 ++--
 .../impl/HistoryResultServiceImpl.java        | 39 +++++++++++--------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java
index 454982578..e1136600b 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java
@@ -115,8 +115,8 @@ public class HarmonicServiceImpl implements IHarmonicService {
                     pollutionVO.setChildren(childrenList.stream().sorted(Comparator.comparing(PollutionVO::getData).reversed().thenComparing(PollutionVO::getName)).collect(Collectors.toList()));
                 }
                 if (!CollectionUtils.isEmpty(dept.getLineIndexes())){
-//                pollutionVO.setData(handleData(getLimitTarget(lineList, harmonicPublicParam.getSearchBeginTime(),harmonicPublicParam.getSearchEndTime()),harmonicPublicParam.getStatisticalType().getCode(),lineList, harmonicPublicParam.getSearchBeginTime(),harmonicPublicParam.getSearchEndTime()).getRatio());
-                    pollutionVO.setData(NumberUtil.round(childrenList.stream().mapToDouble(PollutionVO::getData).average().orElse(3.14159),2).doubleValue());
+                    double tem = childrenList.stream().mapToDouble(PollutionVO::getData).average().orElse(3.14159);
+                    pollutionVO.setData(tem == 3.14159||tem<0?3.14159:NumberUtil.round(tem,2).doubleValue());
                 }
                 list.add(pollutionVO);
             }
@@ -436,12 +436,12 @@ public class HarmonicServiceImpl implements IHarmonicService {
         }
         //平均超标天数
         if (CollectionUtils.isEmpty(list)){
-            avgOverDay = -1.0;
+            avgOverDay = 0;
         } else {
             avgOverDay = overLineCount == 0?0.0:BigDecimal.valueOf(overCountByDay*1.0/overLineCount).setScale(2, RoundingMode.HALF_UP).doubleValue();
         }
         //月监测点超标占比
-        ratio = map.size() == 0?-1.0:BigDecimal.valueOf(ratio*100/map.size()).setScale(2, RoundingMode.HALF_UP).doubleValue();
+        ratio = map.size() == 0?0:BigDecimal.valueOf(ratio*100/map.size()).setScale(2, RoundingMode.HALF_UP).doubleValue();
         areaDTO.setOnlineCount(onlineCount);
         areaDTO.setOverLineCount(overLineCount);
         //平均超标天数
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
index 9ff7ac20a..bfd447fac 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
@@ -9,8 +9,10 @@ import com.njcn.common.pojo.constant.BizParamConstant;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.common.utils.PubUtils;
+import com.njcn.device.pq.api.DeviceUnitClient;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.biz.pojo.po.Overlimit;
+import com.njcn.device.pq.pojo.po.PqsDeviceUnit;
 import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
 import com.njcn.event.api.EventDetailFeignClient;
 import com.njcn.event.pojo.po.EventDetail;
@@ -83,13 +85,14 @@ public class HistoryResultServiceImpl implements HistoryResultService {
 
     private final DataHarmRateVMapper dataHarmRateVMapper;
 
+    private final DeviceUnitClient deviceUnitClient;
+
 
     @Override
     public List<HistoryDataResultVO> getHistoryResult(HistoryParam historyParam) {
         List<HistoryDataResultVO> historyDataResultVOList = new ArrayList<>();
         //获取监测点
         String[] points = historyParam.getLineId();
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
         Integer number = 0;
         for (int i = 0; i < points.length; i++) {
             HistoryDataResultVO historyDataResultVO;
@@ -237,6 +240,8 @@ public class HistoryResultServiceImpl implements HistoryResultService {
     }
 
     private QueryResultLimitVO getQueryResult(String startTime, String endTime, String lineList, String contion, Integer number, Integer valueType, Integer ptType) {
+        PqsDeviceUnit pqsDeviceUnit = deviceUnitClient.lineUnitDetail(lineList).getData();
+
         QueryResultLimitVO queryResultLimitVO = new QueryResultLimitVO();
         if (!lineList.isEmpty()) {
             Float topLimit = 0f;
@@ -282,7 +287,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     phasicType.add("A相");
                     phasicType.add("B相");
                     phasicType.add("C相");
-                    unit.add("kV");
+                    unit.add(pqsDeviceUnit.getPhaseVoltage());
                     targetName = "相电压有效值";
                     break;
                 case 11:
@@ -292,7 +297,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     phasicType.add("AB相");
                     phasicType.add("BC相");
                     phasicType.add("CA相");
-                    unit.add("kV");
+                    unit.add(pqsDeviceUnit.getLineVoltage());
                     targetName = "线电压有效值";
                     break;
                 case 12:
@@ -329,9 +334,9 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     phasicType.add("零序电压");
                     phasicType.add("正序电压");
                     phasicType.add("负序电压");
-                    unit.add("V");
-                    unit.add("kV");
-                    unit.add("V");
+                    unit.add(pqsDeviceUnit.getNoPositiveV());
+                    unit.add(pqsDeviceUnit.getPositiveV());
+                    unit.add(pqsDeviceUnit.getNoPositiveV());
                     targetName = "电压不平衡";
                     break;
                 case 15:
@@ -448,7 +453,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                         phasicType.add("CA相");
                     }
                     if (number == 1) {
-                        unit.add("kV");
+                        unit.add(pqsDeviceUnit.getVfundEffective());
                     } else {
                         unit.add("V");
                     }
@@ -549,7 +554,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                         phasicType.add("BC相");
                         phasicType.add("CA相");
                     }
-                    unit.add("kV");
+                    unit.add(pqsDeviceUnit.getPhaseVoltage());
                     break;
                 case 49:
                     //间谐波电流幅值
@@ -569,7 +574,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     phasicType.add("B相");
                     phasicType.add("C相");
                     if (number == 1) {
-                        unit.add("kW");
+                        unit.add(pqsDeviceUnit.getFundActiveP());
                     } else {
                         unit.add("W");
                     }
@@ -583,7 +588,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     phasicType.add("B相");
                     phasicType.add("C相");
                     if (number == 1) {
-                        unit.add("kVar");
+                        unit.add(pqsDeviceUnit.getTotalNoP());
                     } else {
                         unit.add("Var");
                     }
@@ -597,7 +602,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     phasicType.add("B相");
                     phasicType.add("C相");
                     if (number == 1) {
-                        unit.add("kVA");
+                        unit.add(pqsDeviceUnit.getTotalViewP());
                     } else {
                         unit.add("VA");
                     }
@@ -610,7 +615,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     phasicType.add("A相");
                     phasicType.add("B相");
                     phasicType.add("C相");
-                    unit.add("kW");
+                    unit.add(pqsDeviceUnit.getTotalActiveP());
                     targetName = "三相有功功率";
                     break;
                 case 54:
@@ -620,7 +625,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     phasicType.add("A相");
                     phasicType.add("B相");
                     phasicType.add("C相");
-                    unit.add("kVar");
+                    unit.add(pqsDeviceUnit.getTotalNoP());
                     targetName = "三相无功功率";
                     break;
                 case 55:
@@ -630,7 +635,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     phasicType.add("A相");
                     phasicType.add("B相");
                     phasicType.add("C相");
-                    unit.add("kVA");
+                    unit.add(pqsDeviceUnit.getTotalViewP());
                     targetName = "三相视在功率";
                     break;
                 case 56:
@@ -638,7 +643,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     sql = "SELECT time as time, p as aValue ," + InfluxDBTableConstant.PHASIC_TYPE + " FROM data_harmpower_p WHERE " + stringBuilder +
                             " and phasic_type ='T' order by time asc tz('Asia/Shanghai');";
                     phasicType.add("三相总有功功率");
-                    unit.add("kW");
+                    unit.add(pqsDeviceUnit.getTotalActiveP());
                     targetName = "三相总有功功率";
                     break;
                 case 57:
@@ -646,7 +651,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     sql = "SELECT time as time, q as aValue ," + InfluxDBTableConstant.PHASIC_TYPE + " FROM data_harmpower_q WHERE " + stringBuilder +
                             " and phasic_type ='T' order by time asc tz('Asia/Shanghai');";
                     phasicType.add("三相总无功功率");
-                    unit.add("kVar");
+                    unit.add(pqsDeviceUnit.getTotalNoP());
                     targetName = "三相总无功功率";
                     break;
                 case 58:
@@ -654,7 +659,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     sql = "SELECT time as time, s as aValue ," + InfluxDBTableConstant.PHASIC_TYPE + " FROM data_harmpower_s WHERE " + stringBuilder +
                             " and phasic_type ='T' order by time asc tz('Asia/Shanghai');";
                     phasicType.add("三相总视在功率");
-                    unit.add("kVA");
+                    unit.add(pqsDeviceUnit.getTotalViewP());
                     targetName = "三相总视在功率";
                     break;
                 case 59:

From 13e1c85c79cb3ee5f2a6470ab0413ea3f3a67c39 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Thu, 7 Sep 2023 09:45:44 +0800
Subject: [PATCH 05/14] =?UTF-8?q?1.mq=E6=96=B0=E5=A2=9E=E6=B6=88=E8=B4=B9?=
 =?UTF-8?q?=E7=BB=84=202.=E7=94=A8=E6=88=B7=E7=BB=84=E4=BB=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/njcn/common/pojo/constant/ServerInfo.java     | 5 +++++
 .../src/main/java/com/njcn/mq/message/AppFileMessage.java  | 6 +++++-
 .../java/com/njcn/mq/template/AppFileMessageTemplate.java  | 1 +
 .../main/java/com/njcn/redis/pojo/enums/AppRedisKey.java   | 5 +++++
 .../java/com/njcn/system/enums/SystemResponseEnum.java     | 1 +
 .../com/njcn/user/service/impl/ComponentServiceImpl.java   | 7 +++++++
 6 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java
index a7028fb38..869964497 100644
--- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java
+++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java
@@ -38,8 +38,13 @@ public interface ServerInfo {
     String CS_HARMONIC_BOOT = "cs-harmonic-boot";
 
     String CS_REPORT_BOOT = "cs-report-boot";
+
+    String ACCESS_BOOT = "access-boot";
+
     String CS_STAT_BOOT = "stat-boot";
+
     String CS_RT_BOOT = "rt-boot";
+
     String CS_ZL_EVENT_BOOT = "zl-event-boot";
 
 
diff --git a/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppFileMessage.java b/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppFileMessage.java
index 8b2337e50..c05bac26d 100644
--- a/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppFileMessage.java
+++ b/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppFileMessage.java
@@ -11,7 +11,7 @@ import lombok.Data;
  * @version 1.0.0
  * @createTime 2023/9/5 16:38
  */
-
+@Data
 public class AppFileMessage extends BaseMessage {
 
     @ApiModelProperty("网络设备码")
@@ -38,11 +38,15 @@ public class AppFileMessage extends BaseMessage {
         private AppFileMessage.FileInfo fileInfo;
 
         private String data;
+
+        private String name;
     }
 
     @Data
     public static class FileInfo{
 
+        private String name;
+
         private Long fileTime;
 
         private Integer fileSize;
diff --git a/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppFileMessageTemplate.java b/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppFileMessageTemplate.java
index d92042fc3..94d4c9ee2 100644
--- a/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppFileMessageTemplate.java
+++ b/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppFileMessageTemplate.java
@@ -26,4 +26,5 @@ public class AppFileMessageTemplate extends RocketMQEnhanceTemplate {
         appFileMessage.setSource(BusinessResource.APP_RESOURCE);
         return send(BusinessTopic.NJCN_APP_FILE_TOPIC, tag, appFileMessage);
     }
+
 }
diff --git a/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java b/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java
index b61bd9486..dad7a7073 100644
--- a/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java
+++ b/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java
@@ -46,4 +46,9 @@ public interface AppRedisKey {
      */
     String RMQ_CONSUME_KEY="rocketMQConsumeKey:";
 
+    /**
+     * rocketMQ消费文件key
+     */
+    String RMQ_FILE_CONSUME_KEY="rocketMQFileConsumeKey:";
+
 }
diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/SystemResponseEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/SystemResponseEnum.java
index 49a4d6ca9..48b09d410 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/SystemResponseEnum.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/SystemResponseEnum.java
@@ -24,6 +24,7 @@ public enum SystemResponseEnum {
 
     INTERFERENCE_EMPTY("A00356","查询字典干扰源类型数据为空"),
     BUSINESS_EMPTY("A00356","查询字典行业类型数据为空"),
+    SYSTEM_TYPE_EMPTY("A00356","查询字典系统类型数据为空"),
     DEV_TYPE_EMPTY("A00357","查询字典设备类型数据为空"),
     MANUFACTURER("A00358","查询字典终端厂家数据为空"),
     DEV_VARIETY("A00359","查询字典终端类型数据为空"),
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/ComponentServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/ComponentServiceImpl.java
index 917823ccf..55aa5fcab 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/ComponentServiceImpl.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/ComponentServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.SystemResponseEnum;
 import com.njcn.system.pojo.po.DictData;
 import com.njcn.user.enums.UserResponseEnum;
 import com.njcn.user.mapper.ComponentMapper;
@@ -103,6 +104,9 @@ public class ComponentServiceImpl extends ServiceImpl<ComponentMapper, Component
             Map<String,List<ComponentVO>> map = list.stream().filter(m->!Objects.isNull(m.getSystemType())).collect(Collectors.groupingBy(ComponentVO::getSystemType));
             map.forEach((k,v)->{
                 DictData dictData = dicDataFeignClient.getDicDataById(k).getData();
+                if (Objects.isNull(dictData)){
+                    throw new BusinessException(SystemResponseEnum.SYSTEM_TYPE_EMPTY);
+                }
                 ComponentVO componentVO = new ComponentVO();
                 componentVO.setId(dictData.getId());
                 componentVO.setName(dictData.getName());
@@ -145,6 +149,9 @@ public class ComponentServiceImpl extends ServiceImpl<ComponentMapper, Component
             Map<String,List<ComponentVO>> map = componentVOList.stream().collect(Collectors.groupingBy(ComponentVO::getSystemType));
             map.forEach((k, v)->{
                 DictData dictData = dicDataFeignClient.getDicDataById(k).getData();
+                if (Objects.isNull(dictData)){
+                    throw new BusinessException(SystemResponseEnum.SYSTEM_TYPE_EMPTY);
+                }
                 ComponentVO componentVO = new ComponentVO();
                 componentVO.setName(dictData.getName());
                 componentVO.setChildren(

From 82fa9cd90a845cd167dfbacbb06e3f65a69c60b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Thu, 7 Sep 2023 10:33:49 +0800
Subject: [PATCH 06/14] =?UTF-8?q?bug=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/harmonic/service/impl/IntegrityServiceImpl.java  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java
index 1769ed3ff..d74c414b6 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java
@@ -177,17 +177,15 @@ public class IntegrityServiceImpl implements IntegrityService {
                 if (CollectionUtils.isEmpty(lineIndexes)) {
                     continue;
                 }
-//                type.add(generalDeviceDTO.getName());
                 outParam.setType(generalDeviceDTO.getName());
                 //根据监测点查询数据完整性
                 List<PublicDTO> integrityData = getCondition(lineIndexes, integrityIconParam.getSearchBeginTime(), integrityIconParam.getSearchEndTime());
-//                single.add(integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159));
-                outParam.setSingle(NumberUtil.round(integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159),2).doubleValue());
+                outParam.setSingle(NumberUtil.round(integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159), 2).doubleValue());
                 //如果存在需要比较的时间，再获取对应数据
                 if (StrUtil.isNotBlank(integrityIconParam.getPeriodBeginTime()) && StrUtil.isNotBlank(integrityIconParam.getPeriodEndTime())) {
                     List<PublicDTO> compareData = getCondition(lineIndexes, integrityIconParam.getPeriodBeginTime(), integrityIconParam.getPeriodEndTime());
-//                    ratio.add(compareData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159));
-                    outParam.setRatio(NumberUtil.round(compareData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159),2).doubleValue());
+                    double tem = compareData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159);
+                    outParam.setRatio(tem == 3.14159 ? tem : NumberUtil.round(tem, 2).doubleValue());
                 }
                 out.add(outParam);
             }

From b5d442e93eef020f45566c3ca15c299d6c75d1e5 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Thu, 7 Sep 2023 14:51:22 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98=20=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=8A=A5=E8=A1=A8=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  86 +++++++-----
 pqs-common/common-core/pom.xml                |   9 +-
 pqs-common/common-web/pom.xml                 |   5 -
 pqs-device/common-device-biz/pom.xml          |   7 -
 pqs-device/device-boot/pom.xml                |   2 +-
 pqs-device/pms-device/pms-device-boot/pom.xml |  18 ---
 pqs-harmonic/harmonic-api/pom.xml             |   8 --
 .../njcn/harmonic/pojo/po}/PqsComasses.java   |   2 +-
 pqs-harmonic/harmonic-boot/pom.xml            |  18 ---
 .../service/impl/AssesServiceImpl.java        |   4 +-
 .../service/impl/CustomReportServiceImpl.java | 123 ++++++++++--------
 .../com/njcn/harmonic/util}/ComAssesUtil.java |   4 +-
 pqs-influx/pom.xml                            |  23 +---
 pqs-prepare/prepare-boot/pom.xml              |   9 --
 pqs-process/process-boot/pom.xml              |  12 ++
 15 files changed, 153 insertions(+), 177 deletions(-)
 rename {pqs-common/common-web/src/main/java/com/njcn/web/utils => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po}/PqsComasses.java (98%)
 rename {pqs-common/common-web/src/main/java/com/njcn/web/utils => pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/util}/ComAssesUtil.java (99%)

diff --git a/pom.xml b/pom.xml
index 58269087a..ba3db2716 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
     </distributionManagement>
     <properties>
         <!--中间件目标地址-->
-<!--        <middle.server.url>101.132.25.239</middle.server.url>-->
+        <!--        <middle.server.url>101.132.25.239</middle.server.url>-->
         <middle.server.url>192.168.1.13</middle.server.url>
         <!--微服务模块发布地址-->
         <service.server.url>127.0.0.1</service.server.url>
@@ -49,7 +49,8 @@
         <!--nacos的ip:port-->
         <nacos.url>${middle.server.url}:18848</nacos.url>
         <!--服务器发布内容为空-->
-<!--        <nacos.namespace></nacos.namespace>-->
+        <!--        <nacos.namespace></nacos.namespace>-->
+        <!--        <nacos.namespace>1dd11af6-e668-41fd-a663-02a05705304d</nacos.namespace>-->
         <nacos.namespace>fd74182b-1fce-4dba-afa7-2623b0376205</nacos.namespace>
         <!--sentinel:port-->
         <sentinel.url>${middle.server.url}:8080</sentinel.url>
@@ -63,14 +64,14 @@
         <docker.registry.name>njcn</docker.registry.name>
         <!--切换阿里&华为的配置sdk-->
         <micro.sdk>common-microservice</micro.sdk>
-<!--        <micro.sdk>common-huawei</micro.sdk>-->
+        <!--        <micro.sdk>common-huawei</micro.sdk>-->
         <docker.operate>site</docker.operate>
         <java.version>1.8</java.version>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <!--三剑客版本-->
         <springboot.version>2.3.12.RELEASE</springboot.version>
-<!--        <springcloud.version>Hoxton.SR12</springcloud.version>-->
+        <!--        <springcloud.version>Hoxton.SR12</springcloud.version>-->
         <springcloud.version>Hoxton.SR12</springcloud.version>
         <springcloud.alibaba.version>2.2.7.RELEASE</springcloud.alibaba.version>
         <hutool.version>5.7.9</hutool.version>
@@ -90,6 +91,7 @@
         <velocity.version>2.3</velocity.version>
         <jjwt.version>0.9.1</jjwt.version>
         <feignOkhttp.version>11.2</feignOkhttp.version>
+        <okhttp3.version>4.9.0</okhttp3.version>
         <antisamy.version>1.6.4</antisamy.version>
         <kaptcha.version>2.3.2</kaptcha.version>
         <bcprov-jdk15on.version>1.68</bcprov-jdk15on.version>
@@ -105,9 +107,6 @@
         <xxl-job.version>2.3.0</xxl-job.version>
         <mqtt.version>1.2.7</mqtt.version>
         <easypoi.version>4.4.0</easypoi.version>
-        <progressbar.version>0.5.3</progressbar.version>
-        <okhttp.version>4.8.1</okhttp.version>
-        <minio.version>8.2.1</minio.version>
         <spring-cloud-huawei.version>1.7.0-Hoxton</spring-cloud-huawei.version>
     </properties>
     <dependencyManagement>
@@ -335,35 +334,62 @@
                 <artifactId>easypoi-spring-boot-starter</artifactId>
                 <version>${easypoi.version}</version>
             </dependency>
-            <!--调用minio服务器-->
-            <dependency>
-                <groupId>me.tongfei</groupId>
-                <artifactId>progressbar</artifactId>
-                <version>${progressbar.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.squareup.okhttp3</groupId>
-                <artifactId>okhttp</artifactId>
-                <version>${okhttp.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.minio</groupId>
-                <artifactId>minio</artifactId>
-                <version>${minio.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.squareup.okhttp3</groupId>
-                        <artifactId>okhttp</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <!-- 多数据源切换，当数据源为oracle时需要使用 -->
             <dependency>
                 <groupId>com.baomidou</groupId>
                 <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
                 <version>${dynamic-datasource.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>logging-interceptor</artifactId>
+                <version>${okhttp3.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>mockwebserver</artifactId>
+                <version>${okhttp3.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okcurl</artifactId>
+                <version>${okhttp3.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp</artifactId>
+                <version>${okhttp3.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp-dnsoverhttps</artifactId>
+                <version>${okhttp3.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp-sse</artifactId>
+                <version>${okhttp3.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp-testing-support</artifactId>
+                <version>${okhttp3.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp-tls</artifactId>
+                <version>${okhttp3.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp-urlconnection</artifactId>
+                <version>${okhttp3.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.influxdb</groupId>
+                <artifactId>influxdb-java</artifactId>
+                <version>2.22</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <build>
diff --git a/pqs-common/common-core/pom.xml b/pqs-common/common-core/pom.xml
index 850547f92..cfca7d7ac 100644
--- a/pqs-common/common-core/pom.xml
+++ b/pqs-common/common-core/pom.xml
@@ -107,6 +107,13 @@
 <!--            <groupId>org.springframework.boot</groupId>-->
 <!--            <artifactId>spring-boot-starter-log4j2</artifactId>-->
 <!--        </dependency>-->
-
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>logging-interceptor</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/pqs-common/common-web/pom.xml b/pqs-common/common-web/pom.xml
index 429062075..0a011962b 100644
--- a/pqs-common/common-web/pom.xml
+++ b/pqs-common/common-web/pom.xml
@@ -69,11 +69,6 @@
             <groupId>com.nimbusds</groupId>
             <artifactId>nimbus-jose-jwt</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.influxdb</groupId>
-            <artifactId>influxdb-java</artifactId>
-        </dependency>
-
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/pqs-device/common-device-biz/pom.xml b/pqs-device/common-device-biz/pom.xml
index c06a3a41d..9bdb5fe96 100644
--- a/pqs-device/common-device-biz/pom.xml
+++ b/pqs-device/common-device-biz/pom.xml
@@ -59,13 +59,6 @@
             <groupId>com.njcn</groupId>
             <artifactId>pqs-influx</artifactId>
             <version>0.0.1-SNAPSHOT</version>
-            <!--排除okhttp3的依赖-->
-            <exclusions>
-                <exclusion>
-                    <groupId>com.squareup.okhttp3</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 
diff --git a/pqs-device/device-boot/pom.xml b/pqs-device/device-boot/pom.xml
index 8ef1c1113..31b3226c9 100644
--- a/pqs-device/device-boot/pom.xml
+++ b/pqs-device/device-boot/pom.xml
@@ -26,7 +26,7 @@
             <artifactId>pq-device-boot</artifactId>
             <version>${project.version}</version>
         </dependency>
-    <!--    <dependency>
+       <!-- <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>pms-device-boot</artifactId>
             <version>${project.version}</version>
diff --git a/pqs-device/pms-device/pms-device-boot/pom.xml b/pqs-device/pms-device/pms-device-boot/pom.xml
index b904c242d..3687863d9 100644
--- a/pqs-device/pms-device/pms-device-boot/pom.xml
+++ b/pqs-device/pms-device/pms-device-boot/pom.xml
@@ -44,24 +44,6 @@
             <groupId>com.njcn</groupId>
             <artifactId>common-oss</artifactId>
             <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.squareup.okhttp3</groupId>
-                    <artifactId>okhttp</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>4.8.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>logging-interceptor</artifactId>
-            <version>4.8.1</version>
         </dependency>
     </dependencies>
 
diff --git a/pqs-harmonic/harmonic-api/pom.xml b/pqs-harmonic/harmonic-api/pom.xml
index 46f38cced..f865a4f43 100644
--- a/pqs-harmonic/harmonic-api/pom.xml
+++ b/pqs-harmonic/harmonic-api/pom.xml
@@ -52,13 +52,6 @@
             <groupId>com.njcn</groupId>
             <artifactId>pqs-influx</artifactId>
             <version>0.0.1-SNAPSHOT</version>
-            <!--排除okhttp3的依赖-->
-            <exclusions>
-                <exclusion>
-                    <groupId>com.squareup.okhttp3</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
@@ -66,7 +59,6 @@
             <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>com.github.jeffreyning</groupId>
             <artifactId>mybatisplus-plus</artifactId>
diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/utils/PqsComasses.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/PqsComasses.java
similarity index 98%
rename from pqs-common/common-web/src/main/java/com/njcn/web/utils/PqsComasses.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/PqsComasses.java
index e611b01a5..36ce43e44 100644
--- a/pqs-common/common-web/src/main/java/com/njcn/web/utils/PqsComasses.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/PqsComasses.java
@@ -1,4 +1,4 @@
-package com.njcn.web.utils;
+package com.njcn.harmonic.pojo.po;
 
 
 import lombok.Data;
diff --git a/pqs-harmonic/harmonic-boot/pom.xml b/pqs-harmonic/harmonic-boot/pom.xml
index d20f08edd..eae5879d4 100644
--- a/pqs-harmonic/harmonic-boot/pom.xml
+++ b/pqs-harmonic/harmonic-boot/pom.xml
@@ -57,24 +57,6 @@
             <groupId>com.njcn</groupId>
             <artifactId>common-oss</artifactId>
             <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.squareup.okhttp3</groupId>
-                    <artifactId>okhttp</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>4.8.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>logging-interceptor</artifactId>
-            <version>4.8.1</version>
         </dependency>
     </dependencies>
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AssesServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AssesServiceImpl.java
index 7c99e53a7..21a4d4e96 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AssesServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AssesServiceImpl.java
@@ -5,10 +5,10 @@ import cn.hutool.core.date.DateUtil;
 import com.njcn.device.pq.pojo.param.PulicTimeStatisParam;
 import com.njcn.harmonic.mapper.RStatComassesDMapper;
 import com.njcn.harmonic.pojo.po.PQSComAssesPO;
+import com.njcn.harmonic.pojo.po.PqsComasses;
 import com.njcn.harmonic.pojo.vo.AssesVO;
 import com.njcn.harmonic.service.AssesService;
-import com.njcn.web.utils.ComAssesUtil;
-import com.njcn.web.utils.PqsComasses;
+import com.njcn.harmonic.util.ComAssesUtil;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
index 84fb5559b..00c4bd57b 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
@@ -191,25 +191,25 @@ public class CustomReportServiceImpl implements CustomReportService {
     @Override
     public List<ReportTreeVO> deviceUnitTree() {
         List<DictData> dictData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEVICE_UNIT.getCode()).getData();
-        Map<String,String> unit=new HashMap<>();
+        Map<String, String> unit = new HashMap<>();
         List<String> list = dictData.stream().map(DictData::getCode).collect(Collectors.toList());
-        List<ReportTreeVO> info=new ArrayList<>();
-        List<ReportTreeVO> treeVOS=new ArrayList<>();
+        List<ReportTreeVO> info = new ArrayList<>();
+        List<ReportTreeVO> treeVOS = new ArrayList<>();
         ReportTreeVO reportTreeVO;
         for (String s : list) {
-            treeVOS=new ArrayList<>();
+            treeVOS = new ArrayList<>();
             //有效值
-            if(s.equals(DicDataEnum.EFFECTIVE.getCode())){
-                reportTreeVO=new ReportTreeVO();
-                reportTreeVO.setName("$"+s+"#i$");
+            if (s.equals(DicDataEnum.EFFECTIVE.getCode())) {
+                reportTreeVO = new ReportTreeVO();
+                reportTreeVO.setName("$" + s + "#i$");
                 reportTreeVO.setShowName(DicDataEnum.EFFECTIVE.getName());
                 treeVOS.add(reportTreeVO);
-                reportTreeVO=new ReportTreeVO();
-                reportTreeVO.setName("$"+s+"#v$");
+                reportTreeVO = new ReportTreeVO();
+                reportTreeVO.setName("$" + s + "#v$");
                 reportTreeVO.setShowName(DicDataEnum.EFFECTIVE.getName());
                 treeVOS.add(reportTreeVO);
 
-                reportTreeVO=new ReportTreeVO();
+                reportTreeVO = new ReportTreeVO();
                 reportTreeVO.setName(s);
                 reportTreeVO.setShowName(DicDataEnum.EFFECTIVE.getName());
                 reportTreeVO.setChildren(treeVOS);
@@ -300,7 +300,7 @@ public class CustomReportServiceImpl implements CustomReportService {
                 //报表日期
                 .eq(ExcelRpt::getDataDate, reportSearchParam.getStartTime());
         try {
-           List<ExcelRpt> excelRpts  = excelRptMapper.selectList(lambdaQuery);
+            List<ExcelRpt> excelRpts = excelRptMapper.selectList(lambdaQuery);
             if (CollUtil.isNotEmpty(excelRpts)) {
                 fileStorageUtil.downloadStream(response, excelRpts.get(0).getContent());
             } else {
@@ -429,7 +429,7 @@ public class CustomReportServiceImpl implements CustomReportService {
         //根据content，获取v值并进行处理
         List<ReportTemplateDTO> reportTemplateDTOList = new ArrayList<>();
         JSONArray jsonArray;
-        try(InputStream fileStream = fileStorageUtil.getFileStream(excelRptTemp.getContent())) {
+        try (InputStream fileStream = fileStorageUtil.getFileStream(excelRptTemp.getContent())) {
             //通过文件服务器获取
             jsonArray = new JSONArray(new JSONTokener(fileStream, new JSONConfig()));
             jsonArray.forEach(item -> {
@@ -486,7 +486,7 @@ public class CustomReportServiceImpl implements CustomReportService {
                 } else if (InfluxDbSqlConstant.AVG.equalsIgnoreCase(data.getStatMethod())) {
                     assSql(data, sql, endList, InfluxDbSqlConstant.AVG, reportSearchParam);
                 } else if (InfluxDbSqlConstant.CP95.equalsIgnoreCase(data.getStatMethod())) {
-                    assSql(data, sql, endList, InfluxDbSqlConstant.CP95, reportSearchParam);
+                    assSql(data, sql, endList, InfluxDbSqlConstant.PERCENTILE, reportSearchParam);
                 }
             });
         }
@@ -510,19 +510,22 @@ public class CustomReportServiceImpl implements CustomReportService {
                             String v = son.getStr("v");
                             //数据格式：$HA[_25]#B#max#classId$ 或 $HA[_25]#max#classId$
                             if (v.charAt(0) == '$' && v.contains("#")) {
-                                String str = assMap.get(v.replace("$", "")).get(0).getValue();
-                                //没有值，赋"/"
-                                if (StringUtils.isBlank(str)) {
-                                    str = "/";
+                                String str = "";
+                                if(Objects.nonNull(assMap.get(v.replace("$", "")))){
+                                    str = assMap.get(v.replace("$", "")).get(0).getValue();
+                                    //没有值，赋"/"
+                                    if (StringUtils.isBlank(str)) {
+                                        str = "/";
+                                    }
+                                    son.set("v", str);
                                 }
-                                son.set("v", str);
                             }
                             //解决数据单位问题 @指标#类型@
                             if (v.charAt(0) == '@' && v.contains("#")) {
                                 String replace = v.replace("@", "");
-                                if(unit.containsKey(replace)){
+                                if (unit.containsKey(replace)) {
                                     son.set("v", unit.get(replace));
-                                }else{
+                                } else {
                                     son.set("v", "/");
                                 }
 
@@ -553,54 +556,55 @@ public class CustomReportServiceImpl implements CustomReportService {
 
     /**
      * 数据单位信息
+     *
      * @param lineID
      * @return
      */
-    private Map<String,String> unitMap(String lineID){
+    private Map<String, String> unitMap(String lineID) {
         PqsDeviceUnit deviceUnit = deviceUnitClient.lineUnitDetail(lineID).getData();
         List<DictData> dictData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEVICE_UNIT.getCode()).getData();
-        Map<String,String> unit=new HashMap<>();
+        Map<String, String> unit = new HashMap<>();
         List<String> list = dictData.stream().map(DictData::getCode).collect(Collectors.toList());
         for (String s : list) {
             //有效值
-            if(s.equals(DicDataEnum.EFFECTIVE.getCode())){
-                unit.put(s+"#i",deviceUnit.getIeffective());
-                unit.put(s+"#v",deviceUnit.getLineVoltage());
+            if (s.equals(DicDataEnum.EFFECTIVE.getCode())) {
+                unit.put(s + "#i", deviceUnit.getIeffective());
+                unit.put(s + "#v", deviceUnit.getLineVoltage());
             }
             //功率
-            if(s.equals(DicDataEnum.POWER.getCode())){
-                unit.put(s+"#p",deviceUnit.getTotalActiveP());
-                unit.put(s+"#q",deviceUnit.getTotalNoP());
-                unit.put(s+"#s",deviceUnit.getTotalViewP());
+            if (s.equals(DicDataEnum.POWER.getCode())) {
+                unit.put(s + "#p", deviceUnit.getTotalActiveP());
+                unit.put(s + "#q", deviceUnit.getTotalNoP());
+                unit.put(s + "#s", deviceUnit.getTotalViewP());
             }
             //畸变率
-            if(s.equals(DicDataEnum.DISTORTION.getCode())){
-                unit.put(s+"#v",deviceUnit.getVdistortion());
+            if (s.equals(DicDataEnum.DISTORTION.getCode())) {
+                unit.put(s + "#v", deviceUnit.getVdistortion());
             }
             //电压偏差
-            if(s.equals(DicDataEnum.VOLTAGE.getCode())){
-                unit.put(s+"#v",deviceUnit.getVoltageDev());
+            if (s.equals(DicDataEnum.VOLTAGE.getCode())) {
+                unit.put(s + "#v", deviceUnit.getVoltageDev());
             }
             //频率
-            if(s.equals(DicDataEnum.UNIT_FREQUENCY.getCode())){
-                unit.put(s+"#freq",deviceUnit.getUnitFrequency());
-                unit.put(s+"#freqDev",deviceUnit.getUnitFrequencyDev());
+            if (s.equals(DicDataEnum.UNIT_FREQUENCY.getCode())) {
+                unit.put(s + "#freq", deviceUnit.getUnitFrequency());
+                unit.put(s + "#freqDev", deviceUnit.getUnitFrequencyDev());
             }
             //三项不平衡度
-            if(s.equals(DicDataEnum.UNBALANCE.getCode())){
-                unit.put(s+"#v","%");
-                unit.put(s+"#vPos",deviceUnit.getPositiveV());
-                unit.put(s+"#vNeg",deviceUnit.getNoPositiveV());
-                unit.put(s+"#vZero",deviceUnit.getNoPositiveV());
-                unit.put(s+"#i","%");
-                unit.put(s+"#iPos","A");
-                unit.put(s+"#iNeg","A");
-                unit.put(s+"#iZero","A");
+            if (s.equals(DicDataEnum.UNBALANCE.getCode())) {
+                unit.put(s + "#v", "%");
+                unit.put(s + "#vPos", deviceUnit.getPositiveV());
+                unit.put(s + "#vNeg", deviceUnit.getNoPositiveV());
+                unit.put(s + "#vZero", deviceUnit.getNoPositiveV());
+                unit.put(s + "#i", "%");
+                unit.put(s + "#iPos", "A");
+                unit.put(s + "#iNeg", "A");
+                unit.put(s + "#iZero", "A");
             }
             //基波
-            if(s.equals(DicDataEnum.FUND.getCode())){
-                unit.put(s+"#i",deviceUnit.getIfund());
-                unit.put(s+"#v",deviceUnit.getVfundEffective());
+            if (s.equals(DicDataEnum.FUND.getCode())) {
+                unit.put(s + "#i", deviceUnit.getIfund());
+                unit.put(s + "#v", deviceUnit.getVfundEffective());
 
             }
         }
@@ -616,7 +620,7 @@ public class CustomReportServiceImpl implements CustomReportService {
         //sql拼接示例：select MAX(IHA2) as IHA2 from power_quality_data where Phase = 'A' and LineId='1324564568' and Stat_Method='max' tz('Asia/Shanghai')
 
         //cp95函数特殊处理 PERCENTILE(field_key, N)
-        if (InfluxDbSqlConstant.CP95.equals(method)) {
+        if (InfluxDbSqlConstant.PERCENTILE.equals(method)) {
             sql.append(method)
                     .append(InfluxDbSqlConstant.LBK)
                     .append(data.getTemplateName())
@@ -660,11 +664,13 @@ public class CustomReportServiceImpl implements CustomReportService {
         }
 
         //频率和频率偏差仅统计T相
-        if(data.getTemplateName().equals("freq_dev") || data.getTemplateName().equals("freq")){
+        if (data.getTemplateName().equals("freq_dev") || data.getTemplateName().equals("freq")) {
             sql.append(InfluxDbSqlConstant.AND)
                     .append(InfluxDBTableConstant.PHASIC_TYPE)
                     .append(InfluxDbSqlConstant.EQ)
-                    .append(InfluxDBTableConstant.PHASE_TYPE_T);
+                    .append(InfluxDbSqlConstant.QM)
+                    .append(InfluxDBTableConstant.PHASE_TYPE_T)
+                    .append(InfluxDbSqlConstant.QM);
         }
         //时间范围处理
         sql
@@ -675,12 +681,21 @@ public class CustomReportServiceImpl implements CustomReportService {
 
         sql.append(InfluxDbSqlConstant.TZ);
 
+        if (data.getTemplateName().equals("freq_dev") || data.getTemplateName().equals("freq")) {
+            System.out.println(sql);
+        }
+
+
         //根据不同的库表赋值
-        StatisticalDataDTO statisticalDataDTO =  commonService.selectBySql(sql);
-        data.setValue(String.format("%.3f",statisticalDataDTO.getValue()));
+        StatisticalDataDTO statisticalDataDTO = commonService.selectBySql(sql);
+        if (Objects.isNull(statisticalDataDTO)) {
+            data.setValue("/");
+        } else {
+
+            data.setValue(String.format("%.3f", statisticalDataDTO.getValue()));
+        }
         endList.add(data);
     }
 
 
-
 }
diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/utils/ComAssesUtil.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/util/ComAssesUtil.java
similarity index 99%
rename from pqs-common/common-web/src/main/java/com/njcn/web/utils/ComAssesUtil.java
rename to pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/util/ComAssesUtil.java
index e3ae32e17..699406c5d 100644
--- a/pqs-common/common-web/src/main/java/com/njcn/web/utils/ComAssesUtil.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/util/ComAssesUtil.java
@@ -1,6 +1,8 @@
-package com.njcn.web.utils;
+package com.njcn.harmonic.util;
 
 
+import com.njcn.harmonic.pojo.po.PqsComasses;
+import com.njcn.web.utils.FloatUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
diff --git a/pqs-influx/pom.xml b/pqs-influx/pom.xml
index 204bd243a..68a1cfb22 100644
--- a/pqs-influx/pom.xml
+++ b/pqs-influx/pom.xml
@@ -17,42 +17,21 @@
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
     <dependencies>
+
         <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>influxdb-springboot-starter</artifactId>
             <version>1.0.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.squareup.okhttp3</groupId>
-                    <artifactId>okhttp</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.squareup.okhttp3</groupId>
-                    <artifactId>logging-interceptor</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>4.9.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>logging-interceptor</artifactId>
-            <version>4.9.0</version>
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>system-api</artifactId>
             <version>1.0.0</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>cs-device-api</artifactId>
             <version>1.0.0</version>
-            <scope>compile</scope>
         </dependency>
     </dependencies>
 
diff --git a/pqs-prepare/prepare-boot/pom.xml b/pqs-prepare/prepare-boot/pom.xml
index c53d96a6e..519d84ae8 100644
--- a/pqs-prepare/prepare-boot/pom.xml
+++ b/pqs-prepare/prepare-boot/pom.xml
@@ -115,15 +115,6 @@
             <artifactId>common-oss</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>4.8.1</version>
-        </dependency>
-
-
         <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>prepare-api</artifactId>
diff --git a/pqs-process/process-boot/pom.xml b/pqs-process/process-boot/pom.xml
index c4aebed81..49539d5fe 100644
--- a/pqs-process/process-boot/pom.xml
+++ b/pqs-process/process-boot/pom.xml
@@ -113,6 +113,18 @@
             <artifactId>http-client</artifactId>
             <version>1.1.5.11</version>
         </dependency>
+
+        <!--liteFlow相关依赖-->
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>liteflow-spring-boot-starter</artifactId>
+            <version>2.10.7</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>liteflow-rule-nacos</artifactId>
+            <version>2.10.7</version>
+        </dependency>
     </dependencies>
 
     <build>

From 744408ff089e0b6335b950c723940acf80002e2a Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Thu, 7 Sep 2023 16:43:06 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/harmonic/service/impl/CustomReportServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
index 00c4bd57b..3f83a3861 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
@@ -484,7 +484,7 @@ public class CustomReportServiceImpl implements CustomReportService {
                 } else if (InfluxDbSqlConstant.MIN.equalsIgnoreCase(data.getStatMethod())) {
                     assSql(data, sql, endList, InfluxDbSqlConstant.MIN, reportSearchParam);
                 } else if (InfluxDbSqlConstant.AVG.equalsIgnoreCase(data.getStatMethod())) {
-                    assSql(data, sql, endList, InfluxDbSqlConstant.AVG, reportSearchParam);
+                    assSql(data, sql, endList, InfluxDbSqlConstant.MEAN, reportSearchParam);
                 } else if (InfluxDbSqlConstant.CP95.equalsIgnoreCase(data.getStatMethod())) {
                     assSql(data, sql, endList, InfluxDbSqlConstant.PERCENTILE, reportSearchParam);
                 }

From 6caa2785b23350d5d417b8cfae594c9d9254af62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Thu, 7 Sep 2023 19:35:53 +0800
Subject: [PATCH 09/14] =?UTF-8?q?bug=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/njcn/device/pq/pojo/dto/OverLimitLineDTO.java  | 2 ++
 .../java/com/njcn/device/pq/mapper/mapping/LineMapper.xml   | 6 ++++--
 .../java/com/njcn/harmonic/pojo/vo/MonitorOverLimitVO.java  | 3 +++
 .../njcn/harmonic/service/impl/IntegrityServiceImpl.java    | 4 +++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/OverLimitLineDTO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/OverLimitLineDTO.java
index e4448ebde..c27417a1f 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/OverLimitLineDTO.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/OverLimitLineDTO.java
@@ -18,6 +18,8 @@ public class OverLimitLineDTO {
 
     private String lineScale;
 
+    private String manufacturer;
+
     private String loadType;
 
     private String lineObjectName;
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
index c8abae46d..b85f379c9 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
@@ -667,7 +667,8 @@
         A4.`Name` subName,
         C3.`Name` subScale,
         A5.`Name` cityCompany,
-        F.`Name` provinceCompany
+        F.`Name` provinceCompany,
+        dev.Manufacturer
         FROM
         pq_line A1,
         pq_line A2,
@@ -676,6 +677,7 @@
         pq_line A5,
         pq_line A6,
         pq_voltage B,
+        pq_device dev,
         sys_dict_data C1,
         sys_dict_data C2,
         sys_dict_data C3,
@@ -689,7 +691,7 @@
         </foreach>
         AND A1.Pid = A2.Id AND A2.Id = B.Id AND B.Scale = C1.Id AND A1.Id = D.Id AND D.Load_Type = C2.Id
         AND A2.Pid = A3.Id AND A3.Pid = A4.Id AND A4.Pid = A5.Id AND A4.Id = E.Id AND E.Scale = C3.Id
-        AND A5.Pid = A6.Id AND A6.`Name` = F.Area_Code
+        AND A5.Pid = A6.Id AND A6.`Name` = F.Area_Code and A3.id = dev.id
     </select>
 
     <select id="getDeviceStatus" resultType="LineStateVO">
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/MonitorOverLimitVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/MonitorOverLimitVO.java
index 25da796d0..df9e116af 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/MonitorOverLimitVO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/MonitorOverLimitVO.java
@@ -34,6 +34,9 @@ public class MonitorOverLimitVO {
     @ApiModelProperty("监测点电压等级")
     private String lineScale;
 
+    @ApiModelProperty("厂家")
+    private String manufacturer;
+
     @ApiModelProperty("变电站名称")
     private String subName;
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java
index d74c414b6..bb5c03667 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java
@@ -180,7 +180,9 @@ public class IntegrityServiceImpl implements IntegrityService {
                 outParam.setType(generalDeviceDTO.getName());
                 //根据监测点查询数据完整性
                 List<PublicDTO> integrityData = getCondition(lineIndexes, integrityIconParam.getSearchBeginTime(), integrityIconParam.getSearchEndTime());
-                outParam.setSingle(NumberUtil.round(integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159), 2).doubleValue());
+
+                double temSingle = integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159);
+                outParam.setSingle(temSingle == 3.14159 ? temSingle :NumberUtil.round(temSingle, 2).doubleValue());
                 //如果存在需要比较的时间，再获取对应数据
                 if (StrUtil.isNotBlank(integrityIconParam.getPeriodBeginTime()) && StrUtil.isNotBlank(integrityIconParam.getPeriodEndTime())) {
                     List<PublicDTO> compareData = getCondition(lineIndexes, integrityIconParam.getPeriodBeginTime(), integrityIconParam.getPeriodEndTime());

From 8fa7e6521ab23778927694692eae4a9c6505b010 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Thu, 7 Sep 2023 19:43:09 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/harmonic/service/impl/CustomReportServiceImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
index 3f83a3861..fdc0f9016 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
@@ -483,8 +483,8 @@ public class CustomReportServiceImpl implements CustomReportService {
                     assSql(data, sql, endList, InfluxDbSqlConstant.MAX, reportSearchParam);
                 } else if (InfluxDbSqlConstant.MIN.equalsIgnoreCase(data.getStatMethod())) {
                     assSql(data, sql, endList, InfluxDbSqlConstant.MIN, reportSearchParam);
-                } else if (InfluxDbSqlConstant.AVG.equalsIgnoreCase(data.getStatMethod())) {
-                    assSql(data, sql, endList, InfluxDbSqlConstant.MEAN, reportSearchParam);
+                } else if (InfluxDbSqlConstant.AVG_WEB.equalsIgnoreCase(data.getStatMethod())) {
+                    assSql(data, sql, endList, InfluxDbSqlConstant.AVG, reportSearchParam);
                 } else if (InfluxDbSqlConstant.CP95.equalsIgnoreCase(data.getStatMethod())) {
                     assSql(data, sql, endList, InfluxDbSqlConstant.PERCENTILE, reportSearchParam);
                 }

From 5082cdfa76d0e385058ceb5b2a7a5d2a5f2aadae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Thu, 7 Sep 2023 20:10:55 +0800
Subject: [PATCH 11/14] =?UTF-8?q?bug=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pqs-device/device-boot/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pqs-device/device-boot/pom.xml b/pqs-device/device-boot/pom.xml
index 31b3226c9..f1f863f5c 100644
--- a/pqs-device/device-boot/pom.xml
+++ b/pqs-device/device-boot/pom.xml
@@ -21,16 +21,16 @@
     <dependencies>
 
         <!--pq-device-boot和pms-device-boot只能选择一个-->
-        <dependency>
+        <!--<dependency>
             <groupId>com.njcn</groupId>
             <artifactId>pq-device-boot</artifactId>
             <version>${project.version}</version>
-        </dependency>
-       <!-- <dependency>
+        </dependency>-->
+        <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>pms-device-boot</artifactId>
             <version>${project.version}</version>
-        </dependency>-->
+        </dependency>
 
         <dependency>
             <groupId>com.njcn</groupId>

From 4322f0578683816a114210b87b0e8bfb6a8d53ad Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Thu, 7 Sep 2023 20:40:08 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=9A=82=E6=80=81?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E3=80=81=E6=96=87=E4=BB=B6=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=8F=82=E6=95=B0=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/mq/constant/BusinessTopic.java   |  3 ++
 .../mq/template/AppFileMessageTemplate.java   |  4 +-
 .../AppFileStreamMessageTemplate.java         | 30 +++++++++++++
 .../com/njcn/oss/utils/FileStorageUtil.java   | 43 ++++++++++++++++++-
 .../njcn/redis/pojo/enums/AppRedisKey.java    |  2 +
 5 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppFileStreamMessageTemplate.java

diff --git a/pqs-common/common-mq/src/main/java/com/njcn/mq/constant/BusinessTopic.java b/pqs-common/common-mq/src/main/java/com/njcn/mq/constant/BusinessTopic.java
index 6895b104f..d63ec7633 100644
--- a/pqs-common/common-mq/src/main/java/com/njcn/mq/constant/BusinessTopic.java
+++ b/pqs-common/common-mq/src/main/java/com/njcn/mq/constant/BusinessTopic.java
@@ -28,6 +28,9 @@ public interface BusinessTopic {
      */
     String NJCN_APP_FILE_TOPIC = "njcnAppFileTopic";
 
+    String NJCN_APP_FILE_STREAM_TOPIC = "njcnAppFileStreamTopic";
+
+
 
     /********************************数据中心*********************************/
 
diff --git a/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppFileMessageTemplate.java b/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppFileMessageTemplate.java
index 94d4c9ee2..23e8b864b 100644
--- a/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppFileMessageTemplate.java
+++ b/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppFileMessageTemplate.java
@@ -22,9 +22,9 @@ public class AppFileMessageTemplate extends RocketMQEnhanceTemplate {
         super(template);
     }
 
-    public SendResult sendMember(AppFileMessage appFileMessage, String tag) {
+    public SendResult sendMember(AppFileMessage appFileMessage) {
         appFileMessage.setSource(BusinessResource.APP_RESOURCE);
-        return send(BusinessTopic.NJCN_APP_FILE_TOPIC, tag, appFileMessage);
+        return send(BusinessTopic.NJCN_APP_FILE_TOPIC, BusinessTopic.FileTag.INFO_TAG, appFileMessage);
     }
 
 }
diff --git a/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppFileStreamMessageTemplate.java b/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppFileStreamMessageTemplate.java
new file mode 100644
index 000000000..d03461380
--- /dev/null
+++ b/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppFileStreamMessageTemplate.java
@@ -0,0 +1,30 @@
+package com.njcn.mq.template;
+
+import com.njcn.middle.rocket.template.RocketMQEnhanceTemplate;
+import com.njcn.mq.constant.BusinessResource;
+import com.njcn.mq.constant.BusinessTopic;
+import com.njcn.mq.message.AppFileMessage;
+import org.apache.rocketmq.client.producer.SendResult;
+import org.apache.rocketmq.spring.core.RocketMQTemplate;
+import org.springframework.stereotype.Component;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/8/11 15:28
+ */
+@Component
+public class AppFileStreamMessageTemplate extends RocketMQEnhanceTemplate {
+
+    public AppFileStreamMessageTemplate(RocketMQTemplate template) {
+        super(template);
+    }
+
+    public SendResult sendMember(AppFileMessage appFileMessage) {
+        appFileMessage.setSource(BusinessResource.APP_RESOURCE);
+        return send(BusinessTopic.NJCN_APP_FILE_STREAM_TOPIC, BusinessTopic.FileTag.STREAM_TAG, appFileMessage);
+    }
+
+}
diff --git a/pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java b/pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java
index a2b02a079..ae8673b49 100644
--- a/pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java
+++ b/pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java
@@ -10,6 +10,8 @@ import com.njcn.minioss.config.MinIossProperties;
 import com.njcn.minioss.util.MinIoUtils;
 import com.njcn.oss.constant.GeneralConstant;
 import com.njcn.oss.enums.OssResponseEnum;
+import io.minio.MinioClient;
+import io.minio.PutObjectArgs;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.tomcat.util.http.fileupload.IOUtils;
@@ -17,8 +19,10 @@ import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.util.Optional;
 import java.util.UUID;
 
 /**
@@ -31,6 +35,9 @@ import java.util.UUID;
 @RequiredArgsConstructor
 public class FileStorageUtil {
 
+    @Resource
+    private MinioClient instance;
+
     private final GeneralInfo generalInfo;
 
     /***
@@ -99,6 +106,31 @@ public class FileStorageUtil {
         return filePath;
     }
 
+    /**
+     * 上传InputStream流,并指定文件的名称
+     * @author xuyang
+     * @param inputStream
+     * @param dir
+     * @param fileName
+     * @return
+     */
+    public String uploadStreamSpecifyName(InputStream inputStream, String dir, String fileName) {
+        String filePath;
+        if (generalInfo.getBusinessFileStorage() == GeneralConstant.HUAWEI_OBS) {
+            filePath = dir + minIoUtils.minFileName(fileName);
+            obsUtil.uploadStream(inputStream, filePath);
+        } else {
+            try {
+                //把名称存入数据
+                MinIoUploadResDTO minIoUploadResDTO = uploadStreamSpecifyName(inputStream, minIossProperties.getBucket(), dir, fileName);
+                filePath = minIoUploadResDTO.getMinFileName();
+            } catch (Exception e) {
+                throw new BusinessException(OssResponseEnum.UPLOAD_FILE_ERROR);
+            }
+        }
+        return filePath;
+    }
+
 
     /***
      * 根据文件路径获取文件短期的一个url
@@ -221,6 +253,15 @@ public class FileStorageUtil {
         }
     }
 
-
+    public MinIoUploadResDTO uploadStreamSpecifyName(InputStream inputStream, String bucketName, String directory, String fileName) throws Exception {
+        if (!minIoUtils.bucketExists(bucketName)) {
+            minIoUtils.makeBucket(bucketName);
+        }
+        directory = (String) Optional.ofNullable(directory).orElse("");
+        String minFileName = directory + fileName;
+        this.instance.putObject((PutObjectArgs)((io.minio.PutObjectArgs.Builder)((io.minio.PutObjectArgs.Builder)PutObjectArgs.builder().bucket(bucketName)).object(minFileName)).stream(inputStream, (long)inputStream.available(), -1L).build());
+        inputStream.close();
+        return new MinIoUploadResDTO(minFileName, minIoUtils.getObjectUrl(bucketName, minFileName, 60));
+    }
 
 }
diff --git a/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java b/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java
index dad7a7073..6303fd5e8 100644
--- a/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java
+++ b/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java
@@ -51,4 +51,6 @@ public interface AppRedisKey {
      */
     String RMQ_FILE_CONSUME_KEY="rocketMQFileConsumeKey:";
 
+    String TIME="time-:";
+
 }

From 297854b4e543de7edf43d55396c5a9543f074598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Fri, 8 Sep 2023 08:50:32 +0800
Subject: [PATCH 13/14] =?UTF-8?q?bug=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pqs-process/process-boot/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pqs-process/process-boot/pom.xml b/pqs-process/process-boot/pom.xml
index 49539d5fe..85acd5733 100644
--- a/pqs-process/process-boot/pom.xml
+++ b/pqs-process/process-boot/pom.xml
@@ -115,7 +115,7 @@
         </dependency>
 
         <!--liteFlow相关依赖-->
-        <dependency>
+       <!-- <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-spring-boot-starter</artifactId>
             <version>2.10.7</version>
@@ -124,7 +124,7 @@
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-rule-nacos</artifactId>
             <version>2.10.7</version>
-        </dependency>
+        </dependency>-->
     </dependencies>
 
     <build>

From 8b79ce0e36df72fc1c8fa83510b7f30edd8e1746 Mon Sep 17 00:00:00 2001
From: hanyong <1334742946@qq.com>
Date: Mon, 11 Sep 2023 08:57:29 +0800
Subject: [PATCH 14/14] =?UTF-8?q?device=E7=9A=84pom=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E4=B8=BApq?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pqs-device/device-boot/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pqs-device/device-boot/pom.xml b/pqs-device/device-boot/pom.xml
index f1f863f5c..d881e47d5 100644
--- a/pqs-device/device-boot/pom.xml
+++ b/pqs-device/device-boot/pom.xml
@@ -21,16 +21,16 @@
     <dependencies>
 
         <!--pq-device-boot和pms-device-boot只能选择一个-->
-        <!--<dependency>
+        <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>pq-device-boot</artifactId>
             <version>${project.version}</version>
-        </dependency>-->
-        <dependency>
+        </dependency>
+     <!--   <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>pms-device-boot</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>com.njcn</groupId>