1.台账增加默认排序

2.增加场站/用户监测规模接口

pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/dto/waveAnalysis/AnalyWave.java

@@ -26,8 +26,6 @@ import java.util.*;
 public class AnalyWave {
 
 
-
-
     /*****************************************
      * 解析comtrate文件工具类
      * author yexb根据Ww算法装换
@@ -94,7 +92,7 @@ public class AnalyWave {
      ** ** strFilePath *** cfg文件路径
      * *** auth *** 读取方式 null则使用本地读取方式读取
      ******************************************/
-    public AnalyWaveModel.tagDataValue readComtrade(List<String> temCfgList,byte[] array, int iFlag) {
+    public AnalyWaveModel.tagDataValue readComtrade(List<String> temCfgList, byte[] array, int iFlag) {
         //初始化参数
         ComtradeCfg = new AnalyWaveModel.tagComtradeCfg();
         RatesCfg = new AnalyWaveModel.tagRates();
@@ -163,148 +161,145 @@ public class AnalyWave {
         iterable.next();
         String[] strTempArray;// 读取cfg文件
         try {
-                nFreq = 0f;//WW 2019-11-14
+            nFreq = 0f;//WW 2019-11-14
-                String strFileLine = iterable.next();
+            String strFileLine = iterable.next();
+            strTempArray = strFileLine.split(",");
+
+            for (int i = 0; i < strTempArray.length; i++) {
+                switch (i) {
+                    case 0:// 总个数
+                        ComtradeCfg.nChannelNum = Integer.parseInt(strTempArray[i]);
+                        break;
+                    case 1:// 模拟量的个数
+                    {
+                        String str = strTempArray[i].substring(0, strTempArray[i].length() - 1);
+                        ComtradeCfg.nAnalogNum = Integer.parseInt(str);
+                    }
+                    break;
+                    case 2:// 开关量的个数
+                    {
+                        String str = strTempArray[i].substring(0, strTempArray[i].length() - 1);
+                        ComtradeCfg.nDigitalNum = Integer.parseInt(str);
+                    }
+                    break;
+                }
+            }
+
+            // 从第三行到第ComtradeCfg.nChannelNum+3行是模拟量通道和数字量通道
+            for (int i = 0; i < ComtradeCfg.nChannelNum; i++) {
+                AnalyWaveModel.tagOneChannleCfg OneChannlecfg = new AnalyWaveModel.tagOneChannleCfg();
+                ComtradeCfg.OneChannleCfg.add(OneChannlecfg);
+
+                strFileLine = iterable.next();
+                strTempArray = strFileLine.split(",");
+                // 配置总共13项
+                for (int j = 0; j < strTempArray.length; j++) {
+                    switch (j) {
+                        case 0:// 通道序号
+                            OneChannlecfg.nIndex = Integer.parseInt(strTempArray[j]);
+                            break;
+                        case 1:// 通道名称
+                            OneChannlecfg.szChannleName = strTempArray[j];
+                            break;
+                        case 2:// 相位名称
+                            OneChannlecfg.szPhasicName = strTempArray[j];
+                            break;
+                        case 3:// 监视的通道名称
+                            OneChannlecfg.szMonitoredChannleName = strTempArray[j];
+                            break;
+                        case 4:// 通道的单位
+                            OneChannlecfg.szUnitName = strTempArray[j];
+                            break;
+                        case 5:// 通道的系数
+                            OneChannlecfg.fCoefficent = Float.parseFloat(strTempArray[j]);
+                            break;
+                        case 6:// 通道的偏移量
+                            OneChannlecfg.fOffset = Float.parseFloat(strTempArray[j]);
+                            break;
+                        case 7:// 起始采样时间的偏移量
+                            OneChannlecfg.fTimeOffset = Float.parseFloat(strTempArray[j]);
+                            break;
+                        case 8:// 采样值的最小值
+                            OneChannlecfg.nMin = Integer.parseInt(strTempArray[j]);
+                            break;
+                        case 9:// 采样值的最大值
+                            OneChannlecfg.nMax = Integer.parseInt(strTempArray[j]);
+                            break;
+                        case 10:// 一次变比
+                            OneChannlecfg.fPrimary = Float.parseFloat(strTempArray[j]);
+                            break;
+                        case 11:// 二次变比
+                            OneChannlecfg.fSecondary = Float.parseFloat(strTempArray[j]);
+                            break;
+                        case 12:// 一次值还是二次值标志
+                            OneChannlecfg.szValueType = strTempArray[j];
+                            break;
+                    }
+                }
+            }
+            // 采样频率
+            strFileLine = iterable.next();
+            float fFreq = Float.parseFloat(strFileLine);
+            nFreq = (float) fFreq;//WW 2019-11-14
+            // 采样段数
+            strFileLine = iterable.next();
+            int nRates = Integer.parseInt(strFileLine);
+            RatesCfg.nRates = nRates;
+            // 获得每段的采样率
+            long nOffset = 0;
+            for (int i = 0; i < nRates; i++) {
+                strFileLine = iterable.next();
                 strTempArray = strFileLine.split(",");
 
-                for (int i = 0; i < strTempArray.length; i++) {
+                AnalyWaveModel.tagOneRate OneRate = new AnalyWaveModel.tagOneRate();
-                    switch (i) {
+                RatesCfg.OneRate.add(OneRate);
-                        case 0:// 总个数
+
-                            ComtradeCfg.nChannelNum = Integer.parseInt(strTempArray[i]);
+                for (int j = 0; j < strTempArray.length; j++) {
+
+                    switch (j) {
+                        case 0:// 单周波采样点数
+                            OneRate.nOneSample = (int) (Float.parseFloat(strTempArray[j]) / nFreq);//WW 2019-11-14
+                            break;
+                        case 1:// 总点数 //这里的strTemp是一个偏移量
+                            OneRate.nSampleNum = (long) (Float.parseFloat(strTempArray[j]) - nOffset);
+                            nOffset += OneRate.nSampleNum;
                             break;
-                        case 1:// 模拟量的个数
-                        {
-                            String str = strTempArray[i].substring(0, strTempArray[i].length() - 1);
-                            ComtradeCfg.nAnalogNum = Integer.parseInt(str);
-                        }
-                        break;
-                        case 2:// 开关量的个数
-                        {
-                            String str = strTempArray[i].substring(0, strTempArray[i].length() - 1);
-                            ComtradeCfg.nDigitalNum = Integer.parseInt(str);
-                        }
-                        break;
                     }
                 }
+            }
 
-                // 从第三行到第ComtradeCfg.nChannelNum+3行是模拟量通道和数字量通道
+            SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss.SSS");
-                for (int i = 0; i < ComtradeCfg.nChannelNum; i++) {
+            // 波形起始时间
-                    AnalyWaveModel.tagOneChannleCfg OneChannlecfg = new AnalyWaveModel.tagOneChannleCfg();
+            strFileLine = iterable.next();
-                    ComtradeCfg.OneChannleCfg.add(OneChannlecfg);
+            strFileLine = strFileLine.substring(0, strFileLine.length() - 3).replace(",", " ");
-
+            TimeTrige = sdf.parse(strFileLine);
-                    strFileLine = iterable.next();
+            // 暂态触发时间
-                    strTempArray = strFileLine.split(",");
+            strFileLine = iterable.next();
-                    // 配置总共13项
+            strFileLine = strFileLine.substring(0, strFileLine.length() - 3).replace(",", " ");
-                    for (int j = 0; j < strTempArray.length; j++) {
+            TimeWave = sdf.parse(strFileLine);
-                        switch (j) {
-                            case 0:// 通道序号
-                                OneChannlecfg.nIndex = Integer.parseInt(strTempArray[j]);
-                                break;
-                            case 1:// 通道名称
-                                OneChannlecfg.szChannleName = strTempArray[j];
-                                break;
-                            case 2:// 相位名称
-                                OneChannlecfg.szPhasicName = strTempArray[j];
-                                break;
-                            case 3:// 监视的通道名称
-                                OneChannlecfg.szMonitoredChannleName = strTempArray[j];
-                                break;
-                            case 4:// 通道的单位
-                                OneChannlecfg.szUnitName = strTempArray[j];
-                                break;
-                            case 5:// 通道的系数
-                                OneChannlecfg.fCoefficent = Float.parseFloat(strTempArray[j]);
-                                break;
-                            case 6:// 通道的偏移量
-                                OneChannlecfg.fOffset = Float.parseFloat(strTempArray[j]);
-                                break;
-                            case 7:// 起始采样时间的偏移量
-                                OneChannlecfg.fTimeOffset = Float.parseFloat(strTempArray[j]);
-                                break;
-                            case 8:// 采样值的最小值
-                                OneChannlecfg.nMin = Integer.parseInt(strTempArray[j]);
-                                break;
-                            case 9:// 采样值的最大值
-                                OneChannlecfg.nMax = Integer.parseInt(strTempArray[j]);
-                                break;
-                            case 10:// 一次变比
-                                OneChannlecfg.fPrimary = Float.parseFloat(strTempArray[j]);
-                                break;
-                            case 11:// 二次变比
-                                OneChannlecfg.fSecondary = Float.parseFloat(strTempArray[j]);
-                                break;
-                            case 12:// 一次值还是二次值标志
-                                OneChannlecfg.szValueType = strTempArray[j];
-                                break;
-                        }
-                    }
-                }
-                // 采样频率
-                strFileLine = iterable.next();
-                float fFreq = Float.parseFloat(strFileLine);
-                nFreq = (float) fFreq;//WW 2019-11-14
-                // 采样段数
-                strFileLine = iterable.next();
-                int nRates = Integer.parseInt(strFileLine);
-                RatesCfg.nRates = nRates;
-                // 获得每段的采样率
-                long nOffset = 0;
-                for (int i = 0; i < nRates; i++) {
-                    strFileLine = iterable.next();
-                    strTempArray = strFileLine.split(",");
-
-                    AnalyWaveModel.tagOneRate OneRate = new AnalyWaveModel.tagOneRate();
-                    RatesCfg.OneRate.add(OneRate);
-
-                    for (int j = 0; j < strTempArray.length; j++) {
-
-                        switch (j) {
-                            case 0:// 单周波采样点数
-                                OneRate.nOneSample = (int) (Float.parseFloat(strTempArray[j]) / nFreq);//WW 2019-11-14
-                                break;
-                            case 1:// 总点数 //这里的strTemp是一个偏移量
-                                OneRate.nSampleNum = (long) (Float.parseFloat(strTempArray[j]) - nOffset);
-                                nOffset += OneRate.nSampleNum;
-                                break;
-                        }
-                    }
-                }
-
-                SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss.SSS");
-                // 波形起始时间
-                strFileLine = iterable.next();
-                strFileLine = strFileLine.substring(0, strFileLine.length() - 3).replace(",", " ");
-                TimeTrige = sdf.parse(strFileLine);
-                // 暂态触发时间
-                strFileLine = iterable.next();
-                strFileLine = strFileLine.substring(0, strFileLine.length() - 3).replace(",", " ");
-                TimeWave = sdf.parse(strFileLine);
-
-                Calendar calendar = Calendar.getInstance();
-                calendar.setTime(TimeWave);
-                firstMs = calendar.get(Calendar.MILLISECOND);
-                firstTime = calendar.getTime();
-
-                long a = TimeWave.getTime();
-                long b = TimeTrige.getTime();
-                int c = (int) (a - b);
-                if (c >= 90 && c <= 110) {
-                    iPush = 100;
-                } else if (c >= 190 && c <= 210) {
-                    iPush = 200;
-                }
-                // 赋值编码格式（二进制）
-                strBinType = iterable.next().toUpperCase();
 
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(TimeWave);
+            firstMs = calendar.get(Calendar.MILLISECOND);
+            firstTime = calendar.getTime();
 
+            long a = TimeWave.getTime();
+            long b = TimeTrige.getTime();
+            int c = (int) (a - b);
+            if (c >= 90 && c <= 110) {
+                iPush = 100;
+            } else if (c >= 190 && c <= 210) {
+                iPush = 200;
+            }
+            // 赋值编码格式（二进制）
+            strBinType = iterable.next().toUpperCase();
 
 
         } catch (Exception e) {
             e.printStackTrace();
-            logger.error("读取文件内容出错"+e.getMessage());
+            logger.error("读取文件内容出错" + e.getMessage());
             return false;
-        }finally {
+        } finally {
-
 
 
         }
@@ -319,15 +314,8 @@ public class AnalyWave {
     private List<List<Float>> AnalyseComtradeDat(byte[] array, int iFlag) {
         float xValueAll = 0;//初始化xValue的值
         boolean blxValue = false;//判断是否首次登陆
-
         List<List<Float>> listWaveData = new ArrayList<>();//返回数据
-
-
         try {
-
-
-
-
             // 计算每个单独的数据块的大小 4字节的序号 4字节的时间 2字节的值
             // 示例中的排布是 4字节的序号 4字节的时间 UA(2字节) UB(2字节) UC(2字节) IA(2字节) IB(2字节)
             // IC(2字节)
@@ -470,7 +458,7 @@ public class AnalyWave {
                             {
                                 if (ComtradeCfg.OneChannleCfg.get(j).fPrimary != 0.0f)//根据cfg内的变比，将一次值转换成二次值
                                 {
-                                    fValue = ComtradeCfg.OneChannleCfg.get(j).fSecondary / ComtradeCfg.OneChannleCfg.get(j).fPrimary;
+                                    fValue = fValue * ComtradeCfg.OneChannleCfg.get(j).fSecondary / ComtradeCfg.OneChannleCfg.get(j).fPrimary;
                                 } else {
                                     fValue = fValue;
                                 }
@@ -500,7 +488,7 @@ public class AnalyWave {
         } catch (Exception e) {
             logger.error("读取文件出错：" + e.getMessage());
             return listWaveData;
-        }finally {
+        } finally {
 
         }
 

pqs-advance/advance-boot/src/main/java/com/njcn/advance/event/service/impl/EventAdvanceServiceImpl.java

@@ -7,7 +7,6 @@ import com.njcn.advance.event.cause.model.DataFeature;
 import com.njcn.advance.event.type.jna.*;
 import com.njcn.advance.pojo.dto.EventAnalysisDTO;
 import com.njcn.advance.event.service.IEventAdvanceService;
-import com.njcn.advance.pojo.dto.waveAnalysis.Rect;
 import com.njcn.advance.utils.Utils;
 import com.njcn.common.config.GeneralInfo;
 import com.njcn.common.pojo.exception.BusinessException;
@@ -26,6 +25,8 @@ import java.io.File;
 import java.io.InputStream;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * @author hongawen
@@ -43,10 +44,14 @@ public class EventAdvanceServiceImpl implements IEventAdvanceService {
 
     private final FileStorageUtil fileStorageUtil;
 
+    private final Lock lock = new ReentrantLock();
 
     @Override
     public EventAnalysisDTO analysisCauseAndType(EventAnalysisDTO eventAnalysis) {
-        WaveDataDTO waveDataDTO;
+        //由于计算原因是异步操作，这里需要加锁不然JNI调用ddl文件会存在内存Invalid memory access
+        lock.lock();
+        try {
+            WaveDataDTO waveDataDTO;
         String waveName = eventAnalysis.getWaveName();
         String wlFilePath = eventAnalysis.getWlFilePath();
         String cfgPath, datPath, cfgPath2, datPath2;
@@ -75,7 +80,7 @@ public class EventAdvanceServiceImpl implements IEventAdvanceService {
                 if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) {
                     throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
                 }
-                waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 0);
+                waveDataDTO = waveFileComponent.getComtradeNoAddPoints(cfgStream, datStream, 0);
             } catch (Exception e) {
                 try {
                     InputStream cfgStream = fileStorageUtil.getFileStream(cfgPath2);
@@ -112,7 +117,6 @@ public class EventAdvanceServiceImpl implements IEventAdvanceService {
         try {
             QvvrDLL.INSTANCE.qvvr_fun(typeDataStruct);
             System.out.println("调用qvvrdll成功-----------");
-
             if (typeDataStruct.evt_num > 0) {
                 // 全局比较找出最小三相电压特征值
                 float globalMinVoltage = Float.MAX_VALUE;
@@ -127,25 +131,14 @@ public class EventAdvanceServiceImpl implements IEventAdvanceService {
                         }
                     }
                 }
-                String str = WriteData2File(typeDataStruct);
+
-                if (Objects.isNull(wlFilePath)) {
-                    String hdrPath = OssPath.WAVE_DIR + ip+StrUtil.SLASH;
-                    String hdrName =  waveName + GeneralConstant.HDR_LOWER;
-                    fileStorageUtil.uploadStreamSpecifyName(new ByteArrayInputStream(str.getBytes()),hdrPath,hdrName);
-                } else {
-                    //  comtrade/00:B7:8D:00:A8:7A/PQMonitor_PQM1_00100_20260204_162453_071_WAV.hdr
-                    String fullPath =  wlFilePath + GeneralConstant.HDR_LOWER;
-                    int lastSlashIndex = fullPath.lastIndexOf('/');
-                    String hdrPath = fullPath.substring(0, lastSlashIndex + 1);
-                    String hdrName = fullPath.substring(lastSlashIndex + 1);
-                    fileStorageUtil.uploadStreamSpecifyName(new ByteArrayInputStream(str.getBytes()),hdrPath,hdrName);
-                }
 
                 //上传HR
                 eventAnalysis.setType(globalFaultType);
             } else {
                 eventAnalysis.setType(DataFeature.TYPE10);
             }
+
             System.out.println("结束qvvrdll方法调用-----------");
         } catch (Exception e) {
             eventAnalysis.setType(DataFeature.TYPE10);
@@ -174,12 +167,33 @@ public class EventAdvanceServiceImpl implements IEventAdvanceService {
             eventAnalysis.setCause(DataFeature.CAUSE_TYPE0);
             eventAnalysis.setCauseFlag(0);
         }
+        String str = null;
+        try {
+            str = WriteData2File(typeDataStruct,causeDataStruct);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        if (Objects.isNull(wlFilePath)) {
+            String hdrPath = OssPath.WAVE_DIR + ip+StrUtil.SLASH;
+            String hdrName =  waveName + GeneralConstant.HDR_LOWER;
+            fileStorageUtil.uploadStreamSpecifyName(new ByteArrayInputStream(str.getBytes()),hdrPath,hdrName);
+        } else {
+            //  comtrade/00:B7:8D:00:A8:7A/PQMonitor_PQM1_00100_20260204_162453_071_WAV.hdr
+            String fullPath =  wlFilePath + GeneralConstant.HDR_LOWER;
+            int lastSlashIndex = fullPath.lastIndexOf('/');
+            String hdrPath = fullPath.substring(0, lastSlashIndex + 1);
+            String hdrName = fullPath.substring(lastSlashIndex + 1);
+            fileStorageUtil.uploadStreamSpecifyName(new ByteArrayInputStream(str.getBytes()),hdrPath,hdrName);
+        }
         System.out.println("暂降原因分析完毕===============");
         System.out.println("cause:" + eventAnalysis);
+        } finally {
+            lock.unlock(); // 释放锁
+        }
         return eventAnalysis;
     }
 
-    public String WriteData2File(QvvrDLL.QvvrDataStruct rect) throws Exception {
+    public String WriteData2File(QvvrDLL.QvvrDataStruct rect, QvvrCauseDLL.QvvrDataStruct causeDataStruct) throws Exception {
         StringBuilder stringBuilder = new StringBuilder("{" + EnumEvt.NEWLINE.getProperty());
 
         /**
@@ -414,7 +428,7 @@ public class EventAdvanceServiceImpl implements IEventAdvanceService {
              */
             for (int k = 0; k < rect.evt_buf[i].u_min_num; k++) {
                 setEigenVlaue(k, stringBuilder, EnumEvt.QVVR_CATA_CAUSE.getProperty(), null,
-                        rect.evt_buf[i].qvvr_cata_cause[k]);
+                        causeDataStruct.cause);
 
                 if (rect.evt_buf[i].u_min_num - 1 == k) {
                     stringBuilder.delete(stringBuilder.lastIndexOf(","), stringBuilder.length() - 1);
@@ -458,6 +472,10 @@ public class EventAdvanceServiceImpl implements IEventAdvanceService {
                 stringBuilder.append(EnumEvt.setEnter(EnumEvt.setClose(2), 2));
             }
         }
+        if(rect.evt_num==0){
+            stringBuilder.append("]");
+
+        }
 
         stringBuilder.append("}");
         return stringBuilder.toString();

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventWaveAnalysisServiceImpl.java

@@ -81,6 +81,8 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
             //获取所有暂态原因
             List<DictData> dicDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_TYPE.getCode()).getData();
             Map<Integer, DictData> eventTypeMap = dicDataList.stream().collect(Collectors.toMap(DictData::getAlgoDescribe, Function.identity()));
+            List<DictData> reasonList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_REASON.getCode()).getData();
+            Map<Integer, DictData> eventReasonMap = reasonList.stream().collect(Collectors.toMap(DictData::getAlgoDescribe, Function.identity()));
             InputStream inputStreamCfg;
             InputStream inputStreamDat;
             try {
@@ -176,11 +178,11 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
             causeStruct.smp_len = pitchList.size();
             causeStruct.smp_rate = (int) wavePitchData.getnOneWaveNum();
 
-            String hdrStr = waveUtils.getFile(OssPath.WAVE_DIR + lineDetailDataVO.getIp() + StrUtil.SLASH + rmpEventDetailPO.getWavePath() + GeneralConstant.HDR);
+            String hdrStr = waveUtils.getFile(OssPath.WAVE_DIR + lineDetailDataVO.getIp() + StrUtil.SLASH + rmpEventDetailPO.getWavePath() + GeneralConstant.HDR_LOWER);
             JSONObject jsonObject = JSONObject.fromObject(hdrStr);
             translateData(jsonObject, rmpEventDetailPO.getStartTime(), entityAdvancedData);
 
-            if (rmpEventDetailPO.getDealFlag() != 1) {
+            if (!Objects.equals(rmpEventDetailPO.getDealFlag(),1) ) {
                 //如果存在三个文件但是没有调用dll/so计算
                 getDataFromDLL(rmpEventDetailPO, waveOriginalData, rect, entityAdvancedData, causeStruct);
             }
@@ -192,7 +194,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
             if (entityAdvancedData.backNumber > 0) {
                 for (int i = 0; i < entityAdvancedData.backNumber; i++) {
                     entityAdvancedData.sagType[i] = eventTypeMap.get(entityAdvancedData.evt_buf[i].qvvr_cata_type[0]).getName();
-
+                    entityAdvancedData.sagReason[i]= eventReasonMap.get(entityAdvancedData.evt_buf[i].qvvr_cata_cause[0]).getName();
                     switch (entityAdvancedData.evt_buf[i].qvvr_phasetype[0]) {
                         case 1:
                             entityAdvancedData.sagPhaseType[i] = "单相";
@@ -628,7 +630,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
 
         entityAdvancedData.backNumber = len;
         //初始化EntityAdvancedData的BackData数据
-        len = (len == 0 ? 1 : len);
+//        len = (len == 0 ? 1 : len);
         entityAdvancedData.evt_buf = new BackData[len];
         for (int i = 0; i < len; i++) {
             entityAdvancedData.evt_buf[i] = new BackData();

pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/JnaCallDllOrSo.java

@@ -1,11 +1,11 @@
 package com.njcn.advance.utils;
 
-import cn.hutool.core.io.resource.ClassPathResource;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FileUtils;
 
-import java.io.*;
+import java.io.File;
-import java.net.URLDecoder;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.InputStream;
 
 /**
  * pqs
@@ -20,21 +20,20 @@ public class JnaCallDllOrSo {
 
     public JnaCallDllOrSo(String name) {
         super();
-        String suffix = ".dll";
         try {
             String os = System.getProperty("os.name");
-            // windows操作系统为1 否则为0
             int beginIndex = os != null && os.startsWith("Windows") ? 1 : 0;
             String nameDll;
             if (beginIndex == 0) {
-                //linux操作系统
+                nameDll = "lib" + name + ".so";
-                nameDll = "lib" + name + "_dll";
-                suffix = ".so";
             } else {
                 nameDll = name;
+                if (!name.endsWith(".dll")) {
+                    nameDll = name + ".dll";
+                }
             }
 
-            String tem = "/usr/local/dllFile/"+ nameDll.concat(suffix);
+            String tem = "/usr/local/dllFile/"+ nameDll;
             File dockerFile = new File(tem);
             if(!dockerFile.exists()){
                 boolean f = dockerFile.getParentFile().mkdirs();
@@ -42,7 +41,11 @@ public class JnaCallDllOrSo {
                 System.out.println("文件夹创建："+f);
                 System.out.println("文件创建："+d);
 
-                try (InputStream inputStream = getClass().getClassLoader().getResourceAsStream(nameDll.concat(suffix))) {
+                try (InputStream inputStream = getClass().getClassLoader().getResourceAsStream(nameDll)) {
+                    if (inputStream == null) {
+                        log.error("找不到资源文件: {}", nameDll);
+                        throw new FileNotFoundException("找不到资源文件: " + nameDll);
+                    }
                     try (FileOutputStream outputStream = new FileOutputStream(dockerFile)) {
                         byte[] buffer = new byte[1024];
                         int bytesRead;
@@ -53,9 +56,11 @@ public class JnaCallDllOrSo {
                 }
             }
             this.path = dockerFile.getAbsolutePath();
+            System.out.println("动态库路径: " + this.path);
         } catch (Exception e) {
             log.error("调用高级算法文件异常，异常信息如下：");
-            log.error(e.getMessage());
+            log.error(e.getMessage(), e);
+            throw new RuntimeException("加载动态库失败: " + e.getMessage(), e);
         }
 
 

pqs-advance/advance-boot/src/main/resources/bootstrap.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: sjzx
+    active: @spring.profiles.active@

pqs-auth/pom.xml

@@ -66,6 +66,13 @@
             <artifactId>common-oss</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <!--辽宁调度现场单点登录-->
+        <dependency>
+            <groupId>com.sgcc.epri.auth</groupId>
+            <artifactId>sso-client-base</artifactId>
+            <version>2.1.1 </version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -138,4 +145,4 @@
 
 
 
-</project>
+</project>

pqs-auth/src/main/java/com/njcn/auth/config/LnSsoClientConfig.java

@@ -0,0 +1,26 @@
+package com.njcn.auth.config;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2026/6/8
+ */
+
+import com.sgcc.epri.auth.config.EnableSSOClient;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 仅控制 SSO 客户端开关，不影响任何其他功能
+ */
+@Configuration
+@ConditionalOnProperty(
+        prefix = "cas.client",       // 配置前缀
+        name = "enabled",            // 配置项名称
+        havingValue = "true",        // 值为true才生效
+        matchIfMissing = false       // 不配置默认关闭
+)
+@EnableSSOClient
+public class LnSsoClientConfig {
+}

pqs-auth/src/main/java/com/njcn/auth/config/WebSecurityConfig.java

@@ -37,7 +37,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     protected void configure(HttpSecurity http) throws Exception {
         http
                 .authorizeRequests()
-                .antMatchers("/oauth/getPublicKey","/oauth/logout","/auth/getImgCode","/judgeToken/guangZhou","/judgeToken/heBei","/oauth/autoLogin").permitAll()
+                .antMatchers("/oauth/getPublicKey","/oauth/logout","/auth/getImgCode","/judgeToken/guangZhou","/judgeToken/heBei","/oauth/autoLogin","/oauth/lnLogin","/oauth/lnCheck","/oauth/lnRefreshToken").permitAll()
                 // @link https://gitee.com/xiaoym/knife4j/issues/I1Q5X6 (接口文档knife4j需要放行的规则)
                 .antMatchers("/webjars/**","/doc.html","/swagger-resources/**","/v2/api-docs").permitAll()
                 .anyRequest().authenticated()

pqs-auth/src/main/java/com/njcn/auth/controller/AuthController.java

@@ -25,13 +25,17 @@ import com.njcn.user.pojo.po.UserStrategy;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.RequestUtil;
 import com.njcn.web.utils.RestTemplateUtil;
+import com.sgcc.epri.auth.session.HttpSessionManager;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.provider.endpoint.TokenEndpoint;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
@@ -39,6 +43,10 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.util.UriComponentsBuilder;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.net.URI;
 import java.security.KeyPair;
 import java.security.Principal;
@@ -55,7 +63,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @RestController
 @RequestMapping("/oauth")
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class AuthController extends BaseController {
 
 
@@ -71,6 +79,11 @@ public class AuthController extends BaseController {
 
     private final UserTokenService userTokenService;
 
+    @Value("${cas.redirect-url:http://10.21.30.11:8088/#/login?flag=1}")
+    private String redirectUrl;
+
+    private String UsernamePrefix = "CAS_";
+
 
     @ApiIgnore
     @OperateInfo(info = LogEnum.SYSTEM_SERIOUS, operateType = OperateType.AUTHENTICATE)
@@ -91,7 +104,6 @@ public class AuthController extends BaseController {
         String methodDescribe = getMethodDescribe("postAccessToken");
         String username = parameters.get(SecurityConstants.USERNAME);
 
-
         String grantType = parameters.get(SecurityConstants.GRANT_TYPE);
         if (grantType.equalsIgnoreCase(SecurityConstants.GRANT_CAPTCHA) || grantType.equalsIgnoreCase(SecurityConstants.REFRESH_TOKEN_KEY)) {
             username = DesUtils.aesDecrypt(username);
@@ -104,19 +116,19 @@ public class AuthController extends BaseController {
         UserStrategy data = passWordRuleFeugnClient.getUserStrategy().getData();
         String onlineUserKey = SecurityConstants.TOKEN_ONLINE_PREFIX;
         List<UserTokenInfo> onLineUser = (List<UserTokenInfo>) redisUtil.getLikeListAllValues(onlineUserKey);
-        if(CollectionUtil.isNotEmpty(onLineUser)){
+        if (CollectionUtil.isNotEmpty(onLineUser)) {
             String finalUsername = username;
-            onLineUser = onLineUser.stream().filter(item->{
+            onLineUser = onLineUser.stream().filter(item -> {
                 JSONObject jsonObject = AuthPubUtil.getLoginByToken(item.getRefreshToken());
                 String login = jsonObject.getStr(SecurityConstants.USER_NAME_KEY);
                 long exp = Long.parseLong(jsonObject.getStr(SecurityConstants.JWT_EXP));
-                long now = Calendar.getInstance().getTimeInMillis()/1000;
+                long now = Calendar.getInstance().getTimeInMillis() / 1000;
-                return  (exp > now) && !login.equals(finalUsername);
+                return (exp > now) && !login.equals(finalUsername);
             }).collect(Collectors.toList());
         }
 
         Integer maxNum = data.getMaxNum();
-        if((CollectionUtil.isNotEmpty(onLineUser)?onLineUser.size():0)>=maxNum){
+        if ((CollectionUtil.isNotEmpty(onLineUser) ? onLineUser.size() : 0) >= maxNum) {
             throw new BusinessException(UserResponseEnum.LOGIN_USER_OVERLIMIT);
         }
 
@@ -143,7 +155,7 @@ public class AuthController extends BaseController {
     @OperateInfo(info = LogEnum.SYSTEM_SERIOUS, operateType = OperateType.LOGOUT)
     @ApiOperation("用户登出系统")
     @DeleteMapping("/logout")
-    public HttpResult<Object> logout() {
+    public HttpResult<Object> logout(HttpServletRequest request, HttpServletResponse response) {
         String methodDescribe = getMethodDescribe("logout");
         String userIndex = RequestUtil.getUserIndex();
         String username = RequestUtil.getUsername();
@@ -165,6 +177,24 @@ public class AuthController extends BaseController {
             long lifeTime = Math.abs(refreshTokenExpire.plusMinutes(5L).toEpochSecond(ZoneOffset.of("+8")) - LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")));
             redisUtil.saveByKeyWithExpire(blackUserKey, blackUsers, lifeTime);
         }
+
+
+        // 以下代码是辽宁登出代码，关键：使 Session 失效
+        request.getSession().invalidate();
+
+        // 清除 JSESSIONID
+        Cookie jsessionidCookie = new Cookie("JSESSIONID", null);
+        jsessionidCookie.setMaxAge(0);
+        jsessionidCookie.setPath("/");
+        response.addCookie(jsessionidCookie);
+
+        // 清除 loginUser Cookie（关键！）
+        Cookie loginUserCookie = new Cookie("loginUser", null);
+        loginUserCookie.setMaxAge(0);
+        loginUserCookie.setPath("/");
+        response.addCookie(loginUserCookie);
+
+        log.info("登出成功。。。。。。。。。。。。。。。。");
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
@@ -186,20 +216,152 @@ public class AuthController extends BaseController {
      */
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.AUTHENTICATE)
     @ApiOperation("自动登录")
-    @PostMapping("/autoLogin")
+    @GetMapping("/autoLogin")
     @ApiImplicitParam(name = "phone", value = "手机号", required = true, paramType = "query")
     @ApiIgnore
     public HttpResult<Object> autoLogin(@RequestParam String phone) {
         String methodDescribe = getMethodDescribe("autoLogin");
         String userUrl = "http://127.0.0.1:10214/oauth/token";
         UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(userUrl)
-                .queryParam("grant_type", "sms_code")
+                .queryParam("grant_type", SecurityConstants.GRANT_AUTHORIZATION_CODE)
-                .queryParam("client_id", "njcnapp")
+                .queryParam("client_id", "njcn")
                 .queryParam("client_secret", "njcnpqs")
-                .queryParam("phone", phone)
+                .queryParam("username", "%2FPY4%2FD07ExoKDUg6yCi2cA%3D%3D")
-                .queryParam("smsCode", "123456789");
+                .queryParam("imageCode", "verifyCode")
+                .queryParam("verifyCode", "0");
+
         URI uri = builder.build().encode().toUri();
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, Objects.requireNonNull(RestTemplateUtil.post(uri, HttpResult.class).getBody()).getData(), methodDescribe);
     }
 
+
+    /**
+     * 【电科院CAS调控云单点登录适配】
+     * 这个只用来匹配
+     */
+    @ApiIgnore
+    @GetMapping("/lnLogin")
+    @ApiOperation("获取ln系统用户token")
+    public HttpResult<Object> lnLogin(@RequestParam String clientId, @RequestParam String clientSecret, HttpServletRequest request, HttpServletResponse response) throws HttpRequestMethodNotSupportedException {
+        log.info("进入lnLogin++++++++++++++++++");
+        String methodDescribe = getMethodDescribe("lnLogin");
+
+        // 读取CAS信息
+        String userName = String.valueOf(HttpSessionManager.getAttribute(request, HttpSessionManager.AUTH_USER_KEY));
+        String userId = String.valueOf(HttpSessionManager.getAttribute(request, HttpSessionManager.USER_ID_KEY));
+        String owner = String.valueOf(HttpSessionManager.getAttribute(request, HttpSessionManager.USER_OWNER));
+        String name = String.valueOf(HttpSessionManager.getAttribute(request, HttpSessionManager.USER_NAME_CHN));
+        String employeeId = String.valueOf(HttpSessionManager.getAttribute(request, HttpSessionManager.USER_EMPLOYEE_ID));
+
+        log.info("userName:{}", userName);
+        log.info("userId:{}", userId);
+        log.info("owner:{}", owner);
+        log.info("name:{}", name);
+        log.info("employeeId:{}", employeeId);
+
+        if ("null".equals(userName)) {
+            throw new BusinessException(UserResponseEnum.LN_AUTH_ERROR);
+        }
+
+        // 2. 【关键】用户名前面加上"CAS_"前缀，让UserDetailsService识别
+        String casUsername = userName;
+
+        // 2. 直接构造 OAuth2 必要参数（跳过所有密码/加密校验）
+        Map<String, String> parameters = new HashMap<>();
+        parameters.put("grant_type", "password");          // 固定密码模式
+        parameters.put("client_id", clientId);               // 你的客户端ID
+        parameters.put("client_secret", clientSecret);        // 你的客户端秘钥
+        parameters.put("username", userName);              // 统一认证传过来的用户名
+        parameters.put("password", "@#001njcnpqs");
+
+        // 3. 直接调用 OAuth2 生成 Token（跳过所有登录校验）
+        Authentication authentication = new UsernamePasswordAuthenticationToken(
+                clientId, clientSecret, Collections.emptyList()
+        );
+
+        OAuth2AccessToken oAuth2AccessToken = tokenEndpoint.postAccessToken(authentication, parameters).getBody();
+
+
+        // 获取过期时间（秒数）
+        int expiresIn = oAuth2AccessToken.getExpiresIn();
+        log.info("token过期时间: {} 秒", expiresIn);
+        log.info("token过期时间: {} 分钟", expiresIn / 60);
+        log.info("token过期时间: {} 小时", expiresIn / 3600);
+        log.info("====== 免密登录成功，返回token给前端 ======");
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, oAuth2AccessToken, methodDescribe);
+    }
+
+
+    /**
+     * 重点：
+     * 这个接口 不加 白名单
+     * 访问它 → 自动跳CAS → 登录成功 → 重定向到登录页
+     */
+    @GetMapping("/lnCheck")
+    @ApiOperation("检查CAS是否登录")
+    public void lnToken(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        log.info("进入lnCheck。。。。");
+        response.sendRedirect(redirectUrl);
+    }
+
+
+    /**
+     */
+    @GetMapping("/lnRefreshToken")
+    @ApiOperation("刷新token")
+    public HttpResult<Object> lnRefreshToken(
+            @RequestParam String refreshToken,
+            @RequestParam String clientId,
+            @RequestParam String clientSecret,
+            HttpServletRequest request,
+            HttpServletResponse response) throws HttpRequestMethodNotSupportedException {
+
+        log.info("进入lnRefreshToken，开始刷新token");
+        String methodDescribe = getMethodDescribe("lnRefreshToken");
+
+        // ========== 【前置：优先校验CAS会话是否过期】 ==========
+        String userName = String.valueOf(HttpSessionManager.getAttribute(request, HttpSessionManager.AUTH_USER_KEY));
+        if ("null".equals(userName)) {
+            log.error("CAS会话已过期，跳转登录页");
+            throw new BusinessException(UserResponseEnum.LN_AUTH_ERROR);
+        }
+
+        // 1. 先尝试用refresh_token正常刷新
+        Map<String, String> parameters = new HashMap<>();
+        parameters.put("grant_type", "refresh_token");
+        parameters.put("refresh_token", refreshToken);
+        parameters.put("client_id", clientId);
+        parameters.put("client_secret", clientSecret);
+
+        Authentication authentication = new UsernamePasswordAuthenticationToken(
+                clientId, clientSecret, Collections.emptyList()
+        );
+
+        try {
+            OAuth2AccessToken newAccessToken = tokenEndpoint.postAccessToken(authentication, parameters).getBody();
+            log.info("refresh_token刷新成功");
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, newAccessToken, methodDescribe);
+        } catch (Exception e) {
+            log.warn("refresh_token刷新失败，尝试回退到CAS会话重新签发token", e);
+        }
+
+
+        // 3. CAS会话有效，重新签发token（等同于重新登录）
+        log.info("CAS会话有效，为用户[{}]重新签发token", userName);
+        String casUsername = userName;
+        Map<String, String> reLoginParams = new HashMap<>();
+        reLoginParams.put("grant_type", "password");
+        reLoginParams.put("client_id", clientId);
+        reLoginParams.put("client_secret", clientSecret);
+        reLoginParams.put("username", userName);
+        reLoginParams.put("password", "@#001njcnpqs");
+
+        Authentication reAuth = new UsernamePasswordAuthenticationToken(
+                clientId, clientSecret, Collections.emptyList()
+        );
+
+        OAuth2AccessToken oAuth2AccessToken = tokenEndpoint.postAccessToken(reAuth, reLoginParams).getBody();
+        log.info("CAS回退重签token成功，userName:{}", userName);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, oAuth2AccessToken, methodDescribe);
+    }
 }

pqs-auth/src/main/resources/bootstrap-sjzx.yml

@@ -55,3 +55,22 @@ mybatis-plus:
 
 mqtt:
   client-id: @artifactId@${random.value}
+
+
+
+
+cas:
+  client:
+    # true 开启 false 关闭
+    enabled: false
+  redirect-url: http://PQMonitoring.dcloud.ln.dc.sgcc.com.cn/#/login?flag=1
+  server-url-prefix: http://privilege-epri.dcloud.ln.dc.sgcc.com.cn/cas
+  server-login-url: http://privilege-epri.dcloud.ln.dc.sgcc.com.cn/cas/login
+  client-host-url: http://PQMonitoring.dcloud.ln.dc.sgcc.com.cn:80
+  validation-type: CAS
+  #白名单设置
+  # /oauth/lnLogin$|/pqs-auth/oauth/lnLogin|/oauth/lnRefreshToken$|/pqs-auth/oauth/lnRefreshToken
+sso:
+  whiteList:
+
+

pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java

@@ -21,7 +21,7 @@ public class GenerateCode {
 
     private static final String TARGET_DIR = "D://code";
 
-    private static final String DB_URL = "jdbc:mysql://192.168.1.24:13306/pqsinfo_ln";
+    private static final String DB_URL = "jdbc:mysql://192.168.1.103:13306/pqsinfo_zl";
 //    private static final String DB_URL = "jdbc:oracle:thin:@192.168.1.170:1521:pqsbase";
 
     private static final String USERNAME = "root";
@@ -30,8 +30,8 @@ public class GenerateCode {
 
     public static void main(String[] args) {
         List<Module> modules = Stream.of(
-                new Module("cdf", "com.njcn.device", "", Stream.of(
+                new Module("xy", "com.njcn.csdevice", "", Stream.of(
-                        "pq_icd_path"
+                        "cs_alarm_set"
                         ).collect(Collectors.toList()), "")
         ).collect(Collectors.toList());
         generateJavaFile(modules);

pqs-common/common-core/pom.xml

@@ -97,11 +97,11 @@
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
-        <!--mqtt相关依赖-->
+<!--        &lt;!&ndash;mqtt相关依赖&ndash;&gt;-->
-        <dependency>
+<!--        <dependency>-->
-            <groupId>com.github.tocrhz</groupId>
+<!--            <groupId>com.github.tocrhz</groupId>-->
-            <artifactId>mqtt-spring-boot-starter</artifactId>
+<!--            <artifactId>mqtt-spring-boot-starter</artifactId>-->
-        </dependency>
+<!--        </dependency>-->
 
 <!--        <dependency>-->
 <!--            <groupId>org.springframework.boot</groupId>-->

pqs-common/common-core/src/main/java/com/njcn/common/utils/PubUtils.java

@@ -15,6 +15,7 @@ import com.njcn.common.pojo.exception.BusinessException;
 import lombok.Data;
 
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
@@ -32,6 +33,7 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static java.lang.Integer.parseInt;
 
@@ -281,6 +283,30 @@ public class PubUtils {
         }
     }
 
+    /**
+     * 用于获取对象中，前缀一样，后缀为2~50的属性值
+     *
+     * @param methodPrefix 方法前缀
+     * @param number       方法后缀
+     * @return 对象属性值
+     */
+    public static Double getValueByMethodDouble(List data ,Class clazz, String methodPrefix, Integer number) {
+        try {
+            Method method = clazz.getMethod(methodPrefix + number);
+            OptionalDouble average = data.stream().mapToDouble(temp -> {
+                try {
+                    return (Double) method.invoke(temp);
+                } catch (Exception e) {
+                    throw new BusinessException(CommonResponseEnum.REFLECT_METHOD_EXCEPTION);
+                }
+            }).average();
+            return average.orElse(0.0);
+
+        } catch (Exception e) {
+            throw new BusinessException(CommonResponseEnum.REFLECT_METHOD_EXCEPTION);
+        }
+    }
+
 
     public static List<String> getStartTimeEndTime(String beginDate, String endDate) throws Exception {
 

pqs-common/common-echarts/src/main/java/com/njcn/echarts/json/LineGenerator.java

@@ -1,11 +1,7 @@
 package com.njcn.echarts.json;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.ListUtil;
 import cn.hutool.json.JSONUtil;
-import cn.hutool.json.ObjectMapper;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
 import com.njcn.echarts.pojo.bo.TolerateData;
 import com.njcn.echarts.pojo.constant.PicCommonData;
 import org.icepear.echarts.Option;
@@ -29,7 +25,6 @@ import org.icepear.echarts.render.Engine;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -43,6 +38,17 @@ import java.util.stream.Collectors;
 public class LineGenerator {
 
     private final static Engine ENGINE = new Engine();
+    // null段在图表上的固定视觉宽度（数据点数量）
+    private static final int NULL_PLACEHOLDER_COUNT = 90;
+    // 压缩结果
+    private static class CompressedResult {
+        // 压缩后的数据
+        List<List<Float>> data;
+        // 每个null段的[起始索引, 结束索引]（占位点范围）
+        List<int[]> nullRegionIndices;
+        // null段边界处的真实x值（entry, exit交替）
+        List<Float> nullBoundaryRealXValues;
+    }
 
 
     /***
@@ -529,6 +535,478 @@ public class LineGenerator {
         return ENGINE.renderJsonOption(instantOption);
     }
 
+    public static String generateWaveOption(String title, List<List<Float>> aValue, List<List<Float>> bValue, List<List<Float>> cValue, String unit, Float max, Float min, String a, String b, String c, List<String> colors, Boolean isOpen, Double lastTime, List<Float> sharedNullBoundaryXValues, Integer nPush) {
+        DecimalFormat df1 = new DecimalFormat("#.00");
+        // 压缩null数据：如果有共享边界则用共享边界，否则独立压缩
+        CompressedResult aCompressed;
+        CompressedResult bCompressed;
+        CompressedResult cCompressed;
+        if (sharedNullBoundaryXValues != null && !sharedNullBoundaryXValues.isEmpty()) {
+            aCompressed = compressNullDataWithSharedBoundaries(aValue, sharedNullBoundaryXValues);
+            bCompressed = compressNullDataWithSharedBoundaries(bValue, sharedNullBoundaryXValues);
+            cCompressed = compressNullDataWithSharedBoundaries(cValue, sharedNullBoundaryXValues);
+        } else {
+            aCompressed = compressNullData(aValue);
+            bCompressed = compressNullData(bValue);
+            cCompressed = compressNullData(cValue);
+        }
+
+        Option instantOption = new Option();
+        //取消渲染动画
+        instantOption.setAnimation(false);
+        //背景色
+        instantOption.setBackgroundColor(PicCommonData.PIC_BACK_COLOR);
+        //标题
+        instantOption.setTitle(new Title()
+                .setText(title)
+                .setLeft(PicCommonData.CENTER)
+                .setTextStyle(new Label().setFontSize(14))
+        );
+        //配置颜色
+        instantOption.setColor(colors.toArray(new String[colors.size()]));
+        //配置图例
+        if (isOpen) {
+            instantOption.setLegend(new Legend().setData(new String[]{a, b}).setLeft("10px"));
+        } else {
+            instantOption.setLegend(new Legend().setData(new String[]{a, b, c}).setLeft("10px"));
+        }
+        //上下左右的图内间距
+        instantOption.setGrid(new Grid().setTop("60px").setLeft("70px").setRight("40px").setBottom("10%"));
+        //横坐标（使用压缩后的数据）
+        instantOption.setXAxis(new ValueAxis().setName("ms")
+                .setSplitLine(new SplitLine().setShow(false))
+                .setAxisLine(new AxisLine().setOnZero(false))
+                .setType("category")
+                .setMinInterval(1)
+        );
+        //纵坐标
+        instantOption.setYAxis(new ValueAxis()
+                .setName(unit)
+                .setMax(df1.format(max * 1.1))
+                .setMin(df1.format(min * 1.1))
+                .setPosition(PicCommonData.LEFT)
+                .setAxisLine(new AxisLine().setShow(false).setOnZero(false))
+        );
+        //数据信息（使用压缩后的数据）
+        LineSeries aSeries = new LineSeries()
+                .setName(a)
+                .setSmooth(true)
+                .setSymbol("none")
+                .setConnectNulls(false)
+                .setData(aCompressed.data);
+        LineSeries bSeries = new LineSeries()
+                .setName(b)
+                .setSmooth(true)
+                .setSymbol("none")
+                .setConnectNulls(false)
+                .setData(bCompressed.data);
+        LineSeries cSeries = new LineSeries()
+                .setName(c)
+                .setSmooth(true)
+                .setSymbol("none")
+                .setConnectNulls(false)
+                .setData(cCompressed.data);
+        instantOption.setSeries(new LineSeries[]{aSeries, bSeries, cSeries});
+
+        // 渲染基础JSON
+        String jsonStr = ENGINE.renderJsonOption(instantOption);
+        cn.hutool.json.JSONObject optionJson = JSONUtil.parseObj(jsonStr);
+        cn.hutool.json.JSONArray seriesArray = optionJson.getJSONArray("series");
+
+        // 隐藏x轴默认标签，设置boundaryGap=false，只通过markLine显示关键节点
+        Object xAxisRaw = optionJson.get("xAxis");
+        cn.hutool.json.JSONObject xAxisJson;
+        if (xAxisRaw instanceof cn.hutool.json.JSONArray) {
+            xAxisJson = ((cn.hutool.json.JSONArray) xAxisRaw).getJSONObject(0);
+        } else {
+            xAxisJson = (cn.hutool.json.JSONObject) xAxisRaw;
+        }
+        cn.hutool.json.JSONObject axisLabelJson = new cn.hutool.json.JSONObject();
+        axisLabelJson.set("show", false);
+        xAxisJson.set("axisLabel", axisLabelJson);
+        xAxisJson.set("boundaryGap", false);
+
+        // 添加null markLine/markArea（基于压缩后的数据）
+        addNullMarkLinesForCategoryAxis(seriesArray.getJSONObject(0), aCompressed, lastTime);
+        addNullMarkLinesForCategoryAxis(seriesArray.getJSONObject(1), bCompressed, lastTime);
+        addNullMarkLinesForCategoryAxis(seriesArray.getJSONObject(2), cCompressed, lastTime);
+        // 在第一个series追加自定义横坐标标签markLine
+        addAxisLabelMarkLines(seriesArray.getJSONObject(0), aCompressed, lastTime, nPush);
+        return optionJson.toString();
+    }
+
+    /** 提取null边界的真实x值，供其他数据集共享使用 */
+    public static List<Float> extractNullBoundaryXValues(List<List<Float>> data) {
+        List<Integer> boundaries = findNullSegmentBoundaryIndices(data);
+        List<Float> xValues = new ArrayList<>();
+        for (int idx : boundaries) {
+            xValues.add(data.get(idx).get(0));
+        }
+        return xValues;
+    }
+
+    /** 使用共享的null边界x值来压缩数据，确保不同数据集压缩结果结构一致 */
+    private static CompressedResult compressNullDataWithSharedBoundaries(List<List<Float>> originalData, List<Float> sharedBoundaryXValues) {
+        if (sharedBoundaryXValues == null || sharedBoundaryXValues.isEmpty()) {
+            return compressNullData(originalData);
+        }
+
+        // 用共享的x值找到本数据集中对应的索引
+        List<Integer> boundaries = new ArrayList<>();
+        for (Float x : sharedBoundaryXValues) {
+            boundaries.add(findClosestValidIndex(originalData, x));
+        }
+
+        CompressedResult result = new CompressedResult();
+        result.data = new ArrayList<>();
+        result.nullRegionIndices = new ArrayList<>();
+        result.nullBoundaryRealXValues = new ArrayList<>(sharedBoundaryXValues);
+
+        int srcIdx = 0;
+        for (int b = 0; b < boundaries.size(); b += 2) {
+            int entryBoundary = boundaries.get(b);
+            int exitBoundary = boundaries.get(b + 1);
+
+            while (srcIdx <= entryBoundary) {
+                result.data.add(originalData.get(srcIdx));
+                srcIdx++;
+            }
+
+            int nullStartIdx = result.data.size();
+            float entryX = sharedBoundaryXValues.get(b);
+            float exitX = sharedBoundaryXValues.get(b + 1);
+
+            for (int p = 0; p < NULL_PLACEHOLDER_COUNT; p++) {
+                List<Float> point = new ArrayList<>();
+                point.add(entryX + (exitX - entryX) * p / NULL_PLACEHOLDER_COUNT);
+                point.add(null);
+                result.data.add(point);
+            }
+
+            int nullEndIdx = result.data.size() - 1;
+            result.nullRegionIndices.add(new int[]{nullStartIdx, nullEndIdx});
+
+            srcIdx = exitBoundary;
+        }
+
+        while (srcIdx < originalData.size()) {
+            result.data.add(originalData.get(srcIdx));
+            srcIdx++;
+        }
+
+        return result;
+    }
+
+
+
+    /**
+     * 压缩null数据：删除所有null数据点，替换为固定NULL_PLACEHOLDER_COUNT个占位点
+     * 这样null段在图表上永远只占固定视觉宽度，前后有效数据正常展开
+     */
+    private static CompressedResult compressNullData(List<List<Float>> originalData) {
+        List<Integer> boundaries = findNullSegmentBoundaryIndices(originalData);
+
+        CompressedResult result = new CompressedResult();
+        result.data = new ArrayList<>();
+        result.nullRegionIndices = new ArrayList<>();
+        result.nullBoundaryRealXValues = new ArrayList<>();
+
+        if (boundaries.isEmpty()) {
+            result.data.addAll(originalData);
+            return result;
+        }
+
+        int srcIdx = 0;
+        for (int b = 0; b < boundaries.size(); b += 2) {
+            // 最后一个有效点的索引（null段入口边界）
+            int entryBoundary = boundaries.get(b);
+            // 第一个恢复有效点的索引（null段出口边界）
+            int exitBoundary = boundaries.get(b + 1);
+
+            // 复制有效数据：从srcIdx到entryBoundary
+            while (srcIdx <= entryBoundary) {
+                result.data.add(originalData.get(srcIdx));
+                srcIdx++;
+            }
+
+            // 记录边界真实x值
+            result.nullBoundaryRealXValues.add(originalData.get(entryBoundary).get(0));
+            result.nullBoundaryRealXValues.add(originalData.get(exitBoundary).get(0));
+
+            // 插入固定数量的null占位点
+            int nullStartIdx = result.data.size();
+            float entryX = originalData.get(entryBoundary).get(0);
+            float exitX = originalData.get(exitBoundary).get(0);
+
+            for (int p = 0; p < NULL_PLACEHOLDER_COUNT; p++) {
+                List<Float> point = new ArrayList<>();
+                point.add(entryX + (exitX - entryX) * p / NULL_PLACEHOLDER_COUNT);
+                point.add(null);
+                result.data.add(point);
+            }
+
+            int nullEndIdx = result.data.size() - 1;
+            result.nullRegionIndices.add(new int[]{nullStartIdx, nullEndIdx});
+
+            // 跳过原始null数据点，srcIdx跳到exitBoundary
+            srcIdx = exitBoundary;
+        }
+
+        // 复制最后一个null段之后的剩余有效数据
+        while (srcIdx < originalData.size()) {
+            result.data.add(originalData.get(srcIdx));
+            srcIdx++;
+        }
+
+        return result;
+    }
+
+    /**
+     * 在压缩数据中查找最接近目标x值的有效数据点索引（跳过null点）
+     */
+    private static int findClosestValidIndex(List<List<Float>> data, float targetX) {
+        int closestIdx = -1;
+        float minDiff = Float.MAX_VALUE;
+        for (int i = 0; i < data.size(); i++) {
+            Float y = data.get(i).get(1);
+            if (y == null) continue;
+            float diff = Math.abs(data.get(i).get(0) - targetX);
+            if (diff < minDiff) {
+                minDiff = diff;
+                closestIdx = i;
+            }
+        }
+        return closestIdx;
+    }
+
+    private static void addAxisLabelMarkLines(cn.hutool.json.JSONObject seriesObj, CompressedResult compressed, Double lastTime, Integer nPush) {
+        boolean hasNull = !compressed.nullRegionIndices.isEmpty();
+
+        // 收集需要标注的横坐标位置：[数据索引, 显示的时间值]
+        List<int[]> labelPositions = new ArrayList<>();
+        // 开头ms（始终显示）
+        labelPositions.add(new int[]{findClosestValidIndex(compressed.data, -nPush), -nPush});
+        // 0ms（始终显示）
+        labelPositions.add(new int[]{findClosestValidIndex(compressed.data, 0f), 0});
+        // npush ms（仅在有null时显示）
+        if (hasNull) {
+            labelPositions.add(new int[]{findClosestValidIndex(compressed.data, nPush), nPush});
+        }
+        // null段边界真实时间值（仅在有null时显示）
+        if (hasNull) {
+            for (Float realX : compressed.nullBoundaryRealXValues) {
+                int idx = findClosestValidIndex(compressed.data, realX);
+                if (idx >= 0) {
+                    labelPositions.add(new int[]{idx, (int) Math.round(realX)});
+                }
+            }
+        }
+        // lastTime（始终显示）
+        if (lastTime != null) {
+            labelPositions.add(new int[]{findClosestValidIndex(compressed.data, lastTime.floatValue()), lastTime.intValue()});
+        }
+
+        // 最后一组数据（始终显示，数据结束位置横坐标）
+        if (lastTime != null) {
+            float lastTime20 = lastTime.floatValue() + nPush;
+            int lastTime20Idx = findClosestValidIndex(compressed.data, lastTime20);
+            if (lastTime20Idx >= 0) {
+                labelPositions.add(new int[]{(lastTime20Idx-2), (int) Math.round(lastTime20)});
+            }
+        }
+
+        // 获取或创建markLine
+        cn.hutool.json.JSONObject existingMarkLine = seriesObj.getJSONObject("markLine");
+        cn.hutool.json.JSONArray markLineData;
+
+        if (existingMarkLine == null) {
+            // 无null的情况：自己创建markLine，包含虚线和横坐标标签
+            markLineData = new cn.hutool.json.JSONArray();
+
+            // x=0 虚线
+            int zeroIdx = findClosestValidIndex(compressed.data, 0f);
+            if (zeroIdx >= 0) {
+                cn.hutool.json.JSONObject zeroLine = new cn.hutool.json.JSONObject();
+                zeroLine.set("xAxis", zeroIdx);
+                cn.hutool.json.JSONObject zeroLabel = new cn.hutool.json.JSONObject();
+                zeroLabel.set("show", false);
+                zeroLine.set("label", zeroLabel);
+                markLineData.add(zeroLine);
+            }
+            // lastTime 虚线
+            if (lastTime != null) {
+                int lastTimeIdx = findClosestValidIndex(compressed.data, lastTime.floatValue());
+                if (lastTimeIdx >= 0) {
+                    cn.hutool.json.JSONObject lastTimeLine = new cn.hutool.json.JSONObject();
+                    lastTimeLine.set("xAxis", lastTimeIdx);
+                    cn.hutool.json.JSONObject lastTimeLabelObj = new cn.hutool.json.JSONObject();
+                    lastTimeLabelObj.set("show", false);
+                    lastTimeLine.set("label", lastTimeLabelObj);
+                    markLineData.add(lastTimeLine);
+                }
+            }
+
+            // 先收集所有标签到markLineData
+            for (int[] pos : labelPositions) {
+                cn.hutool.json.JSONObject line = new cn.hutool.json.JSONObject();
+                line.set("xAxis", pos[0]);
+                cn.hutool.json.JSONObject lineLineStyle = new cn.hutool.json.JSONObject();
+                lineLineStyle.set("width", 0);
+                line.set("lineStyle", lineLineStyle);
+                cn.hutool.json.JSONObject lineLabel = new cn.hutool.json.JSONObject();
+                lineLabel.set("show", true);
+                lineLabel.set("formatter", String.valueOf(pos[1]));
+                lineLabel.set("position", "start");
+                lineLabel.set("color", "#333");
+                lineLabel.set("fontSize", 10);
+                line.set("label", lineLabel);
+                markLineData.add(line);
+            }
+            // 最后一次性设置到markLine和series
+            existingMarkLine = new cn.hutool.json.JSONObject();
+            existingMarkLine.set("symbol", new String[]{"none", "none"});
+            cn.hutool.json.JSONObject lineStyle = new cn.hutool.json.JSONObject();
+            lineStyle.set("type", "dashed");
+            lineStyle.set("color", "#999");
+            lineStyle.set("width", 1);
+            existingMarkLine.set("lineStyle", lineStyle);
+            cn.hutool.json.JSONObject globalLabel = new cn.hutool.json.JSONObject();
+            globalLabel.set("show", false);
+            existingMarkLine.set("label", globalLabel);
+            existingMarkLine.set("data", markLineData);
+            seriesObj.set("markLine", existingMarkLine);
+        } else {
+            // 有null的情况：追加标签到已有的markLine
+            markLineData = existingMarkLine.getJSONArray("data");
+            for (int[] pos : labelPositions) {
+                cn.hutool.json.JSONObject line = new cn.hutool.json.JSONObject();
+                line.set("xAxis", pos[0]);
+                cn.hutool.json.JSONObject lineLineStyle = new cn.hutool.json.JSONObject();
+                lineLineStyle.set("width", 0);
+                line.set("lineStyle", lineLineStyle);
+                cn.hutool.json.JSONObject lineLabel = new cn.hutool.json.JSONObject();
+                lineLabel.set("show", true);
+                lineLabel.set("formatter", String.valueOf(pos[1]));
+                lineLabel.set("position", "start");
+                lineLabel.set("color", "#333");
+                lineLabel.set("fontSize", 10);
+                line.set("label", lineLabel);
+                markLineData.add(line);
+            }
+        }
+    }
+
+    private static List<Integer> findNullSegmentBoundaryIndices(List<List<Float>> data) {
+        List<Integer> indices = new ArrayList<>();
+        boolean inNullSegment = false;
+        for (int i = 0; i < data.size(); i++) {
+            Float y = data.get(i).get(1);
+            if (y == null) {
+                if (!inNullSegment) {
+                    indices.add(i > 0 ? i - 1 : i);
+                    inNullSegment = true;
+                }
+            } else {
+                if (inNullSegment) {
+                    indices.add(i);
+                    inNullSegment = false;
+                }
+            }
+        }
+        if (inNullSegment) {
+            indices.add(data.size() - 1);
+        }
+        return indices;
+    }
+
+    private static void addNullMarkLinesForCategoryAxis(cn.hutool.json.JSONObject seriesObj, CompressedResult compressed, Double lastTime) {
+        if (compressed.nullRegionIndices.isEmpty()) {
+            return;
+        }
+        cn.hutool.json.JSONArray markLineData = new cn.hutool.json.JSONArray();
+        // x=0 虚线
+        int zeroIdx = findClosestValidIndex(compressed.data, 0f);
+        if (zeroIdx >= 0) {
+            cn.hutool.json.JSONObject zeroLine = new cn.hutool.json.JSONObject();
+            zeroLine.set("xAxis", zeroIdx);
+            cn.hutool.json.JSONObject zeroLabel = new cn.hutool.json.JSONObject();
+            zeroLabel.set("show", false);
+            zeroLine.set("label", zeroLabel);
+            markLineData.add(zeroLine);
+        }
+        // null段边界的垂直虚线
+        for (int r = 0; r < compressed.nullRegionIndices.size(); r++) {
+            int[] region = compressed.nullRegionIndices.get(r);
+            int nullStartIdx = region[0];   // 第一个占位点索引
+            int nullEndIdx = region[1];     // 最后一个占位点索引
+
+            // 入口虚线：nullStartIdx - 1（null前最后一个有效数据点）
+            cn.hutool.json.JSONObject entryLine = new cn.hutool.json.JSONObject();
+            entryLine.set("xAxis", nullStartIdx - 1);
+            cn.hutool.json.JSONObject entryLabel = new cn.hutool.json.JSONObject();
+            entryLabel.set("show", false);
+            entryLine.set("label", entryLabel);
+            markLineData.add(entryLine);
+
+            // 出口虚线：nullEndIdx（null后第一个有效数据点）
+            cn.hutool.json.JSONObject exitLine = new cn.hutool.json.JSONObject();
+            exitLine.set("xAxis", nullEndIdx);
+            cn.hutool.json.JSONObject exitLabel = new cn.hutool.json.JSONObject();
+            exitLabel.set("show", false);
+            exitLine.set("label", exitLabel);
+            markLineData.add(exitLine);
+        }
+        // 时间持续时间结束的数据点
+        if (lastTime != null) {
+            int lastTimeIdx = findClosestValidIndex(compressed.data, lastTime.floatValue());
+            if (lastTimeIdx >= 0) {
+                cn.hutool.json.JSONObject lastTimeLine = new cn.hutool.json.JSONObject();
+                lastTimeLine.set("xAxis", lastTimeIdx);
+                cn.hutool.json.JSONObject lastTimeLabel = new cn.hutool.json.JSONObject();
+                lastTimeLabel.set("show", false);
+                lastTimeLine.set("label", lastTimeLabel);
+                markLineData.add(lastTimeLine);
+            }
+        }
+
+        cn.hutool.json.JSONObject markLine = new cn.hutool.json.JSONObject();
+        markLine.set("symbol", new String[]{"none", "none"});
+        cn.hutool.json.JSONObject lineStyle = new cn.hutool.json.JSONObject();
+        lineStyle.set("type", "dashed");
+        lineStyle.set("color", "#999");
+        lineStyle.set("width", 1);
+        markLine.set("lineStyle", lineStyle);
+        cn.hutool.json.JSONObject globalLabel = new cn.hutool.json.JSONObject();
+        globalLabel.set("show", false);
+        markLine.set("label", globalLabel);
+        markLine.set("data", markLineData);
+        seriesObj.set("markLine", markLine);
+
+        // markArea - 灰色背景覆盖null区域（从入口边界到出口边界）
+        cn.hutool.json.JSONArray markAreaData = new cn.hutool.json.JSONArray();
+        for (int r = 0; r < compressed.nullRegionIndices.size(); r++) {
+            int[] region = compressed.nullRegionIndices.get(r);
+            int nullStartIdx = region[0];
+            int nullEndIdx = region[1];
+
+            cn.hutool.json.JSONArray areaPair = new cn.hutool.json.JSONArray();
+            cn.hutool.json.JSONObject start = new cn.hutool.json.JSONObject();
+            start.set("xAxis", nullStartIdx - 1);    // 从入口边界有效数据点
+            cn.hutool.json.JSONObject end = new cn.hutool.json.JSONObject();
+            end.set("xAxis", nullEndIdx);         // 到出口边界有效数据点
+            areaPair.add(start);
+            areaPair.add(end);
+            markAreaData.add(areaPair);
+        }
+        cn.hutool.json.JSONObject markArea = new cn.hutool.json.JSONObject();
+        cn.hutool.json.JSONObject itemStyle = new cn.hutool.json.JSONObject();
+        itemStyle.set("color", "rgba(180, 180, 180, 0.2)");
+        itemStyle.set("borderWidth", 0);
+        markArea.set("itemStyle", itemStyle);
+        markArea.set("data", markAreaData);
+        seriesObj.set("markArea", markArea);
+    }
+
     /**
      * @param title     标题
      * @param values    数据值

pqs-common/common-echarts/src/main/java/com/njcn/echarts/util/DrawPicUtil.java

@@ -10,9 +10,10 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
 
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author hongawen
@@ -55,10 +56,9 @@ public class DrawPicUtil {
         return Objects.requireNonNull(picResult.getBody()).indexOf("image/png") > 0 ? picResult.getBody() : "";
     }
 
-
     /***
-     * 绘制波形图
      * @author hongawen
+     * 绘制波形图
      * @date 2023/6/21 11:01
      * @return String base64数据
      */
@@ -77,6 +77,11 @@ public class DrawPicUtil {
         return drawPic(instantJson, width, height);
     }
 
+    public String drawWavePic(String title, List<List<Float>> aValue, List<List<Float>> bValue, List<List<Float>> cValue, String unit, Float max, Float min, String a, String b, String c, List<String> colors, Boolean isOpen, Double lastTime, List<Float> sharedNullBoundaryXValues,Integer nPush) {
+        String instantJson = LineGenerator.generateWaveOption(title, aValue, bValue, cValue, unit, max, min, a, b, c, colors, isOpen, lastTime, sharedNullBoundaryXValues,nPush);
+        return drawPic(instantJson, 0, 0);
+    }
+
 
     /***
      * 绘制itic曲线图

pqs-common/common-event/src/main/java/com/njcn/event/file/component/WavePicComponent.java

@@ -1,10 +1,9 @@
 package com.njcn.event.file.component;
 
 import cn.hutool.core.img.ImgUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.CharsetUtil;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.utils.FileUtil;
+import com.njcn.echarts.json.LineGenerator;
 import com.njcn.echarts.pojo.constant.PicCommonData;
 import com.njcn.echarts.util.DrawPicUtil;
 import com.njcn.event.file.pojo.bo.WaveDataDetail;
@@ -12,21 +11,17 @@ import com.njcn.event.file.pojo.dto.WaveDataDTO;
 import com.njcn.event.file.pojo.enums.WaveFileResponseEnum;
 import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.utils.FileStorageUtil;
-import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import sun.awt.image.BufferedImageGraphicsConfig;
 
-import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
-import java.io.File;
+import java.util.Base64;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.*;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author hongawen
@@ -49,36 +44,39 @@ public class WavePicComponent {
      * @date 2023/9/21 15:32
      * @return String 文件地址
      */
-    public String generateInstantImageZl(List<WaveDataDetail> waveDataDetails) {
+    public String generateInstantImageZl(Integer nPush, List<WaveDataDetail> waveDataDetails, Double lastTime) {
         String firstPic = null, secondPic = null, thirdPic = null, forthPic = null;
+        WaveDataDetail waveDataDetail0 = waveDataDetails.get(0);
+        // 从instantData提取null边界x值，作为共享参考（与Shun图保持一致）
+        List<Float> sharedNullBoundaries = LineGenerator.extractNullBoundaryXValues(waveDataDetail0.getInstantData().getAValue());
         for (WaveDataDetail waveDataDetail : waveDataDetails) {
             if (waveDataDetail.getChannelName().toUpperCase().startsWith("SU")) {
                 firstPic = drawPicUtil.drawWavePic("电压-电网侧", waveDataDetail.getInstantData().getAValue(),
                         waveDataDetail.getInstantData().getBValue(), waveDataDetail.getInstantData().getCValue(),
                         waveDataDetail.getUnit(), waveDataDetail.getInstantData().getMax(), waveDataDetail.getInstantData().getMin(),
                         waveDataDetail.getA(), waveDataDetail.getB(), waveDataDetail.getC(),
-                        waveDataDetail.getColors(), waveDataDetail.getIsOpen()
+                        waveDataDetail.getColors(), waveDataDetail.getIsOpen(),lastTime,sharedNullBoundaries,nPush
                 );
             } else if (waveDataDetail.getChannelName().toUpperCase().startsWith("SI")) {
                 thirdPic = drawPicUtil.drawWavePic("电流-电网侧", waveDataDetail.getInstantData().getAValue(),
                         waveDataDetail.getInstantData().getBValue(), waveDataDetail.getInstantData().getCValue(),
                         waveDataDetail.getUnit(), waveDataDetail.getInstantData().getMax(), waveDataDetail.getInstantData().getMin(),
                         waveDataDetail.getA(), waveDataDetail.getB(), waveDataDetail.getC(),
-                        waveDataDetail.getColors(), waveDataDetail.getIsOpen()
+                        waveDataDetail.getColors(), waveDataDetail.getIsOpen(),lastTime,sharedNullBoundaries,nPush
                 );
             } else if (waveDataDetail.getChannelName().toUpperCase().startsWith("LU")) {
                 secondPic = drawPicUtil.drawWavePic("电压-负载侧", waveDataDetail.getInstantData().getAValue(),
                         waveDataDetail.getInstantData().getBValue(), waveDataDetail.getInstantData().getCValue(),
                         waveDataDetail.getUnit(), waveDataDetail.getInstantData().getMax(), waveDataDetail.getInstantData().getMin(),
                         waveDataDetail.getA(), waveDataDetail.getB(), waveDataDetail.getC(),
-                        waveDataDetail.getColors(), waveDataDetail.getIsOpen()
+                        waveDataDetail.getColors(), waveDataDetail.getIsOpen(),lastTime,sharedNullBoundaries,nPush
                 );
             } else {
                 forthPic = drawPicUtil.drawWavePic("电流-负载侧", waveDataDetail.getInstantData().getAValue(),
                         waveDataDetail.getInstantData().getBValue(), waveDataDetail.getInstantData().getCValue(),
                         waveDataDetail.getUnit(), waveDataDetail.getInstantData().getMax(), waveDataDetail.getInstantData().getMin(),
                         waveDataDetail.getA(), waveDataDetail.getB(), waveDataDetail.getC(),
-                        waveDataDetail.getColors(), waveDataDetail.getIsOpen()
+                        waveDataDetail.getColors(), waveDataDetail.getIsOpen(),lastTime,sharedNullBoundaries,nPush
                 );
             }
         }
@@ -91,36 +89,39 @@ public class WavePicComponent {
      * @date 2023/9/21 15:32
      * @return String 文件地址
      */
-    public String generateRmsImageZl(List<WaveDataDetail> waveDataDetails) {
+    public String generateRmsImageZl(Integer nPush, List<WaveDataDetail> waveDataDetails, Double lastTime) {
         String firstPic = null, secondPic = null, thirdPic = null, forthPic = null;
+        WaveDataDetail waveDataDetail0 = waveDataDetails.get(0);
+        // 从instantData提取null边界x值，作为共享参考（与Shun图保持一致）
+        List<Float> sharedNullBoundaries = LineGenerator.extractNullBoundaryXValues(waveDataDetail0.getInstantData().getAValue());
         for (WaveDataDetail waveDataDetail : waveDataDetails) {
             if (waveDataDetail.getChannelName().toUpperCase().startsWith("SU")) {
                 firstPic = drawPicUtil.drawWavePic("电压-电网侧", waveDataDetail.getRmsData().getAValue(),
                         waveDataDetail.getRmsData().getBValue(), waveDataDetail.getRmsData().getCValue(),
                         waveDataDetail.getUnit(), waveDataDetail.getRmsData().getMax(), waveDataDetail.getRmsData().getMin(),
                         waveDataDetail.getA(), waveDataDetail.getB(), waveDataDetail.getC(),
-                        waveDataDetail.getColors(), waveDataDetail.getIsOpen()
+                        waveDataDetail.getColors(), waveDataDetail.getIsOpen(),lastTime,sharedNullBoundaries,nPush
                 );
             } else if (waveDataDetail.getChannelName().toUpperCase().startsWith("SI")) {
                 thirdPic = drawPicUtil.drawWavePic("电流-电网侧", waveDataDetail.getRmsData().getAValue(),
                         waveDataDetail.getRmsData().getBValue(), waveDataDetail.getRmsData().getCValue(),
                         waveDataDetail.getUnit(), waveDataDetail.getRmsData().getMax(), waveDataDetail.getRmsData().getMin(),
                         waveDataDetail.getA(), waveDataDetail.getB(), waveDataDetail.getC(),
-                        waveDataDetail.getColors(), waveDataDetail.getIsOpen()
+                        waveDataDetail.getColors(), waveDataDetail.getIsOpen(),lastTime,sharedNullBoundaries,nPush
                 );
             } else if (waveDataDetail.getChannelName().toUpperCase().startsWith("LU")) {
                 secondPic = drawPicUtil.drawWavePic("电压-负载侧", waveDataDetail.getRmsData().getAValue(),
                         waveDataDetail.getRmsData().getBValue(), waveDataDetail.getRmsData().getCValue(),
                         waveDataDetail.getUnit(), waveDataDetail.getRmsData().getMax(), waveDataDetail.getRmsData().getMin(),
                         waveDataDetail.getA(), waveDataDetail.getB(), waveDataDetail.getC(),
-                        waveDataDetail.getColors(), waveDataDetail.getIsOpen()
+                        waveDataDetail.getColors(), waveDataDetail.getIsOpen(),lastTime,sharedNullBoundaries,nPush
                 );
             } else {
                 forthPic = drawPicUtil.drawWavePic("电流-负载侧", waveDataDetail.getRmsData().getAValue(),
                         waveDataDetail.getRmsData().getBValue(), waveDataDetail.getRmsData().getCValue(),
                         waveDataDetail.getUnit(), waveDataDetail.getRmsData().getMax(), waveDataDetail.getRmsData().getMin(),
                         waveDataDetail.getA(), waveDataDetail.getB(), waveDataDetail.getC(),
-                        waveDataDetail.getColors(), waveDataDetail.getIsOpen()
+                        waveDataDetail.getColors(), waveDataDetail.getIsOpen(),lastTime,sharedNullBoundaries,nPush
                 );
             }
         }
@@ -209,6 +210,47 @@ public class WavePicComponent {
         return picPath;
     }
 
+    /***
+     * 绘制瞬时波形图 App端用来绘制图片，会去掉部分数据，只保留开始数据 结束数据
+     * @author xy
+     * @return String 文件地址
+     */
+    public String generateImageShun(Integer nPush, List<WaveDataDetail> waveDataDetails, Double lastTime) {
+        String picPath = null;
+        WaveDataDetail waveDataDetail = waveDataDetails.get(0);
+        // 从instantData提取null边界x值，作为共享参考
+        List<Float> sharedNullBoundaries = LineGenerator.extractNullBoundaryXValues(waveDataDetail.getInstantData().getAValue());
+
+        String firstPic = drawPicUtil.drawWavePic(getTitle(waveDataDetail.getChannelName()), waveDataDetail.getInstantData().getAValue(),
+                waveDataDetail.getInstantData().getBValue(), waveDataDetail.getInstantData().getCValue(),
+                waveDataDetail.getUnit(), waveDataDetail.getInstantData().getMax(), waveDataDetail.getInstantData().getMin(),
+                waveDataDetail.getA(), waveDataDetail.getB(), waveDataDetail.getC(),
+                waveDataDetail.getColors(), waveDataDetail.getIsOpen(), lastTime, sharedNullBoundaries,nPush
+        );
+        String secondPic;
+        if (waveDataDetails.size() == 1) {
+            if (firstPic.contains(PicCommonData.PNG_PREFIX)) {
+                firstPic = firstPic.replace(PicCommonData.PNG_PREFIX, "");
+            }
+            byte[] bytes = Base64.getDecoder().decode(firstPic);
+            picPath = fileStorageUtil.uploadStream(new ByteArrayInputStream(bytes), OssPath.EVENT_WAVE_PIC, FileUtil.generateFileName("png"));
+        } else if (waveDataDetails.size() == 2) {
+            waveDataDetail = waveDataDetails.get(1);
+            secondPic = drawPicUtil.drawWavePic(getTitle(waveDataDetail.getChannelName()), waveDataDetail.getInstantData().getAValue(),
+                    waveDataDetail.getInstantData().getBValue(), waveDataDetail.getInstantData().getCValue(),
+                    waveDataDetail.getUnit(), waveDataDetail.getInstantData().getMax(), waveDataDetail.getInstantData().getMin(),
+                    waveDataDetail.getA(), waveDataDetail.getB(), waveDataDetail.getC(),
+                    waveDataDetail.getColors(), waveDataDetail.getIsOpen(), lastTime, sharedNullBoundaries,nPush
+            );
+            picPath = composeImage(firstPic, secondPic);
+        }
+        return picPath;
+    }
+
+    public String getTitle(String channelName) {
+        return channelName.toUpperCase().startsWith("U1") ? "电压" : "电流";
+    }
+
     /***
      * 绘制RMS波形图
      * @author hongawen
@@ -248,6 +290,44 @@ public class WavePicComponent {
         return picPath;
     }
 
+    /***
+     * 绘制RMS波形图 App端用来绘制图片，会去掉部分数据，只保留开始数据 结束数据
+     * @author xy
+     * @return String 文件地址
+     */
+    public String generateImageRms(Integer nPush, List<WaveDataDetail> waveDataDetails, Double lastTime) {
+        String picPath = null;
+        WaveDataDetail waveDataDetail = waveDataDetails.get(0);
+
+        // 从instantData提取null边界x值，作为共享参考（与Shun图保持一致）
+        List<Float> sharedNullBoundaries = LineGenerator.extractNullBoundaryXValues(waveDataDetail.getInstantData().getAValue());
+
+        String firstPic = drawPicUtil.drawWavePic(getTitle(waveDataDetail.getChannelName()), waveDataDetail.getRmsData().getAValue(),
+                waveDataDetail.getRmsData().getBValue(), waveDataDetail.getRmsData().getCValue(),
+                waveDataDetail.getUnit(), waveDataDetail.getRmsData().getMax(), waveDataDetail.getRmsData().getMin(),
+                waveDataDetail.getA(), waveDataDetail.getB(), waveDataDetail.getC(),
+                waveDataDetail.getColors(), waveDataDetail.getIsOpen(), lastTime, sharedNullBoundaries,nPush
+        );
+        String secondPic;
+        if (waveDataDetails.size() == 1) {
+            if (firstPic.contains(PicCommonData.PNG_PREFIX)) {
+                firstPic = firstPic.replace(PicCommonData.PNG_PREFIX, "");
+            }
+            byte[] bytes = Base64.getDecoder().decode(firstPic);
+            picPath = fileStorageUtil.uploadStream(new ByteArrayInputStream(bytes), OssPath.EVENT_WAVE_PIC, FileUtil.generateFileName("png"));
+        } else if (waveDataDetails.size() == 2) {
+            waveDataDetail = waveDataDetails.get(1);
+            secondPic = drawPicUtil.drawWavePic(getTitle(waveDataDetail.getChannelName()), waveDataDetail.getRmsData().getAValue(),
+                    waveDataDetail.getRmsData().getBValue(), waveDataDetail.getRmsData().getCValue(),
+                    waveDataDetail.getUnit(), waveDataDetail.getRmsData().getMax(), waveDataDetail.getRmsData().getMin(),
+                    waveDataDetail.getA(), waveDataDetail.getB(), waveDataDetail.getC(),
+                    waveDataDetail.getColors(), waveDataDetail.getIsOpen(), lastTime, sharedNullBoundaries,nPush
+            );
+            picPath = composeImage(firstPic, secondPic);
+        }
+        return picPath;
+    }
+
     /***
      * 合成图片
      * @author hongawen

pqs-common/common-event/src/main/java/com/njcn/event/file/utils/WaveUtil.java

@@ -7,6 +7,7 @@ import com.njcn.event.file.pojo.dto.WaveDataDTO;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author hongawen
@@ -80,28 +81,49 @@ public class WaveUtil {
                 //根据相别来确认标题的名称
                 for (int m = 0; m < iPhase; m++) {
                     if (waveTitle.get(iPhase * i + m + 1).substring(1).contains("A")) {
-                        float tmpShunFirstA = sunData.get(j).get(iPhase * i + m + 1) * xishu;
+                        if (Objects.isNull(sunData.get(j).get(iPhase * i + m + 1))) {
-                        shunFirstA = tmpShunFirstA;
+                            sAValue.add(new ArrayList<Float>() {{
-                        sAValue.add(new ArrayList<Float>() {{
+                                add(x);
-                            add(x);
+                                add(null);
-                            add(tmpShunFirstA);
+                            }});
-                        }});
+                        } else {
+                            float tmpShunFirstA = sunData.get(j).get(iPhase * i + m + 1) * xishu;
+                            shunFirstA = tmpShunFirstA;
+                            sAValue.add(new ArrayList<Float>() {{
+                                add(x);
+                                add(tmpShunFirstA);
+                            }});
+                        }
                     }
                     if (waveTitle.get(iPhase * i + m + 1).substring(1).contains("B")) {
-                        float tmpShunFirstB = sunData.get(j).get(iPhase * i + m + 1) * xishu;
+                        if (Objects.isNull(sunData.get(j).get(iPhase * i + m + 1))) {
-                        shunFirstB = tmpShunFirstB;
+                            sBValue.add(new ArrayList<Float>() {{
-                        sBValue.add(new ArrayList<Float>() {{
+                                add(x);
-                            add(x);
+                                add(null);
-                            add(tmpShunFirstB);
+                            }});
-                        }});
+                        } else {
+                            float tmpShunFirstB = sunData.get(j).get(iPhase * i + m + 1) * xishu;
+                            shunFirstB = tmpShunFirstB;
+                            sBValue.add(new ArrayList<Float>() {{
+                                add(x);
+                                add(tmpShunFirstB);
+                            }});
+                        }
                     }
                     if (waveTitle.get(iPhase * i + m + 1).substring(1).contains("C")) {
-                        float tmpShunFirstC = sunData.get(j).get(iPhase * i + m + 1) * xishu;
+                        if (Objects.isNull(sunData.get(j).get(iPhase * i + m + 1))) {
-                        shunFirstC = tmpShunFirstC;
+                            sCValue.add(new ArrayList<Float>() {{
-                        sCValue.add(new ArrayList<Float>() {{
+                                add(x);
-                            add(x);
+                                add(null);
-                            add(tmpShunFirstC);
+                            }});
-                        }});
+                        } else {
+                            float tmpShunFirstC = sunData.get(j).get(iPhase * i + m + 1) * xishu;
+                            shunFirstC = tmpShunFirstC;
+                            sCValue.add(new ArrayList<Float>() {{
+                                add(x);
+                                add(tmpShunFirstC);
+                            }});
+                        }
                     }
                 }
                 sfMax = getMax(sfMax, shunFirstA, shunFirstB, shunFirstC);
@@ -124,28 +146,50 @@ public class WaveUtil {
                 //根据相别来确认标题的名称
                 for (int m = 0; m < iPhase; m++) {
                     if (waveTitle.get(iPhase * i + m + 1).substring(1).contains("A")) {
-                        float tmpRmsFirstA = rmsData.get(k).get(iPhase * i + m + 1) * xishu;
+                        if (Objects.isNull(rmsData.get(k).get(iPhase * i + m + 1))) {
-                        rmsFirstA = tmpRmsFirstA;
+                            rAValue.add(new ArrayList<Float>() {{
-                        rAValue.add(new ArrayList<Float>() {{
+                                add(x);
-                            add(x);
+                                add(null);
-                            add(tmpRmsFirstA);
+                            }});
-                        }});
+                        } else {
+                            float tmpRmsFirstA = rmsData.get(k).get(iPhase * i + m + 1) * xishu;
+                            rmsFirstA = tmpRmsFirstA;
+                            rAValue.add(new ArrayList<Float>() {{
+                                add(x);
+                                add(tmpRmsFirstA);
+                            }});
+                        }
                     }
                     if (waveTitle.get(iPhase * i + m + 1).substring(1).contains("B")) {
-                        float tmpRmsFirstB = rmsData.get(k).get(iPhase * i + m + 1) * xishu;
+                        if (Objects.isNull(rmsData.get(k).get(iPhase * i + m + 1))) {
-                        rmsFirstB = tmpRmsFirstB;
+                            rBValue.add(new ArrayList<Float>() {{
-                        rBValue.add(new ArrayList<Float>() {{
+                                add(x);
-                            add(x);
+                                add(null);
-                            add(tmpRmsFirstB);
+                            }});
-                        }});
+                        } else {
+                            float tmpRmsFirstB = rmsData.get(k).get(iPhase * i + m + 1) * xishu;
+                            rmsFirstB = tmpRmsFirstB;
+                            rBValue.add(new ArrayList<Float>() {{
+                                add(x);
+                                add(tmpRmsFirstB);
+                            }});
+                        }
+
                     }
                     if (waveTitle.get(iPhase * i + m + 1).substring(1).contains("C")) {
-                        float tmpRmsFirstC = rmsData.get(k).get(iPhase * i + m + 1) * xishu;
+                        if (Objects.isNull(rmsData.get(k).get(iPhase * i + m + 1))) {
-                        rmsFirstC = tmpRmsFirstC;
+                            rCValue.add(new ArrayList<Float>() {{
-                        rCValue.add(new ArrayList<Float>() {{
+                                add(x);
-                            add(x);
+                                add(null);
-                            add(tmpRmsFirstC);
+                            }});
-                        }});
+                        } else {
+                            float tmpRmsFirstC = rmsData.get(k).get(iPhase * i + m + 1) * xishu;
+                            rmsFirstC = tmpRmsFirstC;
+                            rCValue.add(new ArrayList<Float>() {{
+                                add(x);
+                                add(tmpRmsFirstC);
+                            }});
+                        }
                     }
                 }
                 rfMax = getMax(sfMax, rmsFirstA, rmsFirstB, rmsFirstC);

pqs-common/common-mq/src/main/java/com/njcn/mq/constant/BusinessTopic.java

@@ -77,10 +77,41 @@ public interface BusinessTopic {
      */
     String REPLY_RECALL_TOPIC = "reply_recall_Topic";
 
+    /**
+     * 治理心跳过期处理主题
+     */
+    String HEARTBEAT_TIMEOUT_TOPIC = "heartbeat_timeout_topic";
+
+
     /********************************数据中心*********************************/
 
     String RMP_EVENT_DETAIL_TOPIC = "rmpEventDetailTopic";
 
+//    /**
+//     * 云前置文件信息请求主题
+//     */
+//    String FILE_INFO_REQUEST_TOPIC = "fileInfoRequestTopic";
+//
+//    /**
+//     * 云前置文件信息响应主题
+//     */
+//    String FILE_INFO_RESPONSE_TOPIC = "fileInfoResponseTopic";
+//
+//    /**
+//     * 云前置文件下载请求主题
+//     */
+//    String FILE_DOWNLOAD_REQUEST_TOPIC = "fileDownloadRequestTopic";
+//    /**
+//     * 云前置文件下载响应主题
+//     */
+//    String FILE_DOWNLOAD_RESPONSE_TOPIC = "fileDownloadResponseTopic";
+
+    String CLOUD_TOPIC = "Cloud_Topic";
+
+    String CLOUD_REPLY_TOPIC = "Cloud_Reply_Topic";
+
+    String ZL_LOG_TOPIC = "ZL_LOG_Topic";
+
 
     interface AppDataTag {
 
@@ -124,4 +155,23 @@ public interface BusinessTopic {
         String STREAM_TAG = "streamInfo";
     }
 
+    interface HeartTag {
+
+        /**
+         * apf 心跳
+         */
+        String APF_TAG = "apf";
+
+        /**
+         * cld 心跳
+         */
+        String CLD_TAG = "cld";
+    }
+
+    interface LogTag {
+
+        //日志
+        String LOG_TAG = "log";
+    }
+
 }

pqs-common/common-mq/src/main/java/com/njcn/mq/message/HeartbeatTimeoutMessage.java

@@ -0,0 +1,27 @@
+package com.njcn.mq.message;
+
+import com.njcn.middle.rocket.domain.BaseMessage;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author xy
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class HeartbeatTimeoutMessage extends BaseMessage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String nDid;
+
+    private Long timestamp;
+
+    private Integer delayLevel;
+}

pqs-common/common-mq/src/main/java/com/njcn/mq/message/LogMessage.java

@@ -0,0 +1,43 @@
+package com.njcn.mq.message;
+
+import com.njcn.middle.rocket.domain.BaseMessage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2025/9/29 15:06
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LogMessage extends BaseMessage {
+
+    @ApiModelProperty("唯一标识")
+    private String guid;
+
+    @ApiModelProperty("日志类型 0:设备接入日志")
+    private String dataType;
+
+    @ApiModelProperty("操作人员")
+    private String userIndex;
+
+    @ApiModelProperty("用户登录名")
+    private String loginName;
+
+    @ApiModelProperty("当前操作")
+    private String operate;
+
+    @ApiModelProperty("结果")
+    private Integer result;
+
+    @ApiModelProperty("失败原因")
+    private String failReason;
+}

pqs-common/common-mq/src/main/java/com/njcn/mq/template/HeartbeatTimeoutMessageTemplate.java

@@ -0,0 +1,29 @@
+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.HeartbeatTimeoutMessage;
+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 HeartbeatTimeoutMessageTemplate extends RocketMQEnhanceTemplate {
+
+    public HeartbeatTimeoutMessageTemplate(RocketMQTemplate template) {
+        super(template);
+    }
+
+    public SendResult sendMember(HeartbeatTimeoutMessage heartbeatTimeoutMessage) {
+        heartbeatTimeoutMessage.setSource(BusinessResource.WEB_RESOURCE);
+        return send(BusinessTopic.HEARTBEAT_TIMEOUT_TOPIC, BusinessTopic.HeartTag.APF_TAG, heartbeatTimeoutMessage, heartbeatTimeoutMessage.getDelayLevel());
+    }
+}

pqs-common/common-mq/src/main/java/com/njcn/mq/template/LogMessageTemplate.java

@@ -0,0 +1,28 @@
+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.LogMessage;
+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
+ */
+@Component
+public class LogMessageTemplate extends RocketMQEnhanceTemplate {
+
+    public LogMessageTemplate(RocketMQTemplate template) {
+        super(template);
+    }
+
+    public SendResult sendMember(LogMessage logMessage) {
+        logMessage.setSource(BusinessResource.APP_RESOURCE);
+        return send(BusinessTopic.ZL_LOG_TOPIC, BusinessTopic.LogTag.LOG_TAG, logMessage);
+    }
+}

pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java

@@ -2,9 +2,12 @@ package com.njcn.oss.utils;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.IdUtil;
+import com.aliyun.oss.OSS;
+import com.njcn.ali.oss.config.AliYunOssConfig;
 import com.njcn.ali.oss.util.AliYunOssUtils;
 import com.njcn.common.config.GeneralInfo;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.huawei.obs.config.HuaweiObsProperties;
 import com.njcn.huawei.obs.util.OBSUtil;
 import com.njcn.minioss.bo.MinIoUploadResDTO;
 import com.njcn.minioss.config.MinIossProperties;
@@ -12,6 +15,8 @@ import com.njcn.minioss.util.MinIoUtils;
 import com.njcn.oss.constant.GeneralConstant;
 import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.enums.OssResponseEnum;
+import com.obs.services.ObsClient;
+import com.obs.services.model.PutObjectRequest;
 import io.minio.*;
 import io.minio.messages.Item;
 import lombok.RequiredArgsConstructor;
@@ -70,6 +75,11 @@ public class FileStorageUtil {
      */
     private final AliYunOssUtils aliYunOssUtils;
 
+    private final HuaweiObsProperties huaweiObsProperties;
+
+    private final OSS ossClient;
+    private final AliYunOssConfig ossConfig;
+
 
     /***
      * 上传MultipartFile文件，
@@ -92,8 +102,11 @@ public class FileStorageUtil {
                 throw new BusinessException(OssResponseEnum.UPLOAD_FILE_ERROR);
             }
         } else if (generalInfo.getBusinessFileStorage() == GeneralConstant.AliYUN_OSS) {
-            filePath = dir;
+            filePath = dir.endsWith("/")?dir+getFileNameWithoutPath(multipartFile):dir+"/"+getFileNameWithoutPath(multipartFile);
-            aliYunOssUtils.uploadFile(dir, multipartFile);
+            if (filePath.charAt(0) == '/') {
+                filePath=  filePath.substring(1);
+            }
+            aliYunOssUtils.uploadFile(filePath, multipartFile);
         } else {
             try {
                 // 构建完整目录：基准目录 + dir子目录
@@ -144,8 +157,11 @@ public class FileStorageUtil {
             filePath = dir + minIoUtils.minFileName(multipartFile.getOriginalFilename());
             obsUtil.uploadMultipart(multipartFile, filePath);
         } else if (generalInfo.getBusinessFileStorage() == GeneralConstant.AliYUN_OSS) {
-            filePath = dir;
+            filePath = dir.endsWith("/")?dir+getFileNameWithoutPath(multipartFile):dir+"/"+getFileNameWithoutPath(multipartFile);
-            aliYunOssUtils.uploadFile(dir, multipartFile);
+            if (filePath.charAt(0) == '/') {
+                filePath=  filePath.substring(1);
+            }
+            aliYunOssUtils.uploadFile(filePath, multipartFile);
         } else {
             try {
                 //把名称存入数据
@@ -157,6 +173,15 @@ public class FileStorageUtil {
         }
         return filePath;
     }
+    public static String getFileNameWithoutPath(MultipartFile file) {
+        String originalFilename = file.getOriginalFilename();
+        if (originalFilename == null) {
+            return null;
+        }
+        // 统一分隔符为 '/'，再取最后一部分
+        String normalized = originalFilename.replace('\\', '/');
+        return normalized.substring(normalized.lastIndexOf('/') + 1);
+    }
 
     /***
      * 上传InputStream流，
@@ -442,4 +467,62 @@ public class FileStorageUtil {
         return file;
     }
 
+    public void mkdir(String directoryPath) {
+        if (generalInfo.getBusinessFileStorage() == GeneralConstant.HUAWEI_OBS) {
+            this.createDirectoryHW(directoryPath);
+        } else if (generalInfo.getBusinessFileStorage() == GeneralConstant.MINIO_OSS) {
+            minIoUtils.createDirectory(minIossProperties.getBucket(), directoryPath);
+        } else if (generalInfo.getBusinessFileStorage() == GeneralConstant.AliYUN_OSS) {
+            this.createDirectoryAli(directoryPath);
+        } else {
+
+        }
+    }
+
+    /**
+     * 华为文件服务器创建空目录
+     *
+     * @param dirPath
+     */
+    private void createDirectoryHW(String dirPath) {
+        ObsClient obsClient = null;
+        try {
+            obsClient = this.huaweiObsProperties.getInstance();
+            String bucketName = this.huaweiObsProperties.getObs().getBucket();
+
+            // 确保路径以 / 结尾
+            String directoryKey = dirPath.endsWith("/") ? dirPath : dirPath + "/";
+
+            // 创建空对象作为目录占位符
+            InputStream emptyStream = new ByteArrayInputStream(new byte[0]);
+            PutObjectRequest request = new PutObjectRequest(bucketName, directoryKey, emptyStream);
+            obsClient.putObject(request);
+
+            log.info("已创建目录占位符：" + directoryKey);
+        } catch (Exception e) {
+            throw new RuntimeException("创建目录失败" + dirPath, e);
+        } finally {
+            this.huaweiObsProperties.destroy(obsClient);
+        }
+    }
+
+
+    /**
+     * 阿里云文件服务器创建空目录
+     *
+     * @param dirPath
+     */
+    public void createDirectoryAli(String dirPath) {
+        try {
+            // 确保路径以 / 结尾，表示目录
+            String directoryKey = dirPath.endsWith("/") ? dirPath : dirPath + "/";
+
+            // 创建空输入流作为目录占位符
+            ByteArrayInputStream emptyStream = new ByteArrayInputStream(new byte[0]);
+
+            this.ossClient.putObject(this.ossConfig.getBucket(), directoryKey, emptyStream);
+        } catch (Exception e) {
+            throw new RuntimeException("创建目录失败：" + dirPath, e);
+        }
+    }
 }

pqs-common/common-poi/src/main/java/com/njcn/poi/excel/ExcelUtil.java

@@ -239,18 +239,47 @@ public class ExcelUtil {
      * @param strings  下拉内容
      */
     public static void selectList(Workbook workbook, int firstCol, int lastCol, String[] strings) {
-        Sheet sheet = workbook.getSheetAt(0);
+//        Sheet sheet = workbook.getSheetAt(0);
-        //  生成下拉列表
+//        //  生成下拉列表
-        //  只对(x，x)单元格有效
+//        //  只对(x，x)单元格有效
-        CellRangeAddressList cellRangeAddressList = new CellRangeAddressList(2, 65535, firstCol, lastCol);
+//        CellRangeAddressList cellRangeAddressList = new CellRangeAddressList(2, 65535, firstCol, lastCol);
-        //  生成下拉框内容
+//        //  生成下拉框内容
-        DataValidationHelper dvHelper = sheet.getDataValidationHelper();
+//        DataValidationHelper dvHelper = sheet.getDataValidationHelper();
-        XSSFDataValidationConstraint dvConstraint = (XSSFDataValidationConstraint)
+//        XSSFDataValidationConstraint dvConstraint = (XSSFDataValidationConstraint)
-                dvHelper.createExplicitListConstraint(strings);
+//                dvHelper.createExplicitListConstraint(strings);
-        XSSFDataValidation validation = (XSSFDataValidation) dvHelper.createValidation(
+//        XSSFDataValidation validation = (XSSFDataValidation) dvHelper.createValidation(
-                dvConstraint, cellRangeAddressList);
+//                dvConstraint, cellRangeAddressList);
-        //  对sheet页生效
+//        //  对sheet页生效
-        sheet.addValidationData(validation);
+//        sheet.addValidationData(validation);
+
+        Sheet  targetSheet = workbook.getSheetAt(0);
+
+        // ===================== 关键：每个下拉用唯一名称的隐藏Sheet =====================
+        String uniqueHiddenName = "dropdown_" + firstCol + "_" + lastCol + "_" + System.currentTimeMillis();
+        Sheet hiddenSheet = workbook.createSheet(uniqueHiddenName);
+        // 隐藏数据源Sheet
+        workbook.setSheetHidden(workbook.getSheetIndex(hiddenSheet), true);
+
+        // 写入选项到隐藏Sheet
+        for (int i = 0; i < strings.length; i++) {
+            Row row = hiddenSheet.createRow(i);
+            Cell cell = row.createCell(0);
+            cell.setCellValue(strings[i]);
+        }
+
+        // 构造引用公式（无长度限制）
+        String formula = uniqueHiddenName + "!$A$1:$A$" + strings.length;
+
+        // 下拉作用范围：第3行 ~ 65536行
+        CellRangeAddressList range = new CellRangeAddressList(2, 65535, firstCol, lastCol);
+        DataValidationHelper helper = targetSheet.getDataValidationHelper();
+        DataValidationConstraint constraint = helper.createFormulaListConstraint(formula);
+        DataValidation validation = helper.createValidation(constraint, range);
+
+        // 必加：防止下拉冲突、不显示
+        validation.setShowErrorBox(true);
+        validation.setShowPromptBox(true);
+        targetSheet.addValidationData(validation);
     }
 
     /**

pqs-common/common-poi/src/main/java/com/njcn/poi/util/PoiUtil.java

@@ -4,13 +4,15 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.CharsetUtil;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFRichTextString;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;
 import java.net.URLEncoder;
+import java.util.Objects;
 
 /**
  * @author hongawen
@@ -76,6 +78,59 @@ public class PoiUtil {
             fileName = URLEncoder.encode(fileName, CharsetUtil.UTF_8);
             response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\"");
             response.setContentType("application/octet-stream;charset=" + CharsetUtil.UTF_8);
+            //将带*号的列变成红色
+            Sheet sheetAt = workbook.getSheetAt(0);
+            //获取列数
+            int physicalNumberOfCells = sheetAt.getRow(0).getPhysicalNumberOfCells();
+            //没有表格标题,只有表格头
+            for (int i = 0; i < 2; i++) {
+                //获取行
+                Row row = sheetAt.getRow(i);
+                if (Objects.isNull(row)) {
+                    continue;
+                }
+                for (int j = 0; j < physicalNumberOfCells; j++) {
+                    //获取单元格对象
+                    Cell cell = row.getCell(j);
+                    //获取单元格样式对象
+                    CellStyle cellStyle = workbook.createCellStyle();
+                    //获取单元格内容对象
+                    Font font = workbook.createFont();
+                    font.setFontHeightInPoints((short) 12);
+                    //一定要装入 样式中才会生效
+                    cellStyle.setFont(font);
+                    //设置居中对齐
+                    cellStyle.setAlignment(HorizontalAlignment.CENTER);
+                    cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+                    //设置单元格字体颜色
+                    cell.setCellStyle(cellStyle);
+                    //获取当前值
+                    String stringCellValue = cell.getStringCellValue();
+                    if (stringCellValue.contains("*")) {
+                        // 创建一个富文本
+                        XSSFRichTextString xssfRichTextString = new XSSFRichTextString(stringCellValue);
+                        int startIndex = stringCellValue.indexOf("*");
+                        int entIndex = stringCellValue.lastIndexOf("*");
+                        if (entIndex != 0) {
+                            Font font3 = workbook.createFont();
+                            font3.setFontHeightInPoints((short) 12);
+                            font3.setColor(Font.COLOR_NORMAL);
+                            xssfRichTextString.applyFont(0, entIndex, font3);
+                        }
+                        //设置带*样式
+                        Font font1 = workbook.createFont();
+                        font1.setFontHeightInPoints((short) 12);
+                        font1.setColor(Font.COLOR_RED);
+                        xssfRichTextString.applyFont(startIndex, entIndex + 1, font1);
+                        //其他样式
+                        Font font2 = workbook.createFont();
+                        font2.setFontHeightInPoints((short) 12);
+                        font2.setColor(Font.COLOR_NORMAL);
+                        xssfRichTextString.applyFont(entIndex + 1, stringCellValue.length(), font2);
+                        cell.setCellValue(xssfRichTextString);
+                    }
+                }
+            }
             workbook.write(outputStream);
         } catch (Exception e) {
             e.printStackTrace();

pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java

@@ -13,7 +13,7 @@ public interface AppRedisKey {
     /**
      * 设备模板前缀
      */
-    String MODEL = "MODEL";
+    String MODEL = "MODEL:";
 
 
     /**
@@ -39,7 +39,7 @@ public interface AppRedisKey {
     /**
      * 监测点位置数据
      */
-    String LINE_POSITION = "LINEPOSITION";
+    String LINE_POSITION = "LINEPOSITION:";
 
     /**
      * rocketMQ消费key
@@ -115,4 +115,8 @@ public interface AppRedisKey {
      * 补召文件
      */
     String MAKE_UP_FILES = "makeUpFilesKey:";
+
+    String COMMON_REQUEST = "commonRequestKey:";
+
+    String COMMON_RESOPNSE = "commonResponseKey:";
 }

pqs-common/common-redis/src/main/java/com/njcn/redis/utils/RedisUtil.java

@@ -2,9 +2,7 @@ package com.njcn.redis.utils;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
-import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.*;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
 import java.nio.charset.StandardCharsets;
@@ -325,13 +323,54 @@ public class RedisUtil {
      * @return
      */
     public List<?> getLikeListAllValues(String key) {
-        List<Object> info=new ArrayList<>();
+        List<Object> info = new ArrayList<>();
-        for (String s : redisTemplate.keys(key + "*")) {
+        // 使用 SCAN 替代 keys，解决 Tair 禁用 KEYS 命令的问题
+        Set<String> keys = redisTemplate.execute((RedisCallback<Set<String>>) connection -> {
+            Set<String> keySet = new HashSet<>();
+            ScanOptions options = ScanOptions.scanOptions()
+                    .match(key + "*")
+                    .count(1000)
+                    .build();
+
+            try (Cursor<byte[]> cursor = connection.scan(options)) {
+                while (cursor.hasNext()) {
+                    keySet.add(new String(cursor.next()));
+                }
+            } catch (Exception e) {
+                throw new RuntimeException("Redis SCAN 模糊查询失败", e);
+            }
+            return keySet;
+        });
+        for (String s : keys) {
             info.add(redisTemplate.opsForValue().get(s));
         }
         return info;
     }
 
+    /**
+     * 根据key模糊查询,并取出所有符合条件的key集合
+     * @return
+     */
+
+    public Set<String> scanKeysByPattern(String pattern, int count) {
+        Set<String> keys = new HashSet<>();
+        ScanOptions options = ScanOptions.scanOptions()
+                .match(pattern)
+                .count(count)
+                .build();
+
+        try (Cursor<byte[]> cursor = redisTemplate.getConnectionFactory()
+                .getConnection()
+                .scan(options)) {
+            while (cursor.hasNext()) {
+                keys.add(new String(cursor.next()));
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("扫描Redis keys失败", e);
+        }
+        return keys;
+    }
+
     /**
      * 数据切库
      * @param dbIndex

pqs-common/common-web/src/main/java/com/njcn/web/utils/RestTemplateUtil.java

@@ -1,5 +1,8 @@
 package com.njcn.web.utils;
 
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.*;
@@ -149,7 +152,8 @@ public class RestTemplateUtil {
      * @return ResponseEntity 响应对象封装类
      */
     public static <T> ResponseEntity<T> post(String url, Object requestBody, Class<T> responseType) {
-        return restTemplate.postForEntity(url, requestBody, responseType);
+        Object actualBody = convertHutoolJsonToStandard(requestBody);
+        return restTemplate.postForEntity(url, actualBody, responseType);
     }
 
     /**
@@ -162,7 +166,8 @@ public class RestTemplateUtil {
      * @return ResponseEntity 响应对象封装类
      */
     public static <T> ResponseEntity<T> post(String url, Object requestBody, Class<T> responseType, Object... uriVariables) {
-        return restTemplate.postForEntity(url, requestBody, responseType, uriVariables);
+        Object actualBody = convertHutoolJsonToStandard(requestBody);
+        return restTemplate.postForEntity(url, actualBody, responseType, uriVariables);
     }
 
     /**
@@ -175,7 +180,21 @@ public class RestTemplateUtil {
      * @return ResponseEntity 响应对象封装类
      */
     public static <T> ResponseEntity<T> post(String url, Object requestBody, Class<T> responseType, Map<String, ?> uriVariables) {
-        return restTemplate.postForEntity(url, requestBody, responseType, uriVariables);
+        Object actualBody = convertHutoolJsonToStandard(requestBody);
+        return restTemplate.postForEntity(url, actualBody, responseType, uriVariables);
+    }
+
+    private static Object convertHutoolJsonToStandard(Object requestBody) {
+        if (requestBody instanceof JSONObject || requestBody instanceof JSONArray) {
+            try {
+                com.fasterxml.jackson.databind.ObjectMapper objectMapper = new com.fasterxml.jackson.databind.ObjectMapper();
+                return objectMapper.readValue(JSONUtil.toJsonStr(requestBody), Object.class);
+            } catch (Exception e) {
+                log.warn("Hutool JSON转标准结构失败，尝试直接使用字符串", e);
+                return requestBody;
+            }
+        }
+        return requestBody;
     }
 
     /**

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

@@ -19,14 +19,16 @@ public enum RunFlagEnum {
     QUIT(4, "退运"),
 
 
-
+    POWER_FLAG(0,"电网侧"),
-
+    NO_POWER_FLAG(1,"非电网侧"),
-
 
 
     GW_FLAG(0,"主网"),
     PW_FLAG(1,"配网"),
 
+    I_SORT(1,"I类测点"),
+    II_SORT(2,"II类测点"),
+    III_SORT(3,"III类测点"),
 
     ;
 

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/LineALLInfoDTO.java

@@ -41,6 +41,11 @@ public class LineALLInfoDTO {
         private Integer num;
         @ApiModelProperty(name = "objName",value = "监测点对象名称")
         private String objName;
+        @ApiModelProperty(name = "objName",value = "电网侧监测点对象名称Id")
+        private String objId;
+        @ApiModelProperty(name = "objName",value = "电网侧监测点对象名称")
+        private String objName2;
+
         @ApiModelProperty(name = "loadType",value = "监测对象类型")
         private String loadType;
         @ApiModelProperty(name = "voltageLevel",value = "电压等级")

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/MonitorCommLedgerInfoDTO.java

@@ -25,6 +25,9 @@ public class MonitorCommLedgerInfoDTO implements Serializable {
 
     private String busBarName;
 
+    private String objName;
+
+
     private String voltageLevel;
 
     private String shortCapacity;

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/po/Overlimit.java

@@ -2,7 +2,6 @@ package com.njcn.device.biz.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.device.biz.utils.COverlimit;
 import lombok.Data;
 
 import java.io.Serializable;

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java

@@ -18,7 +18,8 @@ import java.util.Objects;
  */
 public class COverlimitUtil {
 
-
+    /** 配网占位默认值 */
+    private static final float PLACEHOLDER = -3.14159f;
     /**
      * 谐波电流系数
      */
@@ -34,38 +35,76 @@ public class COverlimitUtil {
 
     /**
      * 计算监测点限值
-     * @param voltageLevel 电压等级（10kV = 10 220kV = 220 ）
+     * @param voltageLevel    电压等级(kV)
-     * @param protocolCapacity 协议容量
+     * @param protocolCapacity 协议容量(MVA)
-     * @param devCapacity 设备容量
+     * @param devCapacity     供电设备容量(MVA)，为空/0自动取对应电压默认值
-     * @param shortCapacity 短路容量
+     * @param shortCapacity   实际最小短路容量(MVA)
-     * @param powerFlag 0.用户侧 1.电网侧
+     * @param powerFlag       0=电网侧(不执行两步计算)  1=非电网侧/用户侧(执行两步计算)
-     * @param lineType 0.主网 1.配网 需要注意配网目前没有四种容量，谐波电流幅值限值,负序电流限值无法计算默认-3.14159
+     * @param pointClass      配网点类型 0=Ⅱ类 1=Ⅲ类光伏；主网该字段传0即可
      */
     public static Overlimit globalAssemble(Float voltageLevel, Float protocolCapacity, Float devCapacity,
-                                           Float shortCapacity, Integer powerFlag, Integer lineType) {
+                                           Float shortCapacity, Integer powerFlag,Integer pointClass) {
         Overlimit overlimit = new Overlimit();
-        voltageDeviation(overlimit,voltageLevel);
+        voltageDeviation(overlimit, voltageLevel);
         frequency(overlimit);
-        voltageFluctuation(overlimit,voltageLevel);
+        voltageFluctuation(overlimit, voltageLevel);
-        voltageFlicker(overlimit,voltageLevel);
+        voltageFlicker(overlimit, voltageLevel);
-        totalHarmonicDistortion(overlimit,voltageLevel);
+        totalHarmonicDistortion(overlimit, voltageLevel);
-        uHarm(overlimit,voltageLevel);
+        uHarm(overlimit, voltageLevel);
         threeVoltageUnbalance(overlimit);
-        interharmonicCurrent(overlimit,voltageLevel);
+        interharmonicCurrent(overlimit, voltageLevel);
 
-        if(Objects.equals(lineType, RunFlagEnum.PW_FLAG.getStatus())) {
+        //谐波电流限值
-          //配网
+        int lineType;
+        if (voltageLevel >= DicDataEnum.KV220.getValue()) {
+            lineType = 0; // 主网
+        } else {
+            lineType = 1; // 配网（110、66、35、10kV）
+        }
+        float sc = Objects.isNull(shortCapacity) ? 0f : shortCapacity;
+        float pc = Objects.isNull(protocolCapacity) ? 0f : protocolCapacity;
+
+        float dc;
+        if (Objects.isNull(devCapacity) || devCapacity <= 0) {
+            dc = getDefaultDevCapacity(voltageLevel);
+        } else {
+            dc = devCapacity;
+        }
+        // 1. 配网 lineType = 1
+        if (Objects.equals(lineType, RunFlagEnum.PW_FLAG.getStatus())) {
+            overlimit.setINeg(PLACEHOLDER);
             Float[] iHarmTem = new Float[49];
-            for (int i = 0; i <= 48; i++) {
+
-                //目前只处理了配网II类测点，III类测点暂未处理，III类测点参考主网
+            // 配网-电网侧(powerFlag=0) / 配网Ⅱ类：直接基准限值，不折算
-                iHarmTem[i] = getHarmTag(i+2,voltageLevel).floatValue();
+            if (Objects.equals(powerFlag,RunFlagEnum.POWER_FLAG.getStatus()) || Objects.equals(pointClass, 0)) {
+                for (int i = 0; i <= 48; i++) {
+                    iHarmTem[i] = getHarmTag(i + 2, voltageLevel).floatValue();
+                }
+            }
+            // 配网-非电网侧 且 Ⅲ类光伏：两步计算，折算系数固定为1
+            else {
+                float calCap = 1.0f;
+                for (int i = 0; i <= 48; i++) {
+                    float inHarm = iHarmCalculate(i + 2, voltageLevel, pc, dc, calCap);
+                    iHarmTem[i] = inHarm;
+                }
             }
             overlimit.buildIHarm(iHarmTem);
-            overlimit.setINeg(-3.14159f);
+        } else {
-        }else {
+            // 主网-电网侧(powerFlag=0)：直接基准限值
-            //主网
+            if (Objects.equals(powerFlag, RunFlagEnum.POWER_FLAG.getStatus())) {
-            iHarm(overlimit, voltageLevel, protocolCapacity, devCapacity, shortCapacity);
+                Float[] iHarmTem = new Float[49];
-            negativeSequenceCurrent(overlimit, voltageLevel, shortCapacity);
+                for (int i = 0; i <= 48; i++) {
+                    iHarmTem[i] = getHarmTag(i + 2, voltageLevel).floatValue();
+                }
+                overlimit.buildIHarm(iHarmTem);
+            }
+            // 主网-非电网侧/用户侧(风光场站)：完整两步计算
+            else {
+                iHarm(overlimit, voltageLevel, pc, dc, sc);
+            }
+            // 主网统一计算负序电流
+            negativeSequenceCurrent(overlimit, voltageLevel, sc);
         }
         return overlimit;
     }
@@ -304,6 +343,30 @@ public class COverlimitUtil {
     }
 
 
+    /**
+     * 根据电压等级获取【默认公共连接点供电设备容量】St(MVA)
+     * 无实际台账容量时兜底使用
+     */
+    public static float getDefaultDevCapacity(Float voltageLevel) {
+        if (voltageLevel < 0.4f) {
+            return 1.0f;
+        } else if (voltageLevel < 6f) {
+            return 100f;
+        } else if (voltageLevel < 20f) {
+            return 200f;
+        } else if (voltageLevel < 35f) {
+            return 500f;
+        } else if (voltageLevel < 66f) {
+            return 800f;
+        } else if (voltageLevel < 110f) {
+            return 1000f;
+        } else if (voltageLevel < 220f) {
+            return 2000f;
+        } else {
+            return 3000f;
+        }
+    }
+
     /*---------------------------------谐波电流限值end-----------------------------------*/
 
 
@@ -376,8 +439,9 @@ public class COverlimitUtil {
 
     public static void main(String[] args) {
         System.out.println("sss");
-        float aa = iHarmCalculate(9,500f,10,10,0.002222222222f);
+        Overlimit overlimit = new Overlimit();
+        iHarm(overlimit, 220f, 100f, 100f, 2000f);
 
-        System.out.println(aa);
+        System.out.println(overlimit);
     }
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/bo/excel/TerminalBaseExcel.java

@@ -22,65 +22,65 @@ import java.math.BigDecimal;
 public class TerminalBaseExcel implements Serializable {
 
 
-    @Excel(name = "项目", width = 15)
+    @Excel(name = "*项目", width = 15)
     @NotBlank(message = DeviceValidMessage.PROJECT_NAME_NOT)
     @Pattern(regexp = PatternRegex.DEPT_NAME_REGEX, message = DeviceValidMessage.PROJECT_NAME_RULE)
     private String projectName;
 
-    @Excel(name = "工程", width = 15)
+    @Excel(name = "*省份", width = 15)
     @NotBlank(message = DeviceValidMessage.PROVINCE_NAME_NOT)
     private String provinceName;
 
-    @Excel(name = "单位", width = 15)
+    @Excel(name = "*供电公司", width = 15)
     @NotBlank(message = "供电公司名称")
     @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = "供电公司名称违规")
     private String gdName;
 
-    @Excel(name = "部门", width = 15)
+    @Excel(name = "*变电站", width = 15)
     @NotBlank(message = "变电站名称不可为空")
     @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = "变电站名称违规")
     private String substationName;
 
-    @Excel(name = "部门电压等级", width = 15)
+    @Excel(name = "*变电站电压等级", width = 15)
-    @NotBlank(message = "电压等级不可为空")
+    @NotBlank(message = "变电站电压等级不可为空")
     private String subStationScale;
 
-    @Excel(name = "经度", width = 15)
+    @Excel(name = "*经度", width = 15)
     private BigDecimal lng;
 
-    @Excel(name = "纬度", width = 15)
+    @Excel(name = "*纬度", width = 15)
     private BigDecimal lat;
 
-    @Excel(name = "终端", width = 15)
+    @Excel(name = "*装置名称", width = 15)
-    @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = "设备名称违规")
+    @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = "装置名称违规")
     private String deviceName;
 
-    @Excel(name = "终端模型", replace = {"虚拟设备_0", "实际设备_1", "离线设备_2"}, width = 15)
+    @Excel(name = "*终端模型", replace = {"虚拟设备_0", "实际设备_1", "离线设备_2"}, width = 15)
     @NotNull(message = "设备模型不能为空")
     private Integer devModel;
 
-    @Excel(name = "数据类型", replace = {"暂态系统_0", "稳态系统_1", "双系统_2"}, width = 15)
+    @Excel(name = "*数据类型", replace = {"暂态系统_0", "稳态系统_1", "双系统_2"}, width = 15)
     @NotNull(message = "数据类型不能为空")
     private Integer devDataType;
 
-    @Excel(name = "运行状态", replace = {"投运_0", "热备用_1", "停运_2"}, width = 15)
+    @Excel(name = "*运行状态", replace = {"投运_0", "热备用_1", "停运_2"}, width = 15)
     @NotNull(message = "运行状态不能为空")
     private Integer runFlag;
 
 
-    @Excel(name = "终端厂家", width = 15)
+    @Excel(name = "*终端厂家", width = 15)
     @NotBlank(message = "终端厂家不能为空")
     private String manufacturer;
 
-    @Excel(name = "设备型号", width = 15)
+    @Excel(name = "*设备型号", width = 15)
     @NotBlank(message = "设备型号不能为空")
     private String devType;
 
-    @Excel(name = "网络参数", width = 15)
+    @Excel(name = "*网络参数", width = 15)
     @NotBlank(message = "设备网络参数不能为空")
     private String ip;
 
-    @Excel(name = "端口", width = 15)
+    @Excel(name = "*端口", width = 15)
     @Range(min = 1, max = 100000, message = "端口号违规")
     @NotNull(message = "设备端口号不能为空")
     private Integer port;
@@ -91,15 +91,15 @@ public class TerminalBaseExcel implements Serializable {
     @Excel(name = "终端秘钥", width = 15)
     private String devKey;
 
-    @Excel(name = "召唤标志",replace = {"周期触发_0", "变为触发_1"}, width = 15)
+    @Excel(name = "*召唤标志",replace = {"周期触发_0", "变为触发_1"}, width = 15)
     @NotNull(message = "召唤标志不为空")
     private Integer callFlag;
 
-    @Excel(name = "前置名称", width = 15)
+    @Excel(name = "*前置名称", width = 15)
     @NotBlank(message = "前置名称不能为空")
     private String nodeName;
 
-    @Excel(name = "前置类型", width = 15)
+    @Excel(name = "*前置类型", width = 15)
     @NotBlank(message = "前置类型不能为空")
     private String frontType;
 
@@ -109,71 +109,71 @@ public class TerminalBaseExcel implements Serializable {
     @Excel(name = "SIM卡号", width = 15)
     private String sim;
 
-    @Excel(name = "母线", width = 15)
+    @Excel(name = "*母线", width = 15)
     @NotBlank(message = "母线名称不能为空")
     private String subvName;
 
-    @Excel(name = "母线号", width = 15)
+    @Excel(name = "*母线号", width = 15)
     @NotNull(message = "母线号不为空")
     private Integer subvNum;
 
-    @Excel(name = "母线电压等级", width = 15)
+    @Excel(name = "*母线电压等级", width = 15)
     @NotBlank(message = "母线电压等级不能为空")
     private String subvScale;
 
-    @Excel(name = "母线模型", replace = {"虚拟母线_0", "实际母线_1"}, width = 15)
+    @Excel(name = "*母线模型", replace = {"虚拟母线_0", "实际母线_1"}, width = 15)
     @NotNull(message = "母线模型不为空")
     private Integer subvModel;
 
 
-    @Excel(name = "监测点名称", width = 15)
+    @Excel(name = "*监测点名称", width = 15)
     @NotBlank(message = "监测点名称不能为空")
     private String lineName;
 
-    @Excel(name = "监测点线路号", width = 15)
+    @Excel(name = "*监测点线路号", width = 15)
     @NotNull(message = "监测点线路号不为空")
     private Integer lineNum;
 
-    @Excel(name = "监测点等级", width = 15)
+    @Excel(name = "*监测点等级", width = 15)
     private String lineGrade;
 
-    @Excel(name = "pt", width = 20)
+    @Excel(name = "*pt(格式pt1/pt2)", width = 20)
     @NotBlank(message = "pt不能为空")
     private String pt;
 
-    @Excel(name = "ct", width = 20)
+    @Excel(name = "*ct(格式ct1/ct2)", width = 20)
     @NotBlank(message = "ct不能为空")
     private String ct;
 
-    @Excel(name = "设备容量", width = 15)
+    @Excel(name = "*设备容量", width = 15)
     @NotNull(message = "设备容量不为空")
     private Float devCapacity;
 
-    @Excel(name = "短路容量", width = 15)
+    @Excel(name = "*短路容量", width = 15)
     @NotNull(message = "短路容量不为空")
     private Float shortCapacity;
 
-    @Excel(name = "基准容量", width = 15)
+    @Excel(name = "*基准容量", width = 15)
     @NotNull(message = "基准容量不为空")
     private Float standardCapacity;
 
-    @Excel(name = "协议容量", width = 15)
+    @Excel(name = "*协议容量", width = 15)
     @NotNull(message = "协议容量不为空")
     private Float dealCapacity;
 
-    @Excel(name = "接线方式", replace = {"星型接法_0", "三角型接法_1", "开口三角型接法_2"}, width = 15)
+    @Excel(name = "*接线方式", replace = {"星型接法_0", "三角型接法_1", "开口三角型接法_2"}, width = 15)
     @NotNull(message = "接线方式不为空")
     private Integer ptType;
 
-    @Excel(name = "测量间隔", width = 15)
+    @Excel(name = "*测量间隔", width = 15)
     @NotNull(message = "测量间隔不为空")
     private Integer timeInterval;
 
-    @Excel(name = "干扰源类型", width = 15)
+    @Excel(name = "*干扰源类型", width = 15)
     @NotBlank(message = "干扰源类型不为空")
     private String loadType;
 
-    @Excel(name = "行业类型", width = 15)
+    @Excel(name = "*行业类型", width = 15)
     @NotBlank(message = "行业类型不为空")
     private String businessType;
 
@@ -183,11 +183,11 @@ public class TerminalBaseExcel implements Serializable {
     @Excel(name = "监测点对象名称", width = 15)
     private String objName;
 
-    @Excel(name = "电网侧标志", replace = {"电网侧_0", "非电网侧_1"}, width = 15)
+    @Excel(name = "*电网侧标志", replace = {"电网侧_0", "非电网侧_1"}, width = 15)
     @NotNull(message = "电网侧标志不为空")
     private Integer powerFlag;
 
-    @Excel(name = "人为干预统计", replace = {"不参与统计_0", "参与统计_1"}, width = 15)
+    @Excel(name = "*人为干预统计", replace = {"不参与统计_0", "参与统计_1"}, width = 15)
     @NotNull(message = "统计标志不为空")
     private Integer statFlag;
 

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

@@ -0,0 +1,19 @@
+package com.njcn.device.pq.pojo.param;
+
+import lombok.Data;
+
+/**
+ * Description:请求装置文件系统参数
+ * Date: 2026/04/30  上午 10:51【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class AskFileSysParam {
+
+    private String devId;
+    private String path;
+    private String remotePath;
+
+}

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

@@ -1,6 +1,8 @@
 package com.njcn.device.pq.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -17,6 +19,7 @@ import java.io.Serializable;
 public class DeviceProcess implements Serializable {
     private static final long serialVersionUID = 1L;
     //设备id
+    @TableId("Id")
     private String id;
     //设备设备所在前置机进程号
     private Integer processNo;

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

@@ -105,9 +105,12 @@ public class LineDetailVO implements Serializable {
         @ApiModelProperty(name = "终端厂家")
         private String manufacturer;
 
-        @ApiModelProperty(name = "终端厂家")
+        @ApiModelProperty(name = "监测对象ID")
         private String objId;
 
+        @ApiModelProperty(name = "监测对象名称")
+        private String objName;
+
     }
 
     @Data

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

@@ -125,6 +125,8 @@ public class LineIntegrityDataVO implements Serializable {
     private Integer algoDescribe;
 
 
+    @ApiModelProperty(name = "devType",value = "终端型号")
+    private String devType;
 
     @ApiModelProperty(name = "loadType",value = "干扰源类型")
     private String loadType;

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

@@ -154,7 +154,6 @@ public class LineIntegrityDataController extends BaseController {
     @ApiOperation("监测点数据完整性(冀北)")
     @ApiImplicitParam(name = "param", value = "参数实体", required = true)
     public HttpResult<DeviceOnlineRate> getData(@RequestBody DeviceInfoParam.BusinessParam param) {
-        param.setLineOrDevice(0);
         String methodDescribe = getMethodDescribe("getData");
         DeviceOnlineRate rate = irStatIntegrityDService.getData(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rate, methodDescribe);

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

@@ -6,14 +6,14 @@ package com.njcn.device.pq.controller;
  * @Description: 异常告警数据指标范围
  */
 
+import com.njcn.algorithm.pojo.dto.PqReasonableRangeDto;
+import com.njcn.algorithm.pojo.param.DataCleanParam;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.dataProcess.param.DataCleanParam;
-import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
 import com.njcn.device.pq.service.ReasonableRangeService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;

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

@@ -0,0 +1,181 @@
+package com.njcn.device.pq.controller.file;
+
+import cn.hutool.core.date.TimeInterval;
+import cn.hutool.core.util.IdUtil;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.device.device.service.DeviceProcessService;
+import com.njcn.device.device.service.IDeviceService;
+import com.njcn.device.pq.pojo.param.AskFileSysParam;
+import com.njcn.device.pq.pojo.po.Device;
+import com.njcn.device.pq.pojo.po.DeviceProcess;
+import com.njcn.message.api.ProduceFeignClient;
+import com.njcn.message.message.AskFileSysMessage;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.async.DeferredResult;
+
+/**
+ * Description:
+ * Date: 2026/04/29  上午 11:41【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@RestController
+@RequestMapping("/dir")
+@RequiredArgsConstructor
+@Slf4j
+@Api(tags = "装置文件系统")
+public class DirectoryController extends BaseController {
+
+
+    private final ProduceFeignClient produceFeignClient;
+
+
+    private final PendingRequestManager pendingRequestManager;
+
+    private final IDeviceService iDeviceService;
+    private final DeviceProcessService deviceProcessService;
+
+    @PostMapping("/list")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取装置文件目录")
+    public DeferredResult<Object> listDirectory(@RequestBody AskFileSysParam askFileSysParam) {
+        String methodDescribe = getMethodDescribe("listDirectory");
+
+        long timeoutMs = 15000L; // 15 秒超时
+        // 构造指令 body
+        Device device = iDeviceService.getById(askFileSysParam.getDevId());
+        DeviceProcess deviceProcess = deviceProcessService.getById(askFileSysParam.getDevId());
+        // 发送 MQ 指令，获取 msgId
+        AskFileSysMessage askFileSysMessage = new AskFileSysMessage();
+        askFileSysMessage.setGuid(IdUtil.simpleUUID());
+        askFileSysMessage.setNodeId(device.getNodeId());
+        askFileSysMessage.setProcessNo(deviceProcess.getProcessNo());
+        askFileSysMessage.setDevId(askFileSysParam.getDevId());
+        askFileSysMessage.setType(0);
+        askFileSysMessage.setPath(askFileSysParam.getPath());
+
+        produceFeignClient.askFileSys(askFileSysMessage);
+        // 创建挂起请求
+        DeferredResult<Object> deferredResult = pendingRequestManager.createPendingRequest(askFileSysMessage.getGuid(), timeoutMs);
+        // 可额外在 Redis 中记录初始状态（可选）
+        // 返回 DeferredResult，Spring 将挂起此请求
+        return deferredResult;
+    }
+
+    @PostMapping("/downLoadFile")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取装置文件文件")
+    public DeferredResult<Object> downLoadFile(@RequestBody AskFileSysParam askFileSysParam) {
+        String methodDescribe = getMethodDescribe("downLoadFile");
+
+        long timeoutMs = 15000L; // 15 秒超时
+        // 构造指令 body
+        Device device = iDeviceService.getById(askFileSysParam.getDevId());
+        DeviceProcess deviceProcess = deviceProcessService.getById(askFileSysParam.getDevId());
+        // 发送 MQ 指令，获取 msgId
+        AskFileSysMessage askFileSysMessage = new AskFileSysMessage();
+        askFileSysMessage.setGuid(IdUtil.simpleUUID());
+        askFileSysMessage.setNodeId(device.getNodeId());
+        askFileSysMessage.setProcessNo(deviceProcess.getProcessNo());
+        askFileSysMessage.setDevId(askFileSysParam.getDevId());
+        askFileSysMessage.setType(1);
+        askFileSysMessage.setPath(askFileSysParam.getPath());
+
+        produceFeignClient.askFileSys(askFileSysMessage);
+        // 创建挂起请求
+        DeferredResult<Object> deferredResult = pendingRequestManager.createPendingRequest(askFileSysMessage.getGuid(), timeoutMs);
+        // 可额外在 Redis 中记录初始状态（可选）
+        // 返回 DeferredResult，Spring 将挂起此请求
+        return deferredResult;
+    }
+
+    @PostMapping("/upLoadFile")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("上传装置文件文件")
+    public DeferredResult<Object> upLoadFile(@RequestBody AskFileSysParam askFileSysParam) {
+        String methodDescribe = getMethodDescribe("upLoadFile");
+
+        long timeoutMs = 15000L; // 15 秒超时
+        // 构造指令 body
+        Device device = iDeviceService.getById(askFileSysParam.getDevId());
+        DeviceProcess deviceProcess = deviceProcessService.getById(askFileSysParam.getDevId());
+        // 发送 MQ 指令，获取 msgId
+        AskFileSysMessage askFileSysMessage = new AskFileSysMessage();
+        askFileSysMessage.setGuid(IdUtil.simpleUUID());
+        askFileSysMessage.setNodeId(device.getNodeId());
+        askFileSysMessage.setProcessNo(deviceProcess.getProcessNo());
+        askFileSysMessage.setDevId(askFileSysParam.getDevId());
+        askFileSysMessage.setType(2);
+        askFileSysMessage.setPath(askFileSysParam.getPath());
+        askFileSysMessage.setRemotePath(askFileSysParam.getRemotePath());
+        produceFeignClient.askFileSys(askFileSysMessage);
+        // 创建挂起请求
+        DeferredResult<Object> deferredResult = pendingRequestManager.createPendingRequest(askFileSysMessage.getGuid(), timeoutMs);
+        // 可额外在 Redis 中记录初始状态（可选）
+        // 返回 DeferredResult，Spring 将挂起此请求
+        return deferredResult;
+    }
+
+    @PostMapping("/delete")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("装置目录，文件删除")
+    public DeferredResult<Object> delete(@RequestBody AskFileSysParam askFileSysParam) {
+        String methodDescribe = getMethodDescribe("delete");
+
+        long timeoutMs = 15000L; // 15 秒超时
+        // 构造指令 body
+        Device device = iDeviceService.getById(askFileSysParam.getDevId());
+        DeviceProcess deviceProcess = deviceProcessService.getById(askFileSysParam.getDevId());
+        // 发送 MQ 指令，获取 msgId
+        AskFileSysMessage askFileSysMessage = new AskFileSysMessage();
+        askFileSysMessage.setGuid(IdUtil.simpleUUID());
+        askFileSysMessage.setNodeId(device.getNodeId());
+        askFileSysMessage.setProcessNo(deviceProcess.getProcessNo());
+        askFileSysMessage.setDevId(askFileSysParam.getDevId());
+        askFileSysMessage.setType(3);
+        askFileSysMessage.setPath(askFileSysParam.getPath());
+        askFileSysMessage.setRemotePath(askFileSysParam.getRemotePath());
+        produceFeignClient.askFileSys(askFileSysMessage);
+        // 创建挂起请求
+        DeferredResult<Object> deferredResult = pendingRequestManager.createPendingRequest(askFileSysMessage.getGuid(), timeoutMs);
+        // 可额外在 Redis 中记录初始状态（可选）
+        // 返回 DeferredResult，Spring 将挂起此请求
+        return deferredResult;
+    }
+
+    @PostMapping("/restart")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("装置重启")
+    public DeferredResult<Object> restart(@RequestBody AskFileSysParam askFileSysParam) {
+        String methodDescribe = getMethodDescribe("restart");
+
+        long timeoutMs = 15000L; // 15 秒超时
+        // 构造指令 body
+        Device device = iDeviceService.getById(askFileSysParam.getDevId());
+        DeviceProcess deviceProcess = deviceProcessService.getById(askFileSysParam.getDevId());
+        // 发送 MQ 指令，获取 msgId
+        AskFileSysMessage askFileSysMessage = new AskFileSysMessage();
+        askFileSysMessage.setGuid(IdUtil.simpleUUID());
+        askFileSysMessage.setNodeId(device.getNodeId());
+        askFileSysMessage.setProcessNo(deviceProcess.getProcessNo());
+        askFileSysMessage.setDevId(askFileSysParam.getDevId());
+        askFileSysMessage.setPath("reboot");
+        askFileSysMessage.setType(4);
+        produceFeignClient.askFileSys(askFileSysMessage);
+        // 创建挂起请求
+        DeferredResult<Object> deferredResult = pendingRequestManager.createPendingRequest(askFileSysMessage.getGuid(), timeoutMs);
+        // 可额外在 Redis 中记录初始状态（可选）
+        // 返回 DeferredResult，Spring 将挂起此请求
+        return deferredResult;
+    }
+
+
+}

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

@@ -0,0 +1,61 @@
+package com.njcn.device.pq.controller.file;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.utils.HttpResultUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.async.DeferredResult;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Component
+@Slf4j
+public class PendingRequestManager {
+
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
+
+    // 本地映射：msgId -> DeferredResult，主要用于超时清理和主动完成
+    private final ConcurrentHashMap<String, DeferredResult<Object>> deferredResultMap = new ConcurrentHashMap<>();
+
+    // 创建挂起请求
+    public DeferredResult<Object> createPendingRequest(String msgId, long timeoutMs) {
+        DeferredResult<Object> deferredResult = new DeferredResult<>(timeoutMs);
+        // 超时回调
+        deferredResult.onTimeout(() -> {
+            // 清理 Redis 中的等待记录
+            redisTemplate.delete("pending:" + msgId);
+            deferredResultMap.remove(msgId);
+            deferredResult.setErrorResult(new BusinessException("前置超时...."));
+        });
+        // 完成回调（正常或异常后移出本地映射）
+        deferredResult.onCompletion(() -> deferredResultMap.remove(msgId));
+
+        deferredResultMap.put(msgId, deferredResult);
+        return deferredResult;
+    }
+
+    // 收到 Redis 通知后，根据 msgId 完成请求
+    public void completeRequest(String msgId) {
+        if (deferredResultMap.containsKey(msgId)) {
+            DeferredResult<Object> deferredResult = deferredResultMap.get(msgId);
+
+            // 从 Redis 中获取结果内容
+            String key = "pending:" + msgId;
+            Object result = redisTemplate.opsForValue().get(key);
+            if (result != null) {
+                deferredResult.setResult( HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result,""));
+            } else {
+                log.info("Receive notification for unknown msgId: " + msgId);
+                deferredResult.setErrorResult(new BusinessException("前置未返回结果"));
+            }
+            // 清理 Redis 中的记录（可选，利用过期时间自动删除也可）
+            redisTemplate.delete(key);
+        } else {
+            // 可能请求已超时被移除了，仅记录日志即可
+            log.info("Receive notification for unknown msgId: " + msgId);
+        }
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.njcn.device.pq.controller.file;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.Message;
+import org.springframework.data.redis.connection.MessageListener;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.StandardCharsets;
+
+@Component
+public class RedisMessageSubscriber implements MessageListener {
+    @Autowired
+    private PendingRequestManager pendingRequestManager;
+
+    @Override
+    public void onMessage(Message message, byte[] pattern) {
+        String msgId = new String(message.getBody(), StandardCharsets.UTF_8);
+        pendingRequestManager.completeRequest(msgId);
+    }
+}

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

@@ -0,0 +1,44 @@
+package com.njcn.device.pq.controller.file;
+
+import com.njcn.redis.config.RedisConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.data.redis.connection.Message;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.listener.ChannelTopic;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.data.redis.listener.adapter.MessageListenerAdapter;
+import org.springframework.stereotype.Component;
+import org.springframework.data.redis.connection.MessageListener;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * Description:
+ * Date: 2026/04/29  下午 3:37【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Configuration
+@Import(RedisConfig.class)  // 引入公共配置
+public class RedisSubscriptionConfig {
+
+    @Bean
+    public RedisMessageListenerContainer redisContainer(
+            RedisConnectionFactory connectionFactory,
+            MessageListenerAdapter resultListenerAdapter) {
+        RedisMessageListenerContainer container = new RedisMessageListenerContainer();
+        container.setConnectionFactory(connectionFactory);
+        container.addMessageListener(resultListenerAdapter, new ChannelTopic("result_ready_channel"));
+        return container;
+    }
+
+    @Bean
+    public MessageListenerAdapter resultListenerAdapter(RedisMessageSubscriber subscriber) {
+        return new MessageListenerAdapter(subscriber, "onMessage");
+    }
+}
+

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

@@ -14,6 +14,7 @@ import com.njcn.message.constant.RedisKeyPrefix;
 import com.njcn.redis.utils.RedisUtil;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -35,6 +36,7 @@ import java.util.stream.Collectors;
 @Component
 @EnableScheduling
 @RequiredArgsConstructor
+@ConditionalOnProperty(name = "business.task-enabled", havingValue = "true", matchIfMissing = true)
 public class DeviceComflagTasks {
     private  final NodeMapper nodeMapper;
     private final IDeviceService iDeviceService;

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

@@ -1,7 +1,7 @@
 package com.njcn.device.pq.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.dataProcess.pojo.po.PqReasonableRange;
+import com.njcn.algorithm.pojo.po.PqReasonableRange;
 
 /**
  * <p>

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

@@ -84,6 +84,7 @@
         pldsdd.id AS lineGrade,
         pldsdd.Algo_Describe AS algoDescribe,
         pld.Load_Type AS loadType,
+        pd.Dev_Type AS devType,
         pld.obj_id as objId
         FROM
         pq_line AS line

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

@@ -1,9 +1,10 @@
 package com.njcn.device.pq.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.dataProcess.param.DataCleanParam;
+import com.njcn.algorithm.pojo.dto.PqReasonableRangeDto;
-import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
+import com.njcn.algorithm.pojo.param.DataCleanParam;
-import com.njcn.dataProcess.pojo.po.PqReasonableRange;
+import com.njcn.algorithm.pojo.po.PqReasonableRange;
+
 
 import java.util.List;
 

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

@@ -9,20 +9,17 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.algorithm.pojo.api.PqReasonableRangeFeignClient;
+import com.njcn.algorithm.pojo.dto.PqReasonableRangeDto;
+import com.njcn.algorithm.pojo.param.DataCleanParam;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.dataProcess.api.DataLimitRateDetailFeignClient;
 import com.njcn.dataProcess.api.DataLimitRateFeignClient;
 import com.njcn.dataProcess.api.DataLimitTargetFeignClient;
-import com.njcn.dataProcess.api.PqReasonableRangeFeignClient;
 import com.njcn.dataProcess.enums.DataCleanEnum;
-import com.njcn.dataProcess.param.DataCleanParam;
 import com.njcn.dataProcess.param.LineCountEvaluateParam;
 import com.njcn.dataProcess.pojo.dto.DataLimitRateDetailDto;
-import com.njcn.dataProcess.pojo.dto.DataLimitRateDto;
 import com.njcn.dataProcess.pojo.dto.DataLimitTargetDto;
-import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
-import com.njcn.device.biz.enums.DeviceResponseEnum;
-import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
 import com.njcn.device.biz.pojo.po.Overlimit;
 import com.njcn.device.line.mapper.LineMapper;
 import com.njcn.device.line.service.DeptLineService;

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

@@ -19,12 +19,12 @@ import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.algorithm.pojo.api.PqReasonableRangeFeignClient;
+import com.njcn.algorithm.pojo.dto.PqReasonableRangeDto;
+import com.njcn.algorithm.pojo.param.DataCleanParam;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.dataProcess.api.PqReasonableRangeFeignClient;
 import com.njcn.dataProcess.enums.DataCleanEnum;
-import com.njcn.dataProcess.param.DataCleanParam;
-import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
 import com.njcn.device.common.mapper.onlinerate.OnLineRateMapper;
 import com.njcn.device.common.service.GeneralDeviceService;
 import com.njcn.device.line.mapper.LineMapper;

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

@@ -2,12 +2,15 @@ package com.njcn.device.pq.service.impl;
 
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.device.biz.commApi.CommLineClient;
+import com.njcn.device.biz.pojo.dto.LineALLInfoDTO;
 import com.njcn.device.common.service.GeneralDeviceService;
 import com.njcn.device.line.mapper.LineDetailMapper;
 import com.njcn.device.line.mapper.LineMapper;
@@ -65,7 +68,6 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMa
     private final LineDetailMapper lineDetailMapper;
     private final GeneralDeviceService deviceService;
     private final LineService lineService;
-    private final UserLedgerService userLedgerService;
 
     @Override
     public Float getTotalIntegrityByLineIds(LineBaseQueryParam param) {
@@ -154,32 +156,29 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMa
                     .stream()
                     .distinct()
                     .collect(Collectors.toList());
-            rate.setTotalNum(lineIds.size());
             //获取所有监测点的数据完整性
             List<RStatIntegrityVO> lineIntegrityRateInfo = rStatIntegrityDMapper.getLineIntegrityRateInfo(lineIds, param.getSearchBeginTime(), param.getSearchEndTime());
             //获取所有监测点信息信息
             List<LineDetailVO.Detail> LineInfoByIds = lineService.getLineDetailByIds(lineIds);
 
+            rate.setTotalNum(lineIds.size());
             rate.setBelowNum(CollUtil.isNotEmpty(lineIntegrityRateInfo) ? calculateIntegrityRate(lineIntegrityRateInfo, 90, lineIds.size()) : lineIds.size());
-            rate.setTotalOnlineRate(calculateIntegrityRate(lineIntegrityRateInfo, lineIds).doubleValue()>100.0?BigDecimal.valueOf(100.0) : calculateIntegrityRate(lineIntegrityRateInfo, lineIds));
+            rate.setTotalOnlineRate(calculateIntegrityRate(lineIntegrityRateInfo, lineIds).doubleValue() > 100.0 ? BigDecimal.valueOf(100.0) : calculateIntegrityRate(lineIntegrityRateInfo, lineIds));
             List<DeviceOnlineRate.CitDetail> citDetailList = new ArrayList<>();
             DeviceOnlineRate.CitDetail citDetail;
             DeviceOnlineRate.LineDetail detail;
-            //用户侧监测点 监测对象
-            List<UserLedgerVO> userLedgerVOS = userLedgerService.selectUserList(new UserReportParam());
-            Map<String, String> objMap = userLedgerVOS.stream().collect(Collectors.toMap(UserLedgerVO::getId, UserLedgerVO::getProjectName));
             for (GeneralDeviceDTO dto : deviceInfo) {
                 //获取部门终端集合
                 List<RStatIntegrityVO> citDevOnRate = lineIntegrityRateInfo.stream().filter(x -> dto.getLineIndexes().contains(x.getLineIndex())).collect(Collectors.toList());
                 Map<String, BigDecimal> onlineRateByDevMap = citDevOnRate.stream()
                         .collect(Collectors.toMap(RStatIntegrityVO::getLineIndex, RStatIntegrityVO::getIntegrityRate));
                 citDetail = new DeviceOnlineRate.CitDetail();
+                List<LineDetailVO.Detail> lineDetail = LineInfoByIds.stream().filter(x -> dto.getLineIndexes().contains(x.getLineId())).collect(Collectors.toList());
                 citDetail.setCitName(dto.getName());
                 citDetail.setCitTotalNum(dto.getLineIndexes().size());
                 citDetail.setCitBelowNum(CollUtil.isNotEmpty(citDevOnRate) ? calculateIntegrityRate(citDevOnRate, 90, dto.getLineIndexes().size()) : dto.getLineIndexes().size());
-                citDetail.setCitTotalOnlineRate(calculateIntegrityRate(lineIntegrityRateInfo, dto.getLineIndexes()).doubleValue()>100.0?BigDecimal.valueOf(100.0):calculateIntegrityRate(lineIntegrityRateInfo, dto.getLineIndexes()));
+                citDetail.setCitTotalOnlineRate(calculateIntegrityRate(lineIntegrityRateInfo, dto.getLineIndexes()).doubleValue() > 100.0 ? BigDecimal.valueOf(100.0) : calculateIntegrityRate(lineIntegrityRateInfo, dto.getLineIndexes()));
                 List<DeviceOnlineRate.LineDetail> detailList = new ArrayList<>();
-                List<LineDetailVO.Detail> lineDetail = LineInfoByIds.stream().filter(x -> dto.getLineIndexes().contains(x.getLineId())).collect(Collectors.toList());
                 for (LineDetailVO.Detail line : lineDetail) {
                     detail = new DeviceOnlineRate.LineDetail();
                     detail.setCit(line.getDeptName());
@@ -193,9 +192,9 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMa
                     detail.setLineId(line.getLineId());
                     detail.setLineName(line.getLineName());
                     //用户侧监测点 监测对象
-                    detail.setObjName(StringUtils.isBlank(line.getObjId())?"/":objMap.get(line.getObjId()));
+                    detail.setObjName(StringUtils.isBlank(line.getObjName()) ? "/" : line.getObjName());
                     detail.setLatestTime(line.getTimeID());
-                    detail.setIntegrity(onlineRateByDevMap.getOrDefault(line.getLineId(), BigDecimal.valueOf(0)).doubleValue()>100.0?BigDecimal.valueOf(100.0):onlineRateByDevMap.getOrDefault(line.getLineId(), BigDecimal.valueOf(0)));
+                    detail.setIntegrity(onlineRateByDevMap.getOrDefault(line.getLineId(), BigDecimal.valueOf(0)).doubleValue() > 100.0 ? BigDecimal.valueOf(100.0) : onlineRateByDevMap.getOrDefault(line.getLineId(), BigDecimal.valueOf(0)));
                     detailList.add(detail);
                 }
                 citDetail.setDetailList(detailList);

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

@@ -3,10 +3,11 @@ package com.njcn.device.pq.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.dataProcess.param.DataCleanParam;
+import com.njcn.algorithm.pojo.dto.PqReasonableRangeDto;
-import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
+import com.njcn.algorithm.pojo.param.DataCleanParam;
-import com.njcn.dataProcess.pojo.po.PqReasonableRange;
+import com.njcn.algorithm.pojo.po.PqReasonableRange;
 import com.njcn.device.pq.mapper.ReasonableRangeMapper;
 import com.njcn.device.pq.service.ReasonableRangeService;
 import org.springframework.beans.BeanUtils;

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

@@ -139,7 +139,7 @@ public class RunManageServiceImpl implements RunManageService {
             List<String> devIndexes = generalDeviceDTOList.stream().flatMap(list -> list.getDeviceIndexes().stream()).collect(Collectors.toList());
             List<String> manuList = runManageParam.getManufacturer().stream().map(SimpleDTO::getId).collect(Collectors.toList());
             if (CollectionUtil.isEmpty(devIndexes)) {
-                throw new BusinessException("当前部门没有装置台账");
+                return  new Page<>(PageFactory.getPageNum(runManageParam), PageFactory.getPageSize(runManageParam));
             }
             return deviceMapper.getRunManageDevList(new Page<>(PageFactory.getPageNum(runManageParam), PageFactory.getPageSize(runManageParam)),devIndexes, runManageParam.getComFlag(), runManageParam.getRunFlag(), manuList, runManageParam.getSearchValue());
     }

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

@@ -37,6 +37,7 @@ import com.njcn.device.device.mapper.DeviceMapper;
 import com.njcn.device.device.service.DeviceBakService;
 import com.njcn.device.device.service.DeviceProcessService;
 import com.njcn.device.device.service.NodeDeviceService;
+import com.njcn.device.device.service.PqDevTypeService;
 import com.njcn.device.line.mapper.DeptLineMapper;
 import com.njcn.device.line.mapper.LineDetailMapper;
 import com.njcn.device.line.mapper.LineMapper;
@@ -63,6 +64,7 @@ import com.njcn.device.subvoltage.mapper.VoltageMapper;
 import com.njcn.device.terminal.mapper.PqsTerminalLogsMapper;
 import com.njcn.device.userledger.service.UserLedgerService;
 import com.njcn.device.utils.ExcelStyleUtil;
+import com.njcn.device.utils.LineSortHelper;
 import com.njcn.message.api.ProduceFeignClient;
 import com.njcn.message.constant.DeviceRebootType;
 import com.njcn.message.constant.RedisKeyPrefix;
@@ -74,6 +76,8 @@ import com.njcn.oss.utils.FileStorageUtil;
 import com.njcn.poi.excel.ExcelUtil;
 import com.njcn.poi.util.PoiUtil;
 import com.njcn.redis.utils.RedisUtil;
+import com.njcn.supervision.pojo.param.user.UserReportParam;
+import com.njcn.supervision.pojo.po.user.UserReportPO;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import com.njcn.system.api.AreaFeignClient;
 import com.njcn.system.api.DicDataFeignClient;
@@ -140,6 +144,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
     private final DeviceProcessService deviceProcessService;
     private final ProduceFeignClient produceFeignClient;
     private final UserLedgerService userLedgerService;
+    private final PqDevTypeService pqDevTypeService;
+    private final LineSortHelper lineSortHelper;
 
     @Value("${oracle.isSync}")
     private Boolean isSync;
@@ -201,6 +207,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
             if (StrUtil.isBlank(projectIndex)) {
                 checkName(addTerminalParam, PROJECT_LEVEL.getCode(), null);
                 Line line = assembleLine(addTerminalParam.getProjectParam().getName(), PROJECT_LEVEL.getCode(), "0", "0", addTerminalParam.getProjectParam().getSort());
+                lineSortHelper.handleSort(PROJECT_LEVEL.getCode(),addTerminalParam.getProjectParam().getSort(),line);
                 this.baseMapper.insert(line);
                 projectIndex = line.getId();
             }
@@ -215,6 +222,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                 LogUtil.njcnDebug(log, "获取区域信息：{}", result.toString());
                 checkName(addTerminalParam, PROVINCE_LEVEL.getCode(), projectIndex);
                 Line province = assembleLine(result.getId(), PROVINCE_LEVEL.getCode(), projectIndex, projectIndex, addTerminalParam.getProvinceParam().getSort());
+                lineSortHelper.handleSort(PROVINCE_LEVEL.getCode(),addTerminalParam.getProvinceParam().getSort(),province);
                 this.baseMapper.insert(province);
                 provinceIndex = province.getId();
             }
@@ -225,6 +233,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
             if (StrUtil.isBlank(gdIndex) && StrUtil.isNotBlank(provinceIndex)) {
                 checkName(addTerminalParam, GD_LEVEL.getCode(), provinceIndex);
                 Line gdInformation = assembleLine(addTerminalParam.getGdInformationParam().getName(), GD_LEVEL.getCode(), provinceIndex, projectIndex + StrUtil.COMMA + provinceIndex, addTerminalParam.getGdInformationParam().getSort());
+                lineSortHelper.handleSort(GD_LEVEL.getCode(),addTerminalParam.getGdInformationParam().getSort(),gdInformation);
                 this.baseMapper.insert(gdInformation);
                 gdIndex = gdInformation.getId();
             }
@@ -235,6 +244,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
             if (StrUtil.isBlank(subIndex) && StrUtil.isNotBlank(gdIndex)) {
                 checkName(addTerminalParam, LineBaseEnum.SUB_LEVEL.getCode(), gdIndex);
                 Line subStation = assembleLine(addTerminalParam.getSubStationParam().getName(), LineBaseEnum.SUB_LEVEL.getCode(), gdIndex, projectIndex + StrUtil.COMMA + provinceIndex + StrUtil.COMMA + gdIndex, addTerminalParam.getSubStationParam().getSort());
+                lineSortHelper.handleSort(SUB_LEVEL.getCode(),addTerminalParam.getSubStationParam().getSort(),subStation);
                 this.baseMapper.insert(subStation);
                 subIndex = subStation.getId();
 
@@ -255,6 +265,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
             if (CollectionUtil.isNotEmpty(addTerminalParam.getDeviceParam()) && StrUtil.isNotBlank(subIndex)) {
                 //校验变电站下的装置名称ip是否重复
                 checkDevNameAndIp(addTerminalParam, subIndex, lineLambdaQueryWrapper);
+
+                Integer devSort = lineSortHelper.getNextSort(DEVICE_LEVEL.getCode());
                 for (DeviceParam deviceParam : addTerminalParam.getDeviceParam()) {
                     //用于记录装置id
                     String devIdIndex;
@@ -282,9 +294,16 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                         }
                     }
 
+
                     if (StrUtil.isBlank(deviceParam.getDevIndex())) {
                         Line device = assembleLine(deviceParam.getName(), LineBaseEnum.DEVICE_LEVEL.getCode(), subIndex, projectIndex + StrUtil.COMMA + provinceIndex + StrUtil.COMMA + gdIndex + StrUtil.COMMA + subIndex, deviceParam.getSort());
+                        if(Objects.isNull(deviceParam.getSort()) || deviceParam.getSort() == 0){
+                            device.setSort(devSort);
+                        }
                         this.baseMapper.insert(device);
+                        if(Objects.isNull(deviceParam.getSort()) || deviceParam.getSort() == 0){
+                            devSort++;
+                        }
                         devIdIndex = device.getId();
 
                         //装置详情
@@ -389,7 +408,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                 throw new BusinessException(DeviceResponseEnum.SUBV_NAME_SAME, voltageListBySubId.stream().map(Line::getName).collect(Collectors.joining(";")));
                             }
                         }
-
+                        Integer subvSort = lineSortHelper.getNextSort(SUB_V_LEVEL.getCode());
                         for (SubVoltageParam subVoltageParam : deviceParam.getSubVoltageParam()) {
                             //母线id
                             String subvIndex;
@@ -409,7 +428,13 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                 }
 
                                 Line subVoltage = assembleLine(subVoltageParam.getName(), LineBaseEnum.SUB_V_LEVEL.getCode(), devIdIndex, projectIndex + StrUtil.COMMA + provinceIndex + StrUtil.COMMA + gdIndex + StrUtil.COMMA + subIndex + StrUtil.COMMA + devIdIndex, subVoltageParam.getSort());
+                                if(Objects.isNull(subVoltageParam.getSort()) || subVoltageParam.getSort() == 0) {
+                                    subVoltage.setSort(subvSort);
+                                }
                                 this.baseMapper.insert(subVoltage);
+                                if(Objects.isNull(subVoltageParam.getSort()) || subVoltageParam.getSort() == 0) {
+                                    subvSort++;
+                                }
                                 subvIndex = subVoltage.getId();
                                 Voltage voltage = new Voltage();
                                 voltage.setId(subVoltage.getId());
@@ -437,6 +462,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                     }
                                 }
                                 //通用新增监测点
+                                Integer lineSort = lineSortHelper.getNextSort(LineBaseEnum.LINE_LEVEL.getCode());
                                 for (LineParam lineParam : subVoltageParam.getLineParam()) {
                                     if (StrUtil.isBlank(lineParam.getLineIndex()) && StrUtil.isNotBlank(subvIndex)) {
                                         //判断监测点序号是否重复
@@ -450,7 +476,13 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                         //删除与当前线路号重复的项
                                         listLineNum.removeIf(lineNo -> lineNo.equals(lineParam.getNum()));
                                         Line line = assembleLine(lineParam.getName(), LineBaseEnum.LINE_LEVEL.getCode(), subvIndex, projectIndex + StrUtil.COMMA + provinceIndex + StrUtil.COMMA + gdIndex + StrUtil.COMMA + subIndex + StrUtil.COMMA + devIdIndex + StrUtil.COMMA + subvIndex, lineParam.getSort());
+                                        if(Objects.isNull(lineParam.getSort()) || lineParam.getSort() == 0) {
+                                            line.setSort(lineSort);
+                                        }
                                         this.baseMapper.insert(line);
+                                        if(Objects.isNull(lineParam.getSort()) || lineParam.getSort() == 0) {
+                                            lineSort++;
+                                        }
                                         LineDetail lineDetail = new LineDetail();
                                         BeanUtils.copyProperties(lineParam, lineDetail);
                                         lineDetail.setId(line.getId());
@@ -477,7 +509,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                         //监测点限值
                                         DictData scaleResult = dicDataFeignClient.getDicDataById(voltage.getScale()).getData();
                                         float scaTmp = Float.parseFloat(scaleResult.getValue());
-                                        Overlimit overlimit = COverlimitUtil.globalAssemble(scaTmp, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1, 0);
+                                        Overlimit overlimit = COverlimitUtil.globalAssemble(scaTmp, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), lineDetail.getPowerFlag(), 0);
 
                                         if (Objects.isNull(lineParam.getVoltageDev())) {
                                             overlimit.setVoltageDev(overlimit.getVoltageDev());
@@ -748,7 +780,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                 float voltageLevel = Float.parseFloat(dictData.getValue());
                                 if (CollectionUtil.isNotEmpty(lineList)) {
                                     for (LineDetail lineDetail : lineList) {
-                                        Overlimit overlimit = COverlimitUtil.globalAssemble(voltageLevel, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1, 0);
+                                        Overlimit overlimit = COverlimitUtil.globalAssemble(voltageLevel, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), lineDetail.getPowerFlag(), 0);
                                         overlimit.setId(lineDetail.getId());
                                         overlimitMapper.deleteById(lineDetail.getId());
                                         overlimitMapper.insert(overlimit);
@@ -835,7 +867,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                     float scaTmp = Float.parseFloat(scaleResult.getValue());
 
                                     //监测点限值
-                                    Overlimit overlimit = COverlimitUtil.globalAssemble(scaTmp, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1, 0);
+                                    Overlimit overlimit = COverlimitUtil.globalAssemble(scaTmp, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), lineDetail.getPowerFlag(), 0);
                                     if (Objects.isNull(updateLineBO.getVoltageDev())) {
                                         overlimit.setVoltageDev(overlimit.getVoltageDev());
                                     } else {
@@ -853,7 +885,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                 if (!Objects.equals(lineDetail.getCt1(), lineDetailRes.getCt1()) || !Objects.equals(lineDetail.getCt2(), lineDetailRes.getCt2())
                                         || !Objects.equals(lineDetail.getPt1(), lineDetailRes.getPt1()) || !Objects.equals(lineDetail.getPt2(), lineDetailRes.getPt2())
                                         || !Objects.equals(lineDetail.getDevCapacity(), lineDetailRes.getDevCapacity()) || !Objects.equals(lineDetail.getShortCapacity(), lineDetailRes.getShortCapacity())
-                                        || !Objects.equals(lineDetail.getStandardCapacity(), lineDetailRes.getStandardCapacity()) || !Objects.equals(lineDetail.getDealCapacity(), lineDetailRes.getDealCapacity())) {
+                                        || !Objects.equals(lineDetail.getStandardCapacity(), lineDetailRes.getStandardCapacity()) || !Objects.equals(lineDetail.getDealCapacity(), lineDetailRes.getDealCapacity())
+                                        || !Objects.equals(lineDetail.getPtType(), lineDetailRes.getPtType())) {
                                     //获取用户信息
                                     String index = RequestUtil.getUserIndex();
                                     queryUpdateAndInsertLog(userName, index, lineDetail, lineDetailRes);
@@ -959,6 +992,11 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
             sbNew.append("协议容量: ").append(newLine.getDealCapacity()).append(";");
             sbOld.append("协议容量: ").append(oldLine.getDealCapacity()).append(";");
         }
+        //接线方式
+        if (!Objects.equals(newLine.getPtType(), oldLine.getPtType())) {
+            sbNew.append("接线方式: ").append(newLine.getPtType()).append(";");
+            sbOld.append("接线方式: ").append(oldLine.getPtType()).append(";");
+        }
         sb.append(sbNew).append(sbOld);
         HttpResult<DictData> dicDataByCode = dicDataFeignClient.getDicDataByCode(DicDataEnum.LINE_PARAMETER.getCode());
         DictData data = dicDataByCode.getData();
@@ -1625,6 +1663,9 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
 
     @Override
     public List<Line> getLineByCondition(List<String> ids, DeviceInfoParam deviceInfoParam) {
+        if(StrUtil.isNotBlank(deviceInfoParam.getSearchValue())){
+            return this.baseMapper.getLineByConditionBySearchValue(ids, deviceInfoParam);
+        }
         return this.baseMapper.getLineByCondition(ids, deviceInfoParam);
     }
 
@@ -1725,18 +1766,24 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
         List<DictData> businessList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.BUSINESS_TYPE.getName()).getData();
         List<DictData> loadTypeList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.INTERFERENCE_SOURCE_TYPE.getName()).getData();
         List<DictData> manufacturerList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_MANUFACTURER.getName()).getData();
-        List<DictData> devTypeList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_TYPE.getName()).getData();
+//        List<DictData> devTypeList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_TYPE.getName()).getData();
+        List<PqDevType> devTypeList = pqDevTypeService.list(new LambdaQueryWrapper<PqDevType>()
+                        .eq(PqDevType::getState, DataStateEnum.ENABLE.getCode())
+                        .orderByDesc(PqDevType::getCreateTime));
         List<DictData> frontList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.FRONT_TYPE.getName()).getData();
         List<DictData> scaleList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
+        List<UserLedgerVO> userLedgerVOS = userLedgerService.selectUserList(new UserReportParam());
         List<Node> nodeList = nodeService.nodeAllList();
 
+        ExcelUtil.selectList(workbook, 4, 4, scaleList.stream().map(DictData::getName).collect(Collectors.toList()).toArray(new String[]{}));
+        ExcelUtil.selectList(workbook, 40, 40, userLedgerVOS.stream().map(UserLedgerVO::getProjectName).collect(Collectors.toList()).toArray(new String[]{}));
 
         //这里是自己加的 带下拉框的代码
         ExcelUtil.selectList(workbook, 8, 8, new String[]{"虚拟设备", "实际设备", "离线设备"});
         ExcelUtil.selectList(workbook, 9, 9, new String[]{"暂态系统", "稳态系统", "双系统"});
         ExcelUtil.selectList(workbook, 10, 10, new String[]{"投运", "热备用", "停运"});
         ExcelUtil.selectList(workbook, 11, 11, manufacturerList.stream().map(DictData::getName).collect(Collectors.toList()).toArray(new String[]{}));
-        ExcelUtil.selectList(workbook, 12, 12, devTypeList.stream().map(DictData::getName).collect(Collectors.toList()).toArray(new String[]{}));
+        ExcelUtil.selectList(workbook, 12, 12, devTypeList.stream().map(PqDevType::getName).collect(Collectors.toList()).toArray(new String[]{}));
         ExcelUtil.selectList(workbook, 17, 17, new String[]{"周期触发", "变为触发"});
         ExcelUtil.selectList(workbook, 18, 18, nodeList.stream().map(Node::getName).collect(Collectors.toList()).toArray(new String[]{}));
         ExcelUtil.selectList(workbook, 19, 19, frontList.stream().map(DictData::getName).collect(Collectors.toList()).toArray(new String[]{}));
@@ -1754,6 +1801,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
         ExcelUtil.selectList(workbook, 41, 41, new String[]{"电网侧", "非电网侧"});
         ExcelUtil.selectList(workbook, 42, 42, new String[]{"不参与统计", "参与统计"});
         PoiUtil.exportFileByWorkbook(workbook, "台账导入模板.xlsx", response);
+
+
     }
 
     @Override
@@ -1842,7 +1891,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                 }
 
                 float voltageLevel = Float.parseFloat(scaleResult.getValue());
-                Overlimit overlimit = COverlimitUtil.globalAssemble(voltageLevel, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1, 0);
+                Overlimit overlimit = COverlimitUtil.globalAssemble(voltageLevel, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), lineDetail.getPowerFlag(), 0);
                 overlimit.setId(lineDetail.getId());
                 overlimitMapper.insert(overlimit);
                 count++;
@@ -2175,7 +2224,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
         //监测点限值
         DictData scaleResult = dicDataFeignClient.getDicDataById(voltage.getScale()).getData();
         float scaTmp = Float.parseFloat(scaleResult.getValue());
-        Overlimit overlimit = COverlimitUtil.globalAssemble(scaTmp, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1, 0);
+        Overlimit overlimit = COverlimitUtil.globalAssemble(scaTmp, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), lineDetail.getPowerFlag(), 0);
 
         if (Objects.isNull(lineParam.getVoltageDev())) {
             overlimit.setVoltageDev(overlimit.getVoltageDev());
@@ -2723,7 +2772,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
      * @author cdf
      * @date 2022/5/18
      */
-    private void saveTerminalBase(List<TerminalBaseExcel> terminalBaseExcels) {
+    @Transactional(rollbackFor = Exception.class)
+    public void saveTerminalBase(List<TerminalBaseExcel> terminalBaseExcels) {
         List<TerminalBaseExcel.TerminalBaseExcelMsg> terminalBaseExcelMsgs = new ArrayList<>();
         //任意集合数据为空，不处理
         if (CollectionUtil.isNotEmpty(terminalBaseExcels)) {
@@ -2838,9 +2888,15 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                     }
                     //处理终端类型
                     DictData devTypeDicData = dicDataFeignClient.getDicDataByName(terminalBaseExcel.getDevType()).getData();
+                    PqDevType one = new PqDevType();
                     if (Objects.isNull(devTypeDicData)) {
-                        terminalBaseExcelMsgs.add(assembleBaseMsg(terminalBaseExcel, "字典装置型号不存在"));
+                        //上边逻辑不删兼容旧版本，新版本查询pq_dev_type
-                        continue;
+                        one = pqDevTypeService.lambdaQuery().eq(PqDevType::getName, terminalBaseExcel.getDevType()).eq(PqDevType::getState, DataStateEnum.ENABLE.getCode()).one();
+                        if(Objects.isNull(one)){
+                            terminalBaseExcelMsgs.add(assembleBaseMsg(terminalBaseExcel, "字典装置型号不存在"));
+                            continue;
+                        }
+
                     }
                     this.baseMapper.insert(temp);
                     Device device = new Device();
@@ -2850,7 +2906,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                     device.setIp(terminalBaseExcel.getIp());
                     device.setNodeId(node.getId());
                     device.setFrontType(frontTypeDicData.getId());
-                    device.setDevType(devTypeDicData.getId());
+                    device.setDevType(Objects.isNull(devTypeDicData)?one.getId():devTypeDicData.getId());
                     device.setComFlag(0);
                     device.setCheckFlag(1);
                     device.setLoginTime(LocalDate.now());
@@ -2859,7 +2915,11 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                     device.setUpdateTime(LocalDateTime.now());
                     device.setElectroplate(0);
                     device.setOnTime(1);
+                    //处理装置识别码秘钥
+                    coderM3d(device, false);
                     deviceMapper.insert(device);
+                    //分配前置进程
+                    nodeDeviceService.oneKeyDistribution(node.getId());
                 }
                 //添加终端索引
                 pids.add(temp.getId());
@@ -2886,6 +2946,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                     }
                     //处理电压等级字典表
                     DictData subvScale = dicDataFeignClient.getDicDataByNameAndType(terminalBaseExcel.getSubvScale(), DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
+
                     if (Objects.isNull(subvScale)) {
                         terminalBaseExcelMsgs.add(assembleBaseMsg(terminalBaseExcel, "字典电压等级：" + terminalBaseExcel.getSubStationScale() + "不存在"));
                         continue;
@@ -2963,11 +3024,20 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                     lineDetail.setPt2(Float.valueOf(pt[1]));
                     lineDetail.setCt1(Float.valueOf(ct[0]));
                     lineDetail.setCt2(Float.valueOf(ct[1]));
+                    if(StringUtils.isNoneBlank(terminalBaseExcel.getObjName())){
+                        UserReportPO one = userLedgerService.lambdaQuery().eq(UserReportPO::getProjectName, terminalBaseExcel.getObjName())
+                                .eq(UserReportPO::getState, DataStateEnum.ENABLE.getCode()).one();
+                        if(Objects.nonNull(one)){
+                            lineDetail.setObjId(one.getId());
 
-                    DictData dictData = dicDataFeignClient.getDicDataByNameAndTypeName(terminalBaseExcel.getSubvScale(), DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
+                        }
+
+                    }
+
+                    DictData dictData = dicDataFeignClient.getDicDataByNameAndType(terminalBaseExcel.getSubvScale(), DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
 
                     lineDetailMapper.insert(lineDetail);
-                    Overlimit overlimit = COverlimitUtil.globalAssemble(Float.parseFloat(dictData.getValue()), terminalBaseExcel.getDealCapacity(), terminalBaseExcel.getDevCapacity(), terminalBaseExcel.getShortCapacity(), null, null);
+                    Overlimit overlimit = COverlimitUtil.globalAssemble(Float.parseFloat(dictData.getValue()), terminalBaseExcel.getDealCapacity(), terminalBaseExcel.getDevCapacity(), terminalBaseExcel.getShortCapacity(), terminalBaseExcel.getPowerFlag(), 0);
                     overlimit.setId(temp.getId());
                     overlimitMapper.insert(overlimit);
                 }
@@ -3851,14 +3921,29 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                                 }
                                 //设备删除找不到设备名称,重日志截取
                                 if (Objects.equals(temp.getOperateType(), Param.DEL)) {
-                                    String temLos = "%s名称:%s;前置信息:%s";
+                                    //删除有2种情况，1.设备删除，2，设备状态修改；
-                                    List<String> strings = this.parseTemplateValues(temLos, temp.getTerminalDescribe());
+                                    if (lineMap.containsKey(deviceId)) {
-                                    String devName = strings.get(1); // 设备名称
+                                        pqsTerminalPushLogDTO.setDevName(lineMap.get(deviceId).getName());
-                                    String nodeName = strings.get(2); // 进程名称
+                                        String nodeId = deviceMap.get(deviceId).getNodeId();
-                                    pqsTerminalPushLogDTO.setDevName(devName);
+                                        pqsTerminalPushLogDTO.setNodeId(nodeId);
-                                    String nodeId = nodeNameMap.get(nodeName).getId();
+                                        pqsTerminalPushLogDTO.setNodeName(nodeMap.containsKey(nodeId)?nodeMap.get(nodeId).getName():"删除前置");
-                                    pqsTerminalPushLogDTO.setNodeId(nodeId);
+
-                                    pqsTerminalPushLogDTO.setNodeName(nodeName);
+                                    }else {
+                                        if(temp.getTerminalDescribe().contains("前置信息")){
+                                            String temLos = "%s名称:%s;前置信息:%s";
+                                            List<String> strings = this.parseTemplateValues(temLos, temp.getTerminalDescribe());
+                                            String devName = strings.get(1); // 设备名称
+                                            String nodeName = strings.get(2); // 进程名称
+                                            pqsTerminalPushLogDTO.setDevName(devName);
+                                            String nodeId = nodeNameMap.get(nodeName).getId();
+                                            pqsTerminalPushLogDTO.setNodeId(nodeId);
+                                            pqsTerminalPushLogDTO.setNodeName(nodeName);
+                                        }else {
+                                            return;
+                                        }
+
+                                    }
+
                                 } else {
                                     //如果存在说明设备未被删除，不存在说明有一条删除日志，直接return；
                                     if (lineMap.containsKey(deviceId)) {
@@ -4280,6 +4365,10 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
 
             // 比较装置 所属前置
             flag |= compareAndAppend(stringBuilder, devDetail.getNodeId(), updateDeviceParam.getNodeId(), "终端所属前置机");
+            //如果前置机切换，可能装置在进程2上，但是切换后前置机只有一个进程，因此修改装置进程表设为默认进程1
+            if(!Objects.equals(updateDeviceParam.getNodeId(), devDetail.getNodeId())){
+                deviceProcessService.lambdaUpdate().eq(DeviceProcess::getId,devDetail.getId()).set(DeviceProcess::getProcessNo,1).update();
+            }
 
             // 比较装置端口号
             flag |= compareAndAppend(stringBuilder, devDetail.getPort(), updateDeviceParam.getPort(), "终端端口号");

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

@@ -3,9 +3,6 @@ package com.njcn.device.device.controller;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.StrUtil;
-import com.github.tocrhz.mqtt.annotation.MqttSubscribe;
-import com.github.tocrhz.mqtt.annotation.NamedValue;
-import com.github.tocrhz.mqtt.annotation.Payload;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -27,12 +24,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -57,132 +52,132 @@ public class DeviceController extends BaseController {
 
     private final GeneralDeviceService generalDeviceService;
 
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+//    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @PostMapping("/socketLine")
+//    @PostMapping("/socketLine")
-    @ApiOperation("获取监测点定值信息")
+//    @ApiOperation("获取监测点定值信息")
-    public HttpResult<String> socketLine(@RequestBody @Validated ConstantValueParam.Constant param) {
+//    public HttpResult<String> socketLine(@RequestBody @Validated ConstantValueParam.Constant param) {
-        String methodDescribe = getMethodDescribe("socketLine");
+//        String methodDescribe = getMethodDescribe("socketLine");
-        if(StrUtil.isBlank(param.getIp())){
+//        if(StrUtil.isBlank(param.getIp())){
-            param.setIp(RequestUtil.getRealIp());
+//            param.setIp(RequestUtil.getRealIp());
-        }
+//        }
-        String s = iDeviceService.sentLine(param);
+//        String s = iDeviceService.sentLine(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
-    }
+//    }
-
+//
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+//    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @PostMapping("/updateSocketLine")
+//    @PostMapping("/updateSocketLine")
-    @ApiOperation("修改监测点定值信息")
+//    @ApiOperation("修改监测点定值信息")
-    public HttpResult<String> updateSocketLine(@RequestBody @Validated ConstantValueParam.ValueData param) {
+//    public HttpResult<String> updateSocketLine(@RequestBody @Validated ConstantValueParam.ValueData param) {
-        String methodDescribe = getMethodDescribe("updateSocketLine");
+//        String methodDescribe = getMethodDescribe("updateSocketLine");
-        if(StrUtil.isBlank(param.getIp())){
+//        if(StrUtil.isBlank(param.getIp())){
-            param.setIp(RequestUtil.getRealIp());
+//            param.setIp(RequestUtil.getRealIp());
-        }
+//        }
-        String s = iDeviceService.sentLineData(param);
+//        String s = iDeviceService.sentLineData(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
-    }
+//    }
-
+//
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+//    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @PostMapping("/socketDev")
+//    @PostMapping("/socketDev")
-    @ApiOperation("获取终端定值信息")
+//    @ApiOperation("获取终端定值信息")
-    public HttpResult<String> socketDev(@RequestBody @Validated ConstantValueParam.Constant param) {
+//    public HttpResult<String> socketDev(@RequestBody @Validated ConstantValueParam.Constant param) {
-        String methodDescribe = getMethodDescribe("socketDev");
+//        String methodDescribe = getMethodDescribe("socketDev");
-        if(StrUtil.isBlank(param.getIp())){
+//        if(StrUtil.isBlank(param.getIp())){
-            param.setIp(RequestUtil.getRealIp());
+//            param.setIp(RequestUtil.getRealIp());
-        }
+//        }
-        String s = iDeviceService.sentDev(param);
+//        String s = iDeviceService.sentDev(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
-    }
+//    }
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+//    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @PostMapping("/updateSocketDev")
+//    @PostMapping("/updateSocketDev")
-    @ApiOperation("修改终端定值信息")
+//    @ApiOperation("修改终端定值信息")
-    public HttpResult<String> updateSocketDev(@RequestBody @Validated ConstantValueParam.ValueData param) {
+//    public HttpResult<String> updateSocketDev(@RequestBody @Validated ConstantValueParam.ValueData param) {
-        String methodDescribe = getMethodDescribe("updateSocketDev");
+//        String methodDescribe = getMethodDescribe("updateSocketDev");
-        if(StrUtil.isBlank(param.getIp())){
+//        if(StrUtil.isBlank(param.getIp())){
-            param.setIp(RequestUtil.getRealIp());
+//            param.setIp(RequestUtil.getRealIp());
-        }
+//        }
-        String s = iDeviceService.sentDevData(param);
+//        String s = iDeviceService.sentDevData(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
-    }
+//    }
-
+//
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+//    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @PostMapping("/socketDevProperty")
+//    @PostMapping("/socketDevProperty")
-    @ApiOperation("获取终端性能信息")
+//    @ApiOperation("获取终端性能信息")
-    public HttpResult<String> socketDevProperty(String devID) {
+//    public HttpResult<String> socketDevProperty(String devID) {
-        String methodDescribe = getMethodDescribe("socketDevProperty");
+//        String methodDescribe = getMethodDescribe("socketDevProperty");
-        String s = iDeviceService.socketDevProperty(devID);
+//        String s = iDeviceService.socketDevProperty(devID);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
-    }
+//    }
-
+//
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+//    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @PostMapping("/socketDevPropertyClose")
+//    @PostMapping("/socketDevPropertyClose")
-    @ApiOperation("终端性能关闭")
+//    @ApiOperation("终端性能关闭")
-    public HttpResult<String> socketDevPropertyClose(String devID) {
+//    public HttpResult<String> socketDevPropertyClose(String devID) {
-        String methodDescribe = getMethodDescribe("socketDevPropertyClose");
+//        String methodDescribe = getMethodDescribe("socketDevPropertyClose");
-        String s = iDeviceService.socketDevPropertyClose(devID);
+//        String s = iDeviceService.socketDevPropertyClose(devID);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
-    }
+//    }
-
+//
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+//    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @PostMapping("/realTimeData")
+//    @PostMapping("/realTimeData")
-    @ApiOperation("监测点实时数据查看")
+//    @ApiOperation("监测点实时数据查看")
-    public HttpResult<String> realTimeData(String lineID) {
+//    public HttpResult<String> realTimeData(String lineID) {
-        String methodDescribe = getMethodDescribe("realTimeData");
+//        String methodDescribe = getMethodDescribe("realTimeData");
-        String s = iDeviceService.realTimeData(lineID);
+//        String s = iDeviceService.realTimeData(lineID);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
-    }
+//    }
-
+//
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+//    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @PostMapping("/heartRealTimeData")
+//    @PostMapping("/heartRealTimeData")
-    @ApiOperation("监测实施数据心跳")
+//    @ApiOperation("监测实施数据心跳")
-    public HttpResult<String> heartRealTimeData(String lineID) {
+//    public HttpResult<String> heartRealTimeData(String lineID) {
-        String methodDescribe = getMethodDescribe("heartRealTimeData");
+//        String methodDescribe = getMethodDescribe("heartRealTimeData");
-        String s = iDeviceService.heartRealTimeData(lineID);
+//        String s = iDeviceService.heartRealTimeData(lineID);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
-    }
+//    }
-
+//
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+//    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @PostMapping("/closeRealTimeData")
+//    @PostMapping("/closeRealTimeData")
-    @ApiOperation("监测点实施数据关闭")
+//    @ApiOperation("监测点实施数据关闭")
-    public HttpResult<String> closeRealTimeData(String lineID) {
+//    public HttpResult<String> closeRealTimeData(String lineID) {
-        String methodDescribe = getMethodDescribe("closeRealTimeData");
+//        String methodDescribe = getMethodDescribe("closeRealTimeData");
-        String s = iDeviceService.closeRealTimeData(lineID);
+//        String s = iDeviceService.closeRealTimeData(lineID);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
-    }
+//    }
-
+//
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+//    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @PostMapping("/getDevUpgrades")
+//    @PostMapping("/getDevUpgrades")
-    @ApiOperation("终端版本升级")
+//    @ApiOperation("终端版本升级")
-    public HttpResult<String> getDevUpgrades(@RequestBody @Validated ConstantValueParam.Upgrades param) {
+//    public HttpResult<String> getDevUpgrades(@RequestBody @Validated ConstantValueParam.Upgrades param) {
-        String methodDescribe = getMethodDescribe("getDevUpgrades");
+//        String methodDescribe = getMethodDescribe("getDevUpgrades");
-        String s = iDeviceService.getDevUpgrades(param.getList(),param.getEdIndex());
+//        String s = iDeviceService.getDevUpgrades(param.getList(),param.getEdIndex());
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
-    }
+//    }
-
+//
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+//    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @PostMapping("/closeUpgrades")
+//    @PostMapping("/closeUpgrades")
-    @ApiOperation("终端升级取消")
+//    @ApiOperation("终端升级取消")
-    public HttpResult<String> closeUpgrades(@RequestBody List<String> devList) {
+//    public HttpResult<String> closeUpgrades(@RequestBody List<String> devList) {
-        String methodDescribe = getMethodDescribe("closeUpgrades");
+//        String methodDescribe = getMethodDescribe("closeUpgrades");
-        String s = iDeviceService.closeUpgrades(devList);
+//        String s = iDeviceService.closeUpgrades(devList);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
-    }
+//    }
-
+//
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+//    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @PostMapping("/restartDev")
+//    @PostMapping("/restartDev")
-    @ApiOperation("重启装置命令")
+//    @ApiOperation("重启装置命令")
-    public HttpResult<String> restartDev(@RequestBody List<String> devList) {
+//    public HttpResult<String> restartDev(@RequestBody List<String> devList) {
-        String methodDescribe = getMethodDescribe("restartDev");
+//        String methodDescribe = getMethodDescribe("restartDev");
-        String s = iDeviceService.restartDev(devList);
+//        String s = iDeviceService.restartDev(devList);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
-    }
+//    }
-    @MqttSubscribe(value = "/zl/devData/{devID}",qos = 1)
+//    @MqttSubscribe(value = "/zl/devData/{devID}",qos = 1)
-    public void responseRtData(String topic, @NamedValue("devID") String pageId, MqttMessage message, @Payload String payload) {
+//    public void responseRtData(String topic, @NamedValue("devID") String pageId, MqttMessage message, @Payload String payload) {
-        Console.log("receive from    : {}", topic);
+//        Console.log("receive from    : {}", topic);
-        Console.log("receive from    : {}", pageId);
+//        Console.log("receive from    : {}", pageId);
-        Console.log("message     : {}", message.getPayload());
+//        Console.log("message     : {}", message.getPayload());
-        Console.log("message payload : {}", new String(message.getPayload(), StandardCharsets.UTF_8));
+//        Console.log("message payload : {}", new String(message.getPayload(), StandardCharsets.UTF_8));
-        Console.log("string payload  : {}", payload);
+//        Console.log("string payload  : {}", payload);
-    }
+//    }
 
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @PostMapping("/updateDevCheckTime")

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

@@ -19,113 +19,113 @@ import java.util.List;
 public interface IDeviceService extends IService<Device> {
 
 
-    /***
+//    /***
-     * @Description: mqtt获取外部定值
+//     * @Description: mqtt获取外部定值
-     * @param param
+//     * @param param
-     * @return: java.lang.String
+//     * @return: java.lang.String
-     * @Author: wr
+//     * @Author: wr
-     * @Date: 2023/8/14 10:17
+//     * @Date: 2023/8/14 10:17
-     */
+//     */
-    String sentLine(ConstantValueParam.Constant param);
+//    String sentLine(ConstantValueParam.Constant param);
-
+//
-    /***
+//    /***
-     * @Description: mqtt修改外部定值
+//     * @Description: mqtt修改外部定值
-     * @param param
+//     * @param param
-     * @return: java.lang.String
+//     * @return: java.lang.String
-     * @Author: wr
+//     * @Author: wr
-     * @Date: 2023/8/14 11:07
+//     * @Date: 2023/8/14 11:07
-     */
+//     */
-    String sentLineData(ConstantValueParam.ValueData param);
+//    String sentLineData(ConstantValueParam.ValueData param);
-
+//
-    /**
+//    /**
-     * @param param
+//     * @param param
-     * @Description: mqtt获取内部定值
+//     * @Description: mqtt获取内部定值
-     * @return: java.lang.String
+//     * @return: java.lang.String
-     * @Author: wr
+//     * @Author: wr
-     * @Date: 2023/8/14 14:51
+//     * @Date: 2023/8/14 14:51
-     */
+//     */
-    String sentDev(ConstantValueParam.Constant param);
+//    String sentDev(ConstantValueParam.Constant param);
-
+//
-    /**
+//    /**
-     * @param param
+//     * @param param
-     * @Description: mqtt修改内部定值
+//     * @Description: mqtt修改内部定值
-     * @return: java.lang.String
+//     * @return: java.lang.String
-     * @Author: wr
+//     * @Author: wr
-     * @Date: 2023/8/14 14:51
+//     * @Date: 2023/8/14 14:51
-     */
+//     */
-    String sentDevData(ConstantValueParam.ValueData param);
+//    String sentDevData(ConstantValueParam.ValueData param);
-
+//
-    /**
+//    /**
-     * @param devID
+//     * @param devID
-     * @Description: 终端性能查看
+//     * @Description: 终端性能查看
-     * @return: java.lang.String
+//     * @return: java.lang.String
-     * @Author: wr
+//     * @Author: wr
-     * @Date: 2023/8/15 11:27
+//     * @Date: 2023/8/15 11:27
-     */
+//     */
-    String socketDevProperty(String devID);
+//    String socketDevProperty(String devID);
-
+//
-    /**
+//    /**
-     * @param devID
+//     * @param devID
-     * @Description: 终端性能关闭
+//     * @Description: 终端性能关闭
-     * @return: java.lang.String
+//     * @return: java.lang.String
-     * @Author: wr
+//     * @Author: wr
-     * @Date: 2023/8/15 16:13
+//     * @Date: 2023/8/15 16:13
-     */
+//     */
-    String socketDevPropertyClose(String devID);
+//    String socketDevPropertyClose(String devID);
-
+//
-    /**
+//    /**
-     * @param lineIndex
+//     * @param lineIndex
-     * @Description: 监测点实时数据查看
+//     * @Description: 监测点实时数据查看
-     * @return: java.lang.String
+//     * @return: java.lang.String
-     * @Author: wr
+//     * @Author: wr
-     * @Date: 2023/8/15 16:13
+//     * @Date: 2023/8/15 16:13
-     */
+//     */
-    String realTimeData(String lineIndex);
+//    String realTimeData(String lineIndex);
-
+//
-    /**
+//    /**
-     * @param lineIndex
+//     * @param lineIndex
-     * @Description: 监测实施数据心跳
+//     * @Description: 监测实施数据心跳
-     * @return: java.lang.String
+//     * @return: java.lang.String
-     * @Author: wr
+//     * @Author: wr
-     * @Date: 2023/8/15 16:14
+//     * @Date: 2023/8/15 16:14
-     */
+//     */
-    String heartRealTimeData(String lineIndex);
+//    String heartRealTimeData(String lineIndex);
-
+//
-    /**
+//    /**
-     * @param lineIndex
+//     * @param lineIndex
-     * @Description: 监测点实施数据关闭
+//     * @Description: 监测点实施数据关闭
-     * @return: java.lang.String
+//     * @return: java.lang.String
-     * @Author: wr
+//     * @Author: wr
-     * @Date: 2023/8/15 16:14
+//     * @Date: 2023/8/15 16:14
-     */
+//     */
-    String closeRealTimeData(String lineIndex);
+//    String closeRealTimeData(String lineIndex);
-
+//
-    /**
+//    /**
-     * 终端版本升级，批量升级条件必须是相同终端系列的终端才能升级
+//     * 终端版本升级，批量升级条件必须是相同终端系列的终端才能升级
-     *
+//     *
-     * @param list
+//     * @param list
-     * @param edIndex
+//     * @param edIndex
-     * @return
+//     * @return
-     */
+//     */
-    String getDevUpgrades(List<String> list, String edIndex);
+//    String getDevUpgrades(List<String> list, String edIndex);
-
+//
-    /**
+//    /**
-     * @param devList
+//     * @param devList
-     * @Description: 终端升级取消
+//     * @Description: 终端升级取消
-     * @return: java.lang.String
+//     * @return: java.lang.String
-     * @Author: wr
+//     * @Author: wr
-     * @Date: 2023/8/17 9:24
+//     * @Date: 2023/8/17 9:24
-     */
+//     */
-    String closeUpgrades(List<String> devList);
+//    String closeUpgrades(List<String> devList);
-
+//
-    /**
+//    /**
-     * @param devList
+//     * @param devList
-     * @Description: 重启装置命令
+//     * @Description: 重启装置命令
-     * @return: java.lang.String
+//     * @return: java.lang.String
-     * @Author: wr
+//     * @Author: wr
-     * @Date: 2023/8/17 9:24
+//     * @Date: 2023/8/17 9:24
-     */
+//     */
-    String restartDev(List<String> devList);
+//    String restartDev(List<String> devList);
 
     /**
      * @param devId             装置id

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

@@ -1,10 +1,6 @@
 package com.njcn.device.device.service.impl;
 
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,16 +10,11 @@ import com.njcn.device.device.mapper.DeviceMapper;
 import com.njcn.device.device.service.IDeviceService;
 import com.njcn.device.device.service.ProgramVersionService;
 import com.njcn.device.line.mapper.LineMapper;
-import com.njcn.device.pq.pojo.advanced.*;
+
-import com.njcn.device.pq.pojo.param.ConstantValueParam;
-import com.njcn.device.pq.pojo.po.DevVersion;
 import com.njcn.device.pq.pojo.po.Device;
-import com.njcn.device.pq.pojo.po.Line;
+
-import com.njcn.device.pq.pojo.po.Version;
 import com.njcn.device.pq.pojo.vo.DevStatusNumVO;
-import com.njcn.device.pq.pojo.vo.DeviceIpRVO;
+
-import com.njcn.device.utils.SocketClient;
-import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -45,360 +36,360 @@ import java.util.stream.Collectors;
 public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements IDeviceService {
 
     private final LineMapper lineMapper;
-    private final SocketClient socketClient;
+//    private final SocketClient socketClient;
     private final DevVersionMapper devVersionMapper;
     private final ProgramVersionService programVersionService;
 
     @Value("${socket.port:60000}")
     private Integer socketPort;
 
-    @Override
+//    @Override
-    public String sentLine(ConstantValueParam.Constant param) {
+//    public String sentLine(ConstantValueParam.Constant param) {
-        try {
+//        try {
-            //获取根据监测点获取终端信息
+//            //获取根据监测点获取终端信息
-            UpDevVO upDevVO = lineMapper.getDevInfo(param.getId());
+//            UpDevVO upDevVO = lineMapper.getDevInfo(param.getId());
-            //查询前置ip
+//            //查询前置ip
-            String host = lineMapper.getNodeIp(upDevVO.getDevIndex(),0);
+//            String host = lineMapper.getNodeIp(upDevVO.getDevIndex(),0);
-            //拼接属性
+//            //拼接属性
-            ContValueRVO upParamVO = new ContValueRVO();
+//            ContValueRVO upParamVO = new ContValueRVO();
-            ContValueVO valueVO = new ContValueVO();
+//            ContValueVO valueVO = new ContValueVO();
-            valueVO.setType(param.getType());
+//            valueVO.setType(param.getType());
-            valueVO.setLineid(param.getId());
+//            valueVO.setLineid(param.getId());
-            valueVO.setHander(param.getHander());
+//            valueVO.setHander(param.getHander());
-            JSONObject jsonStr = new JSONObject(valueVO);
+//            JSONObject jsonStr = new JSONObject(valueVO);
-            Integer len = jsonStr.toString().length();
+//            Integer len = jsonStr.toString().length();
-            upParamVO.setLen(len.toString());
+//            upParamVO.setLen(len.toString());
-            upParamVO.setData(valueVO);
+//            upParamVO.setData(valueVO);
-            JSONObject jsonObject = new JSONObject(upParamVO);
+//            JSONObject jsonObject = new JSONObject(upParamVO);
-            String str = jsonObject.toString();
+//            String str = jsonObject.toString();
-            List<UpDevVO> devList = new ArrayList<>();
+//            List<UpDevVO> devList = new ArrayList<>();
-            devList.add(upDevVO);
+//            devList.add(upDevVO);
-            return socketClient.sentLine(param.getIp(), str, host, socketPort, "wr", devList);
+//            return socketClient.sentLine(param.getIp(), str, host, socketPort, "wr", devList);
-        } catch (Exception e) {
+//        } catch (Exception e) {
-            return "获取定值失败";
+//            return "获取定值失败";
-        }
+//        }
-
+//
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public String sentLineData(ConstantValueParam.ValueData param) {
+//    public String sentLineData(ConstantValueParam.ValueData param) {
-        try {
+//        try {
-            //获取根据监测点获取终端信息
+//            //获取根据监测点获取终端信息
-            UpDevVO upDevVO = lineMapper.getDevInfo(param.getId());
+//            UpDevVO upDevVO = lineMapper.getDevInfo(param.getId());
-            //查询前置ip
+//            //查询前置ip
-            String host = lineMapper.getNodeIp(upDevVO.getDevIndex(),0);
+//            String host = lineMapper.getNodeIp(upDevVO.getDevIndex(),0);
-            ContUpdateValueRVO upParamVO = new ContUpdateValueRVO();
+//            ContUpdateValueRVO upParamVO = new ContUpdateValueRVO();
-            ContUpdateValueVO valueVO = new ContUpdateValueVO();
+//            ContUpdateValueVO valueVO = new ContUpdateValueVO();
-            valueVO.setType(param.getType());
+//            valueVO.setType(param.getType());
-            valueVO.setLineid(param.getId());
+//            valueVO.setLineid(param.getId());
-            valueVO.setHander(param.getHander());
+//            valueVO.setHander(param.getHander());
-            float[] intArr;
+//            float[] intArr;
-            if (StrUtil.isBlank(param.getInterValue())) {
+//            if (StrUtil.isBlank(param.getInterValue())) {
-                intArr = new float[0];
+//                intArr = new float[0];
-            } else {
+//            } else {
-                String[] valueArr = param.getInterValue().split(",");
+//                String[] valueArr = param.getInterValue().split(",");
-                intArr = new float[valueArr.length];
+//                intArr = new float[valueArr.length];
-                for (int i = 0; i < valueArr.length; i++) {
+//                for (int i = 0; i < valueArr.length; i++) {
-                    intArr[i] = Float.parseFloat(valueArr[i]);
+//                    intArr[i] = Float.parseFloat(valueArr[i]);
-                }
+//                }
-            }
+//            }
-            valueVO.setValue(intArr);
+//            valueVO.setValue(intArr);
-            JSONObject jsonStr = new JSONObject(valueVO);
+//            JSONObject jsonStr = new JSONObject(valueVO);
-            Integer len = jsonStr.toString().length();
+//            Integer len = jsonStr.toString().length();
-            upParamVO.setLen(len.toString());
+//            upParamVO.setLen(len.toString());
-            upParamVO.setData(valueVO);
+//            upParamVO.setData(valueVO);
-            JSONObject jsonObject = new JSONObject(upParamVO);
+//            JSONObject jsonObject = new JSONObject(upParamVO);
-            String str = jsonObject.toString();
+//            String str = jsonObject.toString();
-            List<UpDevVO> devList = new ArrayList<>();
+//            List<UpDevVO> devList = new ArrayList<>();
-            devList.add(upDevVO);
+//            devList.add(upDevVO);
-            return socketClient.sentLine(param.getIp(), str, host, socketPort, "wr", devList);
+//            return socketClient.sentLine(param.getIp(), str, host, socketPort, "wr", devList);
-        } catch (Exception e) {
+//        } catch (Exception e) {
-            return "运行失败";
+//            return "运行失败";
-        }
+//        }
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public String sentDev(ConstantValueParam.Constant param) {
+//    public String sentDev(ConstantValueParam.Constant param) {
-        try {
+//        try {
-            Line line = lineMapper.selectById(param.getId());
+//            Line line = lineMapper.selectById(param.getId());
-            UpDevVO upDevVO = new UpDevVO();
+//            UpDevVO upDevVO = new UpDevVO();
-            upDevVO.setDevIndex(line.getId());
+//            upDevVO.setDevIndex(line.getId());
-            upDevVO.setDevName(line.getName());
+//            upDevVO.setDevName(line.getName());
-            String host = lineMapper.getNodeIp(line.getId(),1);
+//            String host = lineMapper.getNodeIp(line.getId(),1);
-            ContValueRVO upParamVO = new ContValueRVO();
+//            ContValueRVO upParamVO = new ContValueRVO();
-            ContValueVO valueVO = new ContValueVO();
+//            ContValueVO valueVO = new ContValueVO();
-            valueVO.setType(param.getType());
+//            valueVO.setType(param.getType());
-            valueVO.setIndex(param.getId());
+//            valueVO.setIndex(param.getId());
-            valueVO.setHander(param.getHander());
+//            valueVO.setHander(param.getHander());
-            JSONObject jsonStr = new JSONObject(valueVO);
+//            JSONObject jsonStr = new JSONObject(valueVO);
-            Integer len = jsonStr.toString().length();
+//            Integer len = jsonStr.toString().length();
-            upParamVO.setLen(len.toString());
+//            upParamVO.setLen(len.toString());
-            upParamVO.setData(valueVO);
+//            upParamVO.setData(valueVO);
-            JSONObject jsonObject = new JSONObject(upParamVO);
+//            JSONObject jsonObject = new JSONObject(upParamVO);
-            String str = jsonObject.toString();
+//            String str = jsonObject.toString();
-            List<UpDevVO> devList = new ArrayList<>();
+//            List<UpDevVO> devList = new ArrayList<>();
-            devList.add(upDevVO);
+//            devList.add(upDevVO);
-            return socketClient.sentDZDev(param.getIp(), str, host, socketPort, "wr", devList);
+//            return socketClient.sentDZDev(param.getIp(), str, host, socketPort, "wr", devList);
-        } catch (Exception e) {
+//        } catch (Exception e) {
-            return "获取定值失败";
+//            return "获取定值失败";
-        }
+//        }
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public String sentDevData(ConstantValueParam.ValueData param) {
+//    public String sentDevData(ConstantValueParam.ValueData param) {
-        try {
+//        try {
-            Line line = lineMapper.selectById(param.getId());
+//            Line line = lineMapper.selectById(param.getId());
-            UpDevVO upDevVO = new UpDevVO();
+//            UpDevVO upDevVO = new UpDevVO();
-            upDevVO.setDevIndex(line.getId());
+//            upDevVO.setDevIndex(line.getId());
-            upDevVO.setDevName(line.getName());
+//            upDevVO.setDevName(line.getName());
-            String host = lineMapper.getNodeIp(line.getId(),1);
+//            String host = lineMapper.getNodeIp(line.getId(),1);
-            ContUpdateDevValueRVO upParamVO = new ContUpdateDevValueRVO();
+//            ContUpdateDevValueRVO upParamVO = new ContUpdateDevValueRVO();
-            ContUpdateDevValueVO valueVO = new ContUpdateDevValueVO();
+//            ContUpdateDevValueVO valueVO = new ContUpdateDevValueVO();
-            valueVO.setType(param.getType());
+//            valueVO.setType(param.getType());
-            valueVO.setIndex(line.getId());
+//            valueVO.setIndex(line.getId());
-            valueVO.setHander(String.valueOf(param.getHander()));
+//            valueVO.setHander(String.valueOf(param.getHander()));
-            int[] intArr;
+//            int[] intArr;
-            if (StrUtil.isBlank(param.getInterValue())) {
+//            if (StrUtil.isBlank(param.getInterValue())) {
-                intArr = new int[0];
+//                intArr = new int[0];
-            } else {
+//            } else {
-                String[] valueArr = param.getInterValue().split(",");
+//                String[] valueArr = param.getInterValue().split(",");
-                intArr = new int[valueArr.length];
+//                intArr = new int[valueArr.length];
-                for (int i = 0; i < valueArr.length; i++) {
+//                for (int i = 0; i < valueArr.length; i++) {
-                    intArr[i] = Integer.parseInt(valueArr[i]);
+//                    intArr[i] = Integer.parseInt(valueArr[i]);
-                }
+//                }
-            }
+//            }
-            valueVO.setInterValue(intArr);
+//            valueVO.setInterValue(intArr);
-            JSONObject jsonStr = new JSONObject(valueVO);
+//            JSONObject jsonStr = new JSONObject(valueVO);
-            Integer len = jsonStr.toString().length();
+//            Integer len = jsonStr.toString().length();
-            upParamVO.setLen(len.toString());
+//            upParamVO.setLen(len.toString());
-            upParamVO.setData(valueVO);
+//            upParamVO.setData(valueVO);
-            JSONObject jsonObject = new JSONObject(upParamVO);
+//            JSONObject jsonObject = new JSONObject(upParamVO);
-            String str = jsonObject.toString();
+//            String str = jsonObject.toString();
-
+//
-            List<UpDevVO> devList = new ArrayList<>();
+//            List<UpDevVO> devList = new ArrayList<>();
-            devList.add(upDevVO);
+//            devList.add(upDevVO);
-            return socketClient.sentDZDev(param.getIp(), str, host, socketPort, "wr", devList);
+//            return socketClient.sentDZDev(param.getIp(), str, host, socketPort, "wr", devList);
-        } catch (Exception e) {
+//        } catch (Exception e) {
-            return "运行失败";
+//            return "运行失败";
-        }
+//        }
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public String socketDevProperty(String devID) {
+//    public String socketDevProperty(String devID) {
-        String host = lineMapper.getNodeIp(devID,1);
+//        String host = lineMapper.getNodeIp(devID,1);
-        if(StrUtil.isBlank(host)){
+//        if(StrUtil.isBlank(host)){
-            return "前置ip获取失败";
+//            return "前置ip获取失败";
-        }
+//        }
-        JSONObject jsonObject = new JSONObject();
+//        JSONObject jsonObject = new JSONObject();
-        Map<String,String> map = new HashMap<>();
+//        Map<String,String> map = new HashMap<>();
-        map.put("type","190");
+//        map.put("type","190");
-        map.put("index",devID);
+//        map.put("index",devID);
-        map.put("hander","1");
+//        map.put("hander","1");
-        jsonObject.set("data", map);
+//        jsonObject.set("data", map);
-        Integer len = jsonObject.get("data").toString().length();
+//        Integer len = jsonObject.get("data").toString().length();
-        jsonObject.set("len", len.toString());
+//        jsonObject.set("len", len.toString());
-        socketClient.showProperty(jsonObject.toString(),host,socketPort,RequestUtil.getLoginName());
+//        socketClient.showProperty(jsonObject.toString(),host,socketPort,RequestUtil.getLoginName());
-        return "终端性能获取成功";
+//        return "终端性能获取成功";
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public String socketDevPropertyClose(String devID) {
+//    public String socketDevPropertyClose(String devID) {
-        String host = lineMapper.getNodeIp(devID,1);
+//        String host = lineMapper.getNodeIp(devID,1);
-        try {
+//        try {
-            JSONObject jsonObject = new JSONObject();
+//            JSONObject jsonObject = new JSONObject();
-            Map<String, String> map = new HashMap<>();
+//            Map<String, String> map = new HashMap<>();
-            map.put("type", "190");
+//            map.put("type", "190");
-            map.put("index", devID);
+//            map.put("index", devID);
-            map.put("hander", "0");
+//            map.put("hander", "0");
-            jsonObject.set("data", map);
+//            jsonObject.set("data", map);
-            Integer len = jsonObject.get("data").toString().length();
+//            Integer len = jsonObject.get("data").toString().length();
-            jsonObject.set("len", len.toString());
+//            jsonObject.set("len", len.toString());
-            socketClient.closeDevSocket(jsonObject.toString(),host,socketPort,RequestUtil.getLoginName());
+//            socketClient.closeDevSocket(jsonObject.toString(),host,socketPort,RequestUtil.getLoginName());
-            return "执行成功";
+//            return "执行成功";
-        }catch (Exception e){
+//        }catch (Exception e){
-            return "执行失败";
+//            return "执行失败";
-        }
+//        }
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public String realTimeData(String lineIndex) {
+//    public String realTimeData(String lineIndex) {
-        //查询前置ip
+//        //查询前置ip
-        String host = lineMapper.getNodeIp(lineIndex,0);
+//        String host = lineMapper.getNodeIp(lineIndex,0);
-        if(StrUtil.isBlank(host)){
+//        if(StrUtil.isBlank(host)){
-            return "设备前置机服务器配置异常,请联系管理员";
+//            return "设备前置机服务器配置异常,请联系管理员";
-        }else {
+//        }else {
-            JSONObject jsonObject = new JSONObject();
+//            JSONObject jsonObject = new JSONObject();
-            jsonObject.set("LineId", lineIndex);
+//            jsonObject.set("LineId", lineIndex);
-            jsonObject.set("type", 0);
+//            jsonObject.set("type", 0);
-            JSONObject jsonObject1 = new JSONObject();
+//            JSONObject jsonObject1 = new JSONObject();
-            jsonObject1.set("len",0);
+//            jsonObject1.set("len",0);
-            jsonObject1.set("data",jsonObject);
+//            jsonObject1.set("data",jsonObject);
-            socketClient.realTimeData(jsonObject1.toString(),host,socketPort,lineIndex);
+//            socketClient.realTimeData(jsonObject1.toString(),host,socketPort,lineIndex);
-        }
+//        }
-        return "请求成功";
+//        return "请求成功";
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public String heartRealTimeData(String lineIndex) {
+//    public String heartRealTimeData(String lineIndex) {
-        JSONObject jsonObject = new JSONObject();
+//        JSONObject jsonObject = new JSONObject();
-        jsonObject.set("LineId", lineIndex);
+//        jsonObject.set("LineId", lineIndex);
-        jsonObject.set("type", 1);
+//        jsonObject.set("type", 1);
-        JSONObject jsonObject1 = new JSONObject();
+//        JSONObject jsonObject1 = new JSONObject();
-        jsonObject1.set("len", 0);
+//        jsonObject1.set("len", 0);
-        jsonObject1.set("data", jsonObject);
+//        jsonObject1.set("data", jsonObject);
-        String host = lineMapper.getNodeIp(lineIndex,0);
+//        String host = lineMapper.getNodeIp(lineIndex,0);
-        socketClient.heartRealData(jsonObject1.toString(),host,socketPort,lineIndex);
+//        socketClient.heartRealData(jsonObject1.toString(),host,socketPort,lineIndex);
-        return "实时数据心跳请求成功";
+//        return "实时数据心跳请求成功";
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public String closeRealTimeData(String lineIndex) {
+//    public String closeRealTimeData(String lineIndex) {
-        socketClient.closeRealData(lineIndex);
+//        socketClient.closeRealData(lineIndex);
-        return "关闭实时数据请求成功";
+//        return "关闭实时数据请求成功";
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public String getDevUpgrades(List<String> list, String edIndex) {
+//    public String getDevUpgrades(List<String> list, String edIndex) {
-        List<DeviceIpRVO> resTemlist = new ArrayList<>();
+//        List<DeviceIpRVO> resTemlist = new ArrayList<>();
-
+//
-        List<DeviceIpRVO> relist = lineMapper.getDevicesIp(list);
+//        List<DeviceIpRVO> relist = lineMapper.getDevicesIp(list);
-        //判断设备版本号
+//        //判断设备版本号
-        Integer isExit = devVersionMapper.selectCount(new LambdaQueryWrapper<DevVersion>()
+//        Integer isExit = devVersionMapper.selectCount(new LambdaQueryWrapper<DevVersion>()
-                .eq(DevVersion::getVersionId,edIndex)
+//                .eq(DevVersion::getVersionId,edIndex)
-                .in(DevVersion::getLineId,list)
+//                .in(DevVersion::getLineId,list)
-                .eq(DevVersion::getState,1)
+//                .eq(DevVersion::getState,1)
-        );
+//        );
-        if (isExit > 0) {
+//        if (isExit > 0) {
-            return "请勿选择相同版本号升级";
+//            return "请勿选择相同版本号升级";
-        }
+//        }
-        if (!CollectionUtil.isEmpty(relist)) {
+//        if (!CollectionUtil.isEmpty(relist)) {
-            Version version = programVersionService.getById(edIndex);
+//            Version version = programVersionService.getById(edIndex);
-            String series = version.getDevType();
+//            String series = version.getDevType();
-            //判断设备是否存在相同型号
+//            //判断设备是否存在相同型号
-            for (DeviceIpRVO deviceIpRVO : relist) {
+//            for (DeviceIpRVO deviceIpRVO : relist) {
-                if (!series.equals(deviceIpRVO.getDevSeries())) {
+//                if (!series.equals(deviceIpRVO.getDevSeries())) {
-                    return "当前装置版本系列与目标版本系列不相同";
+//                    return "当前装置版本系列与目标版本系列不相同";
-                }
+//                }
-            }
+//            }
-
+//
-            //判断是否断开
+//            //判断是否断开
-            if (relist.stream().filter(w -> w.getComFlag() == 0).findAny().isPresent()) {
+//            if (relist.stream().filter(w -> w.getComFlag() == 0).findAny().isPresent()) {
-                return "存在通讯中断设备";
+//                return "存在通讯中断设备";
-            }
+//            }
-
+//
-
+//
-            Set<String> set = new HashSet<>();
+//            Set<String> set = new HashSet<>();
-            for (DeviceIpRVO d : relist) {
+//            for (DeviceIpRVO d : relist) {
-                set.add(d.getIp());
+//                set.add(d.getIp());
-            }
+//            }
-            Iterator<String> iterator = set.iterator();
+//            Iterator<String> iterator = set.iterator();
-            while (iterator.hasNext()) {
+//            while (iterator.hasNext()) {
-                List<UpDevVO> devIndex = new ArrayList<>();
+//                List<UpDevVO> devIndex = new ArrayList<>();
-                DeviceIpRVO deviceIpRVO = new DeviceIpRVO();
+//                DeviceIpRVO deviceIpRVO = new DeviceIpRVO();
-                String ip = iterator.next();
+//                String ip = iterator.next();
-                for (DeviceIpRVO d : relist) {
+//                for (DeviceIpRVO d : relist) {
-                    UpDevVO upDevVO = new UpDevVO();
+//                    UpDevVO upDevVO = new UpDevVO();
-                    upDevVO.setDevIndex(d.getDevIndex());
+//                    upDevVO.setDevIndex(d.getDevIndex());
-                    upDevVO.setDevName(d.getDevName());
+//                    upDevVO.setDevName(d.getDevName());
-                    if (ip.equals(d.getIp())) {
+//                    if (ip.equals(d.getIp())) {
-                        devIndex.add(upDevVO);
+//                        devIndex.add(upDevVO);
-                    }
+//                    }
-                }
+//                }
-                deviceIpRVO.setIp(ip);
+//                deviceIpRVO.setIp(ip);
-                deviceIpRVO.setDevlist(devIndex);
+//                deviceIpRVO.setDevlist(devIndex);
-                resTemlist.add(deviceIpRVO);
+//                resTemlist.add(deviceIpRVO);
-            }
+//            }
-        } else {
+//        } else {
-            return "存在未知错误";
+//            return "存在未知错误";
-        }
+//        }
-        for (DeviceIpRVO deviceIpRVO : resTemlist) {
+//        for (DeviceIpRVO deviceIpRVO : resTemlist) {
-            String ip = deviceIpRVO.getIp();
+//            String ip = deviceIpRVO.getIp();
-            List<UpDevVO> devlist = deviceIpRVO.getDevlist();
+//            List<UpDevVO> devlist = deviceIpRVO.getDevlist();
-            UpDataVO upDataVO = new UpDataVO();
+//            UpDataVO upDataVO = new UpDataVO();
-            UpParamVO upParamVO = new UpParamVO();
+//            UpParamVO upParamVO = new UpParamVO();
-            upDataVO.setTerminal(devlist);
+//            upDataVO.setTerminal(devlist);
-            upDataVO.setType("180");
+//            upDataVO.setType("180");
-            upDataVO.setEdIndex(edIndex);
+//            upDataVO.setEdIndex(edIndex);
-            upDataVO.setUserIndex(RequestUtil.getUserIndex());
+//            upDataVO.setUserIndex(RequestUtil.getUserIndex());
-            JSONObject jsonstr = new JSONObject(upDataVO);
+//            JSONObject jsonstr = new JSONObject(upDataVO);
-            Integer len = jsonstr.toString().length();
+//            Integer len = jsonstr.toString().length();
-            upParamVO.setData(upDataVO);
+//            upParamVO.setData(upDataVO);
-            upParamVO.setLen(len.toString());
+//            upParamVO.setLen(len.toString());
-            JSONObject jsonObject = new JSONObject(upParamVO);
+//            JSONObject jsonObject = new JSONObject(upParamVO);
-            String str = jsonObject.toString();
+//            String str = jsonObject.toString();
-            socketClient.sentUpgrades(str, ip, socketPort, RequestUtil.getLoginName(), edIndex, devlist);
+//            socketClient.sentUpgrades(str, ip, socketPort, RequestUtil.getLoginName(), edIndex, devlist);
-        }
+//        }
-        return "运行成功";
+//        return "运行成功";
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public String closeUpgrades(List<String> devList) {
+//    public String closeUpgrades(List<String> devList) {
-        List<DeviceIpRVO> relist = lineMapper.getDevicesIp(devList);
+//        List<DeviceIpRVO> relist = lineMapper.getDevicesIp(devList);
-        if(CollectionUtil.isEmpty(relist)){
+//        if(CollectionUtil.isEmpty(relist)){
-            return "前置机为空";
+//            return "前置机为空";
-        }else {
+//        }else {
-            List<String> nodeIp = relist.stream().map(DeviceIpRVO::getIp).distinct().collect(Collectors.toList());
+//            List<String> nodeIp = relist.stream().map(DeviceIpRVO::getIp).distinct().collect(Collectors.toList());
-            for(String ip: nodeIp){
+//            for(String ip: nodeIp){
-                List<DeviceIpRVO> devLl= relist.stream().filter(item->item.getIp().equals(ip)).collect(Collectors.toList());
+//                List<DeviceIpRVO> devLl= relist.stream().filter(item->item.getIp().equals(ip)).collect(Collectors.toList());
-                if(CollectionUtil.isEmpty(devLl)){
+//                if(CollectionUtil.isEmpty(devLl)){
-                    return "出错啦";
+//                    return "出错啦";
-                }
+//                }
-
+//
-                List<JSONObject> list = new ArrayList<>();
+//                List<JSONObject> list = new ArrayList<>();
-                for(DeviceIpRVO devRVO:devLl){
+//                for(DeviceIpRVO devRVO:devLl){
-                    JSONObject dev = new JSONObject();
+//                    JSONObject dev = new JSONObject();
-                    dev.put("devIndex",devRVO.getDevIndex());
+//                    dev.put("devIndex",devRVO.getDevIndex());
-                    dev.put("devName",devRVO.getDevName());
+//                    dev.put("devName",devRVO.getDevName());
-                    list.add(dev);
+//                    list.add(dev);
-                }
+//                }
-                JSONObject jsonObject = new JSONObject();
+//                JSONObject jsonObject = new JSONObject();
-                jsonObject.set("terminal", list);
+//                jsonObject.set("terminal", list);
-                jsonObject.set("type", 182);
+//                jsonObject.set("type", 182);
-                JSONObject jsonObject1 = new JSONObject();
+//                JSONObject jsonObject1 = new JSONObject();
-                jsonObject1.set("len", 0);
+//                jsonObject1.set("len", 0);
-                jsonObject1.set("data", jsonObject);
+//                jsonObject1.set("data", jsonObject);
-                socketClient.cancelUp(jsonObject1.toString(),ip,socketPort,devLl.size());
+//                socketClient.cancelUp(jsonObject1.toString(),ip,socketPort,devLl.size());
-            }
+//            }
-        }
+//        }
-        return "取消命令发送成功";
+//        return "取消命令发送成功";
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public String restartDev(List<String> devList) {
+//    public String restartDev(List<String> devList) {
-        List<DeviceIpRVO> relist = lineMapper.getDevicesIp(devList);
+//        List<DeviceIpRVO> relist = lineMapper.getDevicesIp(devList);
-        if(CollUtil.isEmpty(relist)){
+//        if(CollUtil.isEmpty(relist)){
-            return "前置机为空";
+//            return "前置机为空";
-        }else {
+//        }else {
-            List<String> nodeIp = relist.stream().map(DeviceIpRVO::getIp).distinct().collect(Collectors.toList());
+//            List<String> nodeIp = relist.stream().map(DeviceIpRVO::getIp).distinct().collect(Collectors.toList());
-            for(String ip: nodeIp){
+//            for(String ip: nodeIp){
-                List<DeviceIpRVO> devLl = relist.stream().filter(item->item.getIp().equals(ip)).collect(Collectors.toList());
+//                List<DeviceIpRVO> devLl = relist.stream().filter(item->item.getIp().equals(ip)).collect(Collectors.toList());
-                if(CollUtil.isEmpty(devLl)){
+//                if(CollUtil.isEmpty(devLl)){
-                    return "出错啦";
+//                    return "出错啦";
-                }
+//                }
-
+//
-                List<JSONObject> list = new ArrayList<>();
+//                List<JSONObject> list = new ArrayList<>();
-                List<String> devIn = new ArrayList<>();
+//                List<String> devIn = new ArrayList<>();
-                for(DeviceIpRVO devRVO:devLl){
+//                for(DeviceIpRVO devRVO:devLl){
-                    devIn.add(devRVO.getDevIndex());
+//                    devIn.add(devRVO.getDevIndex());
-                    JSONObject dev = new JSONObject();
+//                    JSONObject dev = new JSONObject();
-                    dev.set("devIndex", devRVO.getDevIndex());
+//                    dev.set("devIndex", devRVO.getDevIndex());
-                    dev.set("devName", devRVO.getDevName());
+//                    dev.set("devName", devRVO.getDevName());
-                    list.add(dev);
+//                    list.add(dev);
-                }
+//                }
-
+//
-                JSONObject jsonObject = new JSONObject();
+//                JSONObject jsonObject = new JSONObject();
-                jsonObject.set("terminal", list);
+//                jsonObject.set("terminal", list);
-                jsonObject.set("type", 181);
+//                jsonObject.set("type", 181);
-                jsonObject.set("userIndex", RequestUtil.getUserIndex());
+//                jsonObject.set("userIndex", RequestUtil.getUserIndex());
-                JSONObject jsonObject1 = new JSONObject();
+//                JSONObject jsonObject1 = new JSONObject();
-                jsonObject1.set("len", 0);
+//                jsonObject1.set("len", 0);
-                jsonObject1.set("data", jsonObject);
+//                jsonObject1.set("data", jsonObject);
-
+//
-                socketClient.restartDev(jsonObject1.toString(),ip,socketPort,devIn);
+//                socketClient.restartDev(jsonObject1.toString(),ip,socketPort,devIn);
-            }
+//            }
-        }
+//        }
-        return "命令发送成功";
+//        return "命令发送成功";
-    }
+//    }
 
     @Override
     public void updateDevCheckTime(String devId, String thisTimeCheck, String nextTimeCheck) {

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

@@ -148,6 +148,8 @@ public interface LineMapper extends BaseMapper<Line> {
      */
     List<Line> getLineByCondition(@Param("ids") List<String> ids, @Param("deviceInfoParam") DeviceInfoParam deviceInfoParam);
 
+    List<Line> getLineByConditionBySearchValue(@Param("ids") List<String> ids, @Param("deviceInfoParam") DeviceInfoParam deviceInfoParam);
+
     /**
      * 查询终端信息
      *

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

@@ -88,7 +88,9 @@
         voltage.name busBarname,
         pq_voltage.scale voltageLevel,
         bd.name bdName,
-        gd.name gdName
+        gd.name gdName,
+        supervision_user_report.project_name objName
+
         from pq_dept_line pq_dept_line
         inner join pq_line point on pq_dept_line.line_id = point.id
         inner join pq_line_detail lineDetail on point.id = lineDetail.id
@@ -98,6 +100,7 @@
         inner join pq_device device on dev.id = device.id
         inner join pq_line bd on dev.pid = bd.id
         inner join pq_line gd on bd.pid = gd.id
+        left join supervision_user_report on lineDetail.Obj_Id = supervision_user_report.id
         where device.Dev_Model = 1
         and point.state = 1
         and device.Dev_Data_Type in

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

@@ -235,4 +235,10 @@ public interface LineService extends IService<Line> {
      * 终端运行状态修改时，同时调整监测点的运行状态
      */
     void updateLineRunFlag(String id, Integer status);
+
+    /**
+     * 自动修改验证pids是否正确
+     */
+    void updatePids();
+
 }

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

@@ -83,10 +83,9 @@ public class DeptLineServiceImpl extends ServiceImpl<DeptLineMapper, DeptLine> i
                 List<String> deptList = Arrays.asList("130700000000", "130300000000", "130800000000", "130200000000", "131000000000");
                 Dept data = deptFeignClient.getDeptById(deptLineParam.getId()).getData();
                 if (deptList.contains(data.getArea())) {
-                    List<String> lineIds = list.stream().map(LineDetail::getId).collect(Collectors.toList());
                     detailMapper.update(null, new LambdaUpdateWrapper<LineDetail>()
                             .set(LineDetail::getActualArea, data.getArea())
-                            .in(LineDetail::getId, lineIds));
+                            .in(LineDetail::getId, ids));
                 }
             }
         }

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

@@ -6,9 +6,11 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
@@ -45,6 +47,7 @@ import com.njcn.influx.imapper.PqsCommunicateMapper;
 import com.njcn.influx.pojo.po.PqsCommunicate;
 import com.njcn.influx.query.InfluxQueryWrapper;
 import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
+import com.njcn.supervision.pojo.vo.user.UserReportVO;
 import com.njcn.system.api.AreaFeignClient;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataTypeEnum;
@@ -616,6 +619,11 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
         lineLineDTO.setLinename(lineName);
         lineLineDTO.setNum(lineDetail.getNum());
         lineLineDTO.setObjName(lineDetail.getObjName());
+        lineLineDTO.setObjId(lineDetail.getObjId());
+        if(StringUtils.isNotEmpty(lineDetail.getObjId())){
+            UserReportVO userReportVO = userLedgerService.getUserReportById(lineDetail.getObjId());
+            lineLineDTO.setObjName2(userReportVO.getProjectName());
+        }
         lineLineDTO.setLoadType(dicDataFeignClient.getDicDataById(lineDetail.getLoadType()).getData().getName());
         //电压使用母线电压
         lineLineDTO.setVoltageLevel(dicDataFeignClient.getDicDataById(voltage.getScale()).getData().getName());
@@ -834,6 +842,82 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
         }
     }
 
+    @Override
+    public void updatePids() {
+        List<Line> list = this.list();
+        List<String> strings = this.checkPidsError(list);
+        if(CollUtil.isNotEmpty(strings)){
+            for (String msg : strings) {
+                // 1. 按 | 分割成三部分
+                String[] parts = msg.split(" \\| ");
+                // 2. 提取节点 ID
+                String id = parts[0].replace("节点ID：", "").trim();
+                // 3. 提取正确 pids（去掉括号）
+                String newPids = parts[2].replace("正确pids：[", "").replace("]", "").trim();
+                this.update(new LambdaUpdateWrapper<Line>()
+                        .set(Line::getPids, newPids)
+                        .eq(Line::getId, id));
+
+
+            }
+        }
+    }
+    /**
+     * 校验所有节点 pids 是否正确
+     * 正确规则：去掉开头0 + 去掉自身ID，只保留祖先链
+     */
+    public List<String> checkPidsError(List<Line> allList) {
+        List<String> errorList = new ArrayList<>();
+        Map<String, Line> idMap = allList.stream().collect(Collectors.toMap(Line::getId,Function.identity()));
+        for (Line node : allList) {
+            // 1. 生成正确格式的 pids（你的规则）
+            String correctPids = getCorrectPids(node.getId(), idMap);
+            // 2. 数据库存储的 pids
+            String dbPids = node.getPids() == null ? "" : node.getPids().trim();
+            // 3. 对比，不一致就是错误
+            if (!correctPids.equals(dbPids)) {
+                errorList.add("节点ID：" + node.getId() +
+                        " | 数据库pids：[" + dbPids +
+                        "] | 正确pids：[" + correctPids + "]");
+            }
+        }
+        return errorList;
+    }
+
+    /**
+     * 核心：生成【你要求】的正确 pids
+     * 规则：
+     * 1. 向上遍历所有祖先
+     * 2. 去掉开头 0
+     * 3. 去掉最后一位自身ID
+     * 4. 用逗号拼接
+     */
+    private String getCorrectPids(String nodeId, Map<String, Line> idMap) {
+        Deque<String> pathDeque = new LinkedList<>();
+        String currentId = nodeId;
+        // 向上收集所有节点（包含自身 + 所有祖先 + 0）
+        while (currentId != null && !currentId.isEmpty()) {
+            Line node = idMap.get(currentId);
+            if (ObjectUtil.isNotNull(node)) {
+                // 头插，保证顺序正确
+                pathDeque.addFirst(currentId);
+                currentId = node.getPid();
+            }
+        }
+        // 转列表
+        List<String> path = new ArrayList<>(pathDeque);
+
+        // 1. 去掉开头的 0
+        if (!path.isEmpty() && "0".equals(path.get(0))) {
+            path.remove(0);
+        }
+        // 2. 去掉最后一位（自身ID）
+        if (!path.isEmpty()) {
+            path.remove(path.size() - 1);
+        }
+        // 拼接成最终正确 pids
+        return String.join(",", path);
+    }
 
     @Override
     public List<Overlimit> getOverLimitByList(PollutionParamDTO pollutionParamDTO) {
@@ -908,6 +992,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
                     areaLineInfoVO.setSubName(newUserReportVO.getProjectName());
                     areaLineInfoVO.setLat(newUserReportVO.getLatitude());
                     areaLineInfoVO.setLng(newUserReportVO.getLongitude());
+                    areaLineInfoVO.setObjName(newUserReportVO.getProjectName());
                 }
             }
         }

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

@@ -13,10 +13,12 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.common.mapper.SuperDataMapper;
 import com.njcn.device.common.service.GeneralDeviceService;
 import com.njcn.device.device.mapper.DevFuctionMapper;
+import com.njcn.device.device.service.DeviceProcessService;
 import com.njcn.device.device.service.IDevMealService;
 import com.njcn.device.device.service.IDevStrategyService;
 import com.njcn.device.device.service.IDeviceService;
 import com.njcn.device.line.service.LineService;
+import com.njcn.device.pq.constant.Param;
 import com.njcn.device.pq.enums.LineBaseEnum;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.*;
@@ -84,6 +86,7 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
 
     private final CldStatisticsFlowMapper cldStatisticsFlowMapper;
     private final LineService lineService;
+    private final DeviceProcessService deviceProcessService;
 
     @Override
     public List<TerminalMaintainVO> getTerminalMainList(TerminalMainQueryParam terminalMainQueryParam) {
@@ -184,14 +187,14 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
                         if (device.getRunFlag() == 0) {
                             newFlag = "投运";
                         } else if (device.getRunFlag() == 1) {
-                            newFlag = "热备用";
+                            newFlag = "检修";
                         } else if (device.getRunFlag() == 2) {
                             newFlag = "停运";
                         }
                         if (device1.getRunFlag() == 0) {
                             oldFlag = "投运";
                         } else if (device1.getRunFlag() == 1) {
-                            oldFlag = "热备用";
+                            oldFlag = "检修";
                         } else if (device1.getRunFlag() == 2) {
                             oldFlag = "停运";
                         }
@@ -205,7 +208,19 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
                         terminalLogsNew.setObjIndex(device.getId());
                         terminalLogsNew.setTerminalDescribe(sb.toString());
                         terminalLogsNew.setIsPush(0);
-                        terminalLogsNew.setOperateType("update");
+                        if(device.getRunFlag() == 0&&device1.getRunFlag()!=0){
+                            terminalLogsNew.setOperateType(Param.DEL);
+
+                        }
+                        if(device1.getRunFlag() == 0&&device.getRunFlag()!=0){
+                            terminalLogsNew.setOperateType(Param.ADD);
+                            //判断device是否绑定进程号；
+                            DeviceProcess deviceProcess = new DeviceProcess();
+                            deviceProcess.setId(device1.getId());
+                            deviceProcess.setProcessNo(1);
+
+                            deviceProcessService.saveOrUpdate(deviceProcess);
+                        }
                         terminalLogsNew.setLogsType(data.getId());
                         terminalLogsNew.setTerminalType(LineBaseEnum.DEVICE_LEVEL.getCode());
                         terminalLogsNew.setState(DataStateEnum.ENABLE.getCode());

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

@@ -27,6 +27,7 @@
       supervision_user_report.status,
       supervision_user_report.dev_id,
       supervision_user_report.line_id,
+      supervision_user_report.station_id,
       supervision_user_report.second_assessment_id secondAssessmentId
     FROM supervision_user_report supervision_user_report
     WHERE ${ew.sqlSegment}

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

@@ -17,6 +17,9 @@ import com.njcn.bpm.enums.BpmTaskStatusEnum;
 import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.line.mapper.LineMapper;
+import com.njcn.device.pq.pojo.po.Line;
+import com.njcn.device.substation.mapper.SubstationMapper;
 import com.njcn.device.userledger.mapper.UserReportNormalMapper;
 import com.njcn.device.userledger.mapper.UserReportPOMapper;
 import com.njcn.device.userledger.service.UserLedgerService;
@@ -67,6 +70,7 @@ public class UserLedgerServiceImpl extends ServiceImpl<UserReportPOMapper, UserR
     private final UserReportNormalMapper userReportNormalMapper;
     private final UserReportSensitivePOService userReportSensitivePOService;
     private final UserFeignClient userFeignClient;
+    private final LineMapper substationMapper;
 
     @Override
     public List<UserLedgerVO> selectUserList(UserReportParam userReportParam) {
@@ -171,7 +175,16 @@ public class UserLedgerServiceImpl extends ServiceImpl<UserReportPOMapper, UserR
         userReportVOQueryWrapper.orderByDesc("supervision_user_report.create_time");
         Page<UserReportVO> page;
         page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(userReportQueryParam), PageFactory.getPageSize(userReportQueryParam)), userReportVOQueryWrapper);
+        Map<String,String> atationMap = new HashMap<>();
+        if(CollUtil.isNotEmpty(page.getRecords())){
+           List<String> stationIds = page.getRecords().stream().map(UserReportVO::getStationId).filter(StrUtil::isNotBlank).distinct().collect(Collectors.toList());
+          if(CollUtil.isNotEmpty(stationIds)){
+              List<Line> stationList = substationMapper.selectBatchIds(stationIds);
+              stationList.forEach(line -> atationMap.put(line.getId(), line.getName()));
+          }
+        }
         page.getRecords().forEach(temp -> {
+            temp.setStationId(atationMap.getOrDefault(temp.getStationId(),"/"));
             Integer needGovernance = 0;
             if (
                     CollectionUtil.newArrayList(

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/utils/LineSortHelper.java

@@ -0,0 +1,59 @@
+package com.njcn.device.utils;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.device.line.mapper.LineMapper;
+import com.njcn.device.pq.pojo.po.Line;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.Objects;
+
+/**
+ * @Author: cdf
+ * @CreateTime: 2026-06-13
+ * @Description:
+ */
+@Component
+@RequiredArgsConstructor
+public class LineSortHelper {
+
+    private final LineMapper lineMapper;
+
+    /**
+     * 获取同一父节点下的最大 sort 值 + 1
+     * @param level 层级
+     * @return 下一个可用的 sort 值
+     */
+    public Integer getNextSort(Integer level) {
+        LambdaQueryWrapper<Line> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Line::getState, DataStateEnum.ENABLE.getCode())
+                .eq(Line::getLevel,level)
+                .orderByDesc(Line::getSort)
+                .last("limit 1");
+        Line maxSortLine = lineMapper.selectOne(wrapper);
+
+        if (Objects.nonNull(maxSortLine) && Objects.nonNull(maxSortLine.getSort())) {
+            return maxSortLine.getSort() + 1;
+        }
+        return 0;
+    }
+
+
+    public void handleSort(Integer level, Integer sort,Line line) {
+        int lastSort;
+        if (Objects.isNull(sort) || sort == 0) {
+            lastSort = getNextSort(level);
+        }else {
+            lastSort = sort;
+        }
+        line.setSort(lastSort);
+    }
+
+
+    public Integer handleSortBatch(Integer currentSort, Line line) {
+        line.setSort(currentSort);
+        return currentSort + 1;
+    }
+
+}

pqs-energy/energy-api/pom.xml

@@ -55,6 +55,8 @@
             <version>1.1.0</version>
         </dependency>
 
+
+
     </dependencies>
 
 

pqs-energy/energy-boot/pom.xml

@@ -56,6 +56,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <!--mqtt相关依赖-->
+        <dependency>
+            <groupId>com.github.tocrhz</groupId>
+            <artifactId>mqtt-spring-boot-starter</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>

pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/StatisticsParam.java

@@ -6,9 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @author xxy
@@ -35,4 +33,7 @@ public class StatisticsParam implements Serializable {
     @ApiModelProperty(name = "flag",value = "标识")
     private Integer flag;
 
+    @ApiModelProperty(name = "isDip",value = "是否只统计暂降")
+    private Boolean isDip;
+
 }

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/AdvanceEventDetailVO.java

@@ -76,7 +76,7 @@ public class AdvanceEventDetailVO {
     private String sagsource;
 
     @ApiModelProperty(value = "开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss.SSS")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS",timezone = "GMT+8")
     private LocalDateTime startTime;
 
     @ApiModelProperty(value = "持续时间，单位秒")

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/ReportController.java

@@ -40,6 +40,7 @@ import java.io.IOException;
 import java.text.ParseException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 
 /**
  * @author xxy
@@ -237,7 +238,7 @@ public class ReportController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/createEventReport")
     @ApiOperation("暂态事件报告导出")
-    public void createEventReport(@RequestBody @Validated List<String> index, HttpServletResponse response) throws IOException, InvalidFormatException {
+    public void createEventReport(@RequestBody @Validated List<String> index, HttpServletResponse response) throws IOException, InvalidFormatException, ExecutionException, InterruptedException {
         commMonitorEventReportService.createEventReport(index,response);
     }
 }

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java

@@ -1609,7 +1609,7 @@ public class ReportServiceImpl implements ReportService {
         createTitle(doc, "4. 总汇信息", "标题 1", 0, 15);
 
         //查询参数
-        StatisticsParam param = new StatisticsParam(exportParam.getLineId(), exportParam.getSearchBeginTime(), exportParam.getSearchEndTime(), exportParam.getFlag());
+        StatisticsParam param = new StatisticsParam(exportParam.getLineId(), exportParam.getSearchBeginTime(), exportParam.getSearchEndTime(), exportParam.getFlag(),null);
         //获取暂降原因字典
         List<DictData> reasonData = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_REASON.getName()).getData();
         //获取暂降类型字典

pqs-event/event-common/src/main/java/com/njcn/event/common/pojo/dto/LineDetailDataCommDTO.java

@@ -130,4 +130,7 @@ public class LineDetailDataCommDTO {
 
     @ApiModelProperty(name = "对象类型大类")
     private String bigObjType;
+
+    @ApiModelProperty(name = "isDip",value = "是否只统计暂降")
+    private Boolean isDip;
 }

pqs-event/event-common/src/main/java/com/njcn/event/common/service/CommMonitorEventReportService.java

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutionException;
 
 /**
  * pqs
@@ -25,12 +26,12 @@ public interface CommMonitorEventReportService {
      * 暂态事件报告
      * @param index
      */
-    void createEventReport(List<String> index, HttpServletResponse response) throws IOException, InvalidFormatException;
+    void createEventReport(List<String> index, HttpServletResponse response) throws IOException, InvalidFormatException, ExecutionException, InterruptedException;
 
     /**
      * 暂态事件报告存储，返回文件路径
      * @param index
      * @return
      */
-    String saveStableEventReport(List<String> index, Map<String, AreaLineInfoVO> map);
+    String saveStableEventReport(List<String> index, Map<String, AreaLineInfoVO> map, String fileName);
 }

pqs-event/event-common/src/main/java/com/njcn/event/common/service/EventAnalysisService.java

@@ -1,10 +1,10 @@
 package com.njcn.event.common.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.event.pojo.param.*;
+import com.njcn.event.pojo.param.EventBaseParam;
+import com.njcn.event.pojo.param.StatisticsParam;
 import com.njcn.event.pojo.vo.*;
 
-import java.text.ParseException;
 import java.util.List;
 
 /**
@@ -79,8 +79,6 @@ public interface EventAnalysisService {
      */
     Page<WaveTypeVO> getMonitorEventAnalyseQuery(EventBaseParam eventBaseParam);
 
-
-
     /**
      *监测点事件波形下载
      * @author zbj
@@ -88,6 +86,20 @@ public interface EventAnalysisService {
      */
     //HttpServletResponse downloadMonitorEventWaveFile(WaveFileParam waveFileParam, HttpServletResponse response) throws Exception;
 
-
+    /**
+     * 判定压降落点区域
+     * <p>
+     * 入参：
+     *   eventValue  特征幅值（百分比形式，如 "80.5" 表示 80.5%），内部 /100 得到 VVm（0~1）
+     *   persistTime 持续时间（秒）
+     * <p>
+     * 优先规则：
+     *   1) 持续时间 < 0.001 秒 或 VVm = 0  →  A区
+     *   2) 按区间表逐行匹配（左闭右开 [下限, 上限)）
+     *   3) 都不匹配返回 null，由调用方走兜底
+     *
+     * @return 区域名（A区/B区/C区/D区）；解析失败或未匹配返回 null
+     */
+     String determineDropZone(String eventValue, String persistTime);
 
 }

pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/CommMonitorEventReportServiceImpl.java

@@ -48,6 +48,7 @@ import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblWidth;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblWidth;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
@@ -60,6 +61,7 @@ import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.concurrent.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -86,7 +88,8 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
     private final FileStorageUtil fileStorageUtil;
     private final LineFeignClient lineFeignClient;
     private final EventCauseFeignClient eventCauseFeignClient;
-
+    @Resource(name="asyncExecutor")
+    private  Executor executor;
 
     /**
      * 监测点导出word
@@ -187,7 +190,7 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
         createTitle(doc, "4. 总汇信息", "标题 1", 0, 15);
 
         //查询参数
-        StatisticsParam param = new StatisticsParam(exportParam.getLineId(), exportParam.getSearchBeginTime(), exportParam.getSearchEndTime(), exportParam.getFlag());
+        StatisticsParam param = new StatisticsParam(exportParam.getLineId(), exportParam.getSearchBeginTime(), exportParam.getSearchEndTime(), exportParam.getFlag(), lineDetailData.getIsDip());
         //获取暂降原因字典
         List<DictData> reasonData = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_REASON.getName()).getData();
         //获取暂降类型字典
@@ -476,10 +479,8 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
         } catch (Exception e) {
             throw new BusinessException(CommonResponseEnum.FAIL, "导出监测点暂降报告异常");
         }
-
     }
 
-
     /**
      * 创建标题
      *
@@ -582,19 +583,19 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
      * @return
      */
     private List<EventDetail> info(StatisticsParam statisticsParam) {
-//        //获取事件类型
+        // 构建查询条件
-//        List<DictData> dictType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode()).getData();
+        LambdaQueryWrapper<RmpEventDetailPO> queryWrapper = new LambdaQueryWrapper<RmpEventDetailPO>()
-//        List<String> typeIds = dictType.stream().filter(x -> DicDataEnum.VOLTAGE_DIP.getCode().equals(x.getCode()) || DicDataEnum.SHORT_INTERRUPTIONS.getCode().equals(x.getCode()))
+                .eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
-//                .map(DictData::getId).collect(Collectors.toList());
+                .ge(StrUtil.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
-        //数据暂降查询
+                .le(StrUtil.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
-        List<RmpEventDetailPO> info = rmpEventDetailMapper.selectList(new LambdaQueryWrapper<RmpEventDetailPO>()
+                .orderByDesc(RmpEventDetailPO::getStartTime);
-                        .eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
+        if (!Objects.isNull(statisticsParam.getIsDip()) && statisticsParam.getIsDip()) {
-//                .in(RmpEventDetailPO::getEventType, typeIds)
+            List<DictData> data = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode()).getData();
-                        .ge(StrUtil.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
+            List<String> typeList = data.stream().filter(it->it.getCode().equals(DicDataEnum.VOLTAGE_DIP.getCode()) || it.getCode().equals(DicDataEnum.SHORT_INTERRUPTIONS.getCode())).map(DictData::getId).collect(Collectors.toList());        List<TimeVO> list = new ArrayList<>();
-                        .le(StrUtil.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
+            queryWrapper.in(RmpEventDetailPO::getEventType, typeList);
-                        .orderByDesc(RmpEventDetailPO::getStartTime)
+        }
-        );
+        // 数据暂降查询
-
+        List<RmpEventDetailPO> info = rmpEventDetailMapper.selectList(queryWrapper);
         return BeanUtil.copyToList(info, EventDetail.class);
     }
 
@@ -602,8 +603,10 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
     /**
      * 生成暂降事件报告
      */
-    public void createEventReport(List<String> eventIndex, HttpServletResponse response) throws IOException, InvalidFormatException {
+    @Override
+    public void createEventReport(List<String> eventIndex, HttpServletResponse response) throws IOException, InvalidFormatException, ExecutionException, InterruptedException {
         WordUtil wordUtil = new WordUtil();
+        // 创建专用的线程池（建议大小为CPU核心数或稍大，这里设为3个并行任务）
         for (String index : eventIndex) {
             RmpEventDetailPO detail = rmpEventDetailMapper.selectById(index);
             List<AreaLineInfoVO> lineDetail = lineFeignClient.getBaseLineAreaInfo(Stream.of(detail.getLineId()).collect(Collectors.toList())).getData();
@@ -614,18 +617,40 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
             if (ObjUtil.isNull(waveData)) {
                 throw new BusinessException(CommonResponseEnum.FAIL, "没有波形数据");
             } else {
-                //获取瞬时波形
+                // 使用 CompletableFuture 并行执行三个耗时操作
-                String instantPath = wavePicComponent.generateImageShun(waveData, waveDataDetails);
+                CompletableFuture<String> instantFuture = CompletableFuture.supplyAsync(() -> {
-                InputStream instantStream = fileStorageUtil.getFileStream(instantPath);
+                    String instantPath = wavePicComponent.generateImageShun(waveData, waveDataDetails);
-                String imageShun64 = cn.hutool.core.codec.Base64.encode(instantStream);
+                    try (InputStream instantStream = fileStorageUtil.getFileStream(instantPath)) {
+                        return cn.hutool.core.codec.Base64.encode(instantStream);
+                    } catch (Exception e) {
+                        throw new RuntimeException("生成瞬时波形失败", e);
+                    }
+                }, executor);
 
+                CompletableFuture<String> rmsFuture = CompletableFuture.supplyAsync(() -> {
+                    String rmsPath = wavePicComponent.generateImageRms(waveData, waveDataDetails);
+                    try (InputStream rmsStream = fileStorageUtil.getFileStream(rmsPath)) {
+                        return cn.hutool.core.codec.Base64.encode(rmsStream);
+                    } catch (Exception e) {
+                        throw new RuntimeException("生成RMS波形失败", e);
+                    }
+                }, executor);
+
+
+                // 等待所有异步任务完成并获取结果（无超时，但可加）
+                CompletableFuture<Void> allFutures = CompletableFuture.allOf(instantFuture, rmsFuture);
+                allFutures.join();  // 阻塞直到2个任务都完成
+
+                // 获取结果（此时所有任务已完成，get()不会阻塞）
+                String imageShun64 = instantFuture.get();
+                String rmsShun64 = rmsFuture.get();
+                List<EventEigDetail> eventDetailEigenvalue =  waveService.eventDetailEigenvalue(index, line.getPtType());
+
+                // 主线程顺序调用 WordUtil 方法（保证线程安全）
                 wordUtil.translateShun(index, imageShun64);
-                //获取rms波形
-                String rmsPath = wavePicComponent.generateImageRms(waveData, waveDataDetails);
-                InputStream rmsStream = fileStorageUtil.getFileStream(rmsPath);
-                String rmsShun64 = cn.hutool.core.codec.Base64.encode(rmsStream);
                 wordUtil.translateRms(index, rmsShun64);
-
+                wordUtil.setEventDetailEigenvalue(index, eventDetailEigenvalue);
+                // 设置事件基本信息（不涉及耗时操作）
                 EventInfoDetailVO eventInfoList = new EventInfoDetailVO();
                 eventInfoList.setLineName(line.getLineName());
                 eventInfoList.setGdName(line.getGdName());
@@ -639,9 +664,6 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
                 eventInfoList.setMs(detail.getFirstMs());
                 eventInfoList.setEventValue(detail.getFeatureAmplitude());
                 wordUtil.setEventInfoList(index, eventInfoList);
-                List<EventEigDetail> eventDetailEigenvalue = waveService.eventDetailEigenvalue(index,line.getPtType());
-                wordUtil.setEventDetailEigenvalue(index, eventDetailEigenvalue);
-
             }
         }
         wordUtil.createReport(eventIndex);
@@ -658,7 +680,7 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
     }
 
     @Override
-    public String saveStableEventReport(List<String> eventIndex, Map<String, AreaLineInfoVO> map) {
+    public String saveStableEventReport(List<String> eventIndex, Map<String, AreaLineInfoVO> map, String fileName) {
         WordUtil wordUtil = new WordUtil();
         for (String index : eventIndex) {
             RmpEventDetailPO detail = rmpEventDetailMapper.selectById(index);
@@ -709,7 +731,12 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
         }
         try {
             InputStream inputStream = wordUtil.createReport2(eventIndex);
-            String filePath = fileStorageUtil.uploadStream(inputStream, OssPath.APP_EVENT_REPORT, "暂降事件报告.docx");
+            String filePath;
+            if (Objects.isNull(fileName)) {
+                filePath = fileStorageUtil.uploadStream(inputStream, OssPath.APP_EVENT_REPORT, null);
+            } else {
+                filePath = fileStorageUtil.uploadStreamSpecifyName(inputStream, OssPath.APP_EVENT_REPORT, fileName);
+            }
             return filePath;
         } catch (IOException | InvalidFormatException e) {
             throw new RuntimeException(e);

pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventAnalysisServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.config.GeneralInfo;
@@ -13,6 +12,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
 import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
+import com.njcn.event.common.service.EventAnalysisService;
 import com.njcn.event.common.service.EventDetailService;
 import com.njcn.event.enums.EventResponseEnum;
 import com.njcn.event.file.pojo.enums.WaveFileResponseEnum;
@@ -21,19 +21,20 @@ import com.njcn.event.pojo.param.StatisticsParam;
 import com.njcn.event.pojo.po.EventDetail;
 import com.njcn.event.pojo.po.RmpEventDetailPO;
 import com.njcn.event.pojo.vo.*;
-import com.njcn.event.common.service.EventAnalysisService;
 import com.njcn.influx.utils.InfluxDbUtils;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.po.DictData;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.influxdb.dto.QueryResult;
 import org.springframework.stereotype.Service;
 
 import java.io.*;
-import java.text.ParseException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
@@ -51,6 +52,7 @@ import java.util.zip.ZipOutputStream;
  */
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class EventAnalysisServiceImpl implements EventAnalysisService {
 
     // 定义阈值常量（单位：百分比）
@@ -1727,6 +1729,75 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
 
     }
 
+    @Override
+    public String determineDropZone(String eventValue, String persistTime) {
+        if (eventValue == null || eventValue.trim().isEmpty()
+                || persistTime == null || persistTime.trim().isEmpty()) {
+            log.warn("判定压降落点区域入参为空，eventValue={}, persistTime={}", eventValue, persistTime);
+            return null;
+        }
+        BigDecimal vvm;
+        BigDecimal vvtm;
+        try {
+            // params[3] 是百分比（如 "80.5"），/100 得到 0~1 的 VVm
+            vvm = new BigDecimal(eventValue.trim()).divide(new BigDecimal("100"), 6, RoundingMode.HALF_UP);
+            vvtm = new BigDecimal(persistTime.trim());
+        } catch (Exception e) {
+            log.error("判定压降落点区域入参解析失败，eventValue={}, persistTime={}", eventValue, persistTime, e);
+            return null;
+        }
+
+        // 1) 超短脉冲 或 完全失压 默认 A 区
+        if (vvtm.compareTo(new BigDecimal("0.001")) < 0
+                || vvm.compareTo(BigDecimal.ZERO) == 0) {
+            return "A区";
+        }
+
+        // 2) 区间表（左闭右开）
+        // A区
+        if (inRange(vvm, "0.9", "1") && inRange(vvtm, "0.001", "60")) {
+            return "A区";
+        }
+        if (inRange(vvm, "0", "0.9") && inRange(vvtm, "0.001", "0.05")) {
+            return "A区";
+        }
+        // B区
+        if (inRange(vvm, "0.5", "0.7") && inRange(vvtm, "0.05", "0.2")) {
+            return "B区";
+        }
+        if (inRange(vvm, "0.7", "0.8") && inRange(vvtm, "0.05", "0.5")) {
+            return "B区";
+        }
+        if (inRange(vvm, "0.8", "0.9") && inRange(vvtm, "0.05", "60")) {
+            return "B区";
+        }
+        // C区
+        if (inRange(vvm, "0", "0.5") && inRange(vvtm, "0.05", "1")) {
+            return "C区";
+        }
+        if (inRange(vvm, "0.5", "0.7") && inRange(vvtm, "0.2", "1")) {
+            return "C区";
+        }
+        if (inRange(vvm, "0.7", "0.8") && inRange(vvtm, "0.5", "1")) {
+            return "C区";
+        }
+        // D区
+        if (inRange(vvm, "0", "0.8") && inRange(vvtm, "1", "60")) {
+            return "D区";
+        }
+
+        log.warn("压降落点区域未匹配任何规则，eventValue={}, persistTime={}", eventValue, persistTime);
+        return null;
+    }
+
+    /**
+     * 左闭右开区间判断：lowerInclusive ≤ value < upperExclusive
+     */
+    private boolean inRange(BigDecimal value, String lowerInclusive, String upperExclusive) {
+        return value.compareTo(new BigDecimal(lowerInclusive)) >= 0
+                && value.compareTo(new BigDecimal(upperExclusive)) < 0;
+    }
+
 
     /**
      * 监测点事件波形下载

pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventDetailServiceImpl.java

@@ -37,16 +37,20 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.influxdb.dto.QueryResult;
 import org.influxdb.impl.InfluxDBResultMapper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
 import java.util.stream.Collectors;
 
 /**
@@ -69,7 +73,8 @@ public class EventDetailServiceImpl extends ServiceImpl<RmpEventDetailMapper, Rm
     private final DeptLineFeignClient deptLineFeignClient;
     private final DeptFeignClient deptFeignClient;
     private final UserFeignClient userFeignClient;
-
+    @Resource(name="asyncExecutor")
+    private Executor executor;
     private final EventCauseFeignClient eventCauseFeignClient;
     @Override
     public List<EventDetail> getEventDetailData(String id, String startTime, String endTime) {
@@ -153,9 +158,15 @@ public class EventDetailServiceImpl extends ServiceImpl<RmpEventDetailMapper, Rm
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+//    @Transactional(rollbackFor = Exception.class)
     public Boolean addEventDetail(EventDeatilDTO deatilDTO) {
+        RmpEventDetailPO one = this.lambdaQuery().eq(RmpEventDetailPO::getLineId, deatilDTO.getMonitorId()).eq(RmpEventDetailPO::getStartTime, deatilDTO.getStartTime()).one();
         RmpEventDetailPO rmpEventDetailPO = new RmpEventDetailPO();
+
+        if(Objects.nonNull(one)){
+            BeanUtils.copyProperties(one,rmpEventDetailPO);
+
+        }
 //        rmpEventDetailPO.setMeasurementPointId(deatilDTO.getMonitorId());
         rmpEventDetailPO.setLineId(deatilDTO.getMonitorId());
         DictData data = dicDataFeignClient.getDicDataByCode(eventTypeReflection(deatilDTO.getEventType())).getData();
@@ -170,56 +181,17 @@ public class EventDetailServiceImpl extends ServiceImpl<RmpEventDetailMapper, Rm
         }else {
             rmpEventDetailPO.setFileFlag(1);
         }
-
+        //默认给0，经过高级算法在赋值
+        rmpEventDetailPO.setDealFlag(0);
         rmpEventDetailPO.setEventDescribe(" ");
         //如果不为空，说明是二次上传波形文件了;
-        String  reason,type;
-        if(!StringUtils.isEmpty(rmpEventDetailPO.getWavePath())){
-            LineDetailDataVO lineDetailData = lineFeignClient.getLineDetailData(rmpEventDetailPO.getLineId()).getData();
-            String ip = lineDetailData.getIp();
-            EventAnalysisDTO eventAnalysisDTO = new EventAnalysisDTO();
-            eventAnalysisDTO.setIp(ip);
-            eventAnalysisDTO.setWaveName(rmpEventDetailPO.getWavePath());
 
-            EventAnalysisDTO result = eventCauseFeignClient.analysisCauseAndType(eventAnalysisDTO).getData();
-            if(Objects.isNull(result.getCause())){
-                reason =reasonReflection(0);
-
-            }else {
-                reason =reasonReflection(result.getCause());
-
-            }
-            if(Objects.isNull(result.getType())){
-                type =advanceTypeReflection(10);
-
-            }else {
-                type =advanceTypeReflection(result.getType());
-
-            }
-            DictData advancereason = dicDataFeignClient.getDicDataByCode(reason).getData();
-            DictData advanceType = dicDataFeignClient.getDicDataByCode(type).getData();
-            if(Objects.equals(result.getCauseFlag(),1)&&Objects.equals(result.getTypeFlag(),1)){
-                rmpEventDetailPO.setDealFlag(1);
-            }else {
-                rmpEventDetailPO.setDealFlag(0);
-            }
-            rmpEventDetailPO.setAdvanceReason(advancereason.getId());
-            rmpEventDetailPO.setAdvanceType(advanceType.getId());
-
-        }
-        //默认都是其他
-//        DictData reason = dicDataFeignClient.getDicDataByCode(DicDataEnum.RESON_REST.getCode()).getData();
-//        DictData advanceType = dicDataFeignClient.getDicDataByCode(DicDataEnum.TYPE_REST.getCode()).getData();
-//
-//        rmpEventDetailPO.setAdvanceReason(reason.getId());
-//        rmpEventDetailPO.setAdvanceType(advanceType.getId());
 
 
         String severity = EventUtil.getYzd(deatilDTO.getDuration().floatValue(),(deatilDTO.getAmplitude().floatValue()/100));
         rmpEventDetailPO.setSeverity(Double.valueOf(severity));
         rmpEventDetailPO.setCreateTime(LocalDateTime.now());
 
-        RmpEventDetailPO one = this.lambdaQuery().eq(RmpEventDetailPO::getLineId, rmpEventDetailPO.getLineId()).eq(RmpEventDetailPO::getStartTime, rmpEventDetailPO.getStartTime()).one();
         if(Objects.nonNull(one)){
             rmpEventDetailPO.setEventId(one.getEventId());
 
@@ -233,10 +205,73 @@ public class EventDetailServiceImpl extends ServiceImpl<RmpEventDetailMapper, Rm
                 pushEvent(rmpEventDetailPO);
             }
         }
+        //异步调用高级算法
+        if (!StringUtils.isEmpty(rmpEventDetailPO.getWavePath())) {
+            CompletableFuture.runAsync(() -> {
+                // 异步任务内执行分析及更新
+                analyzeAndUpdateEvent(rmpEventDetailPO.getEventId(), rmpEventDetailPO.getLineId(), rmpEventDetailPO.getWavePath());
+            }, executor).exceptionally(ex -> {
+                // exceptionally 也可以捕获异常，但内部已 try-catch，这里仅做兜底日志
+                log.error("异步任务未预期的异常, eventId: {}", rmpEventDetailPO.getEventId(), ex);
+                return null;
+            });
+        }
 
         return true;
     }
 
+    private void analyzeAndUpdateEvent(String eventId, String lineId, String wavePath) {
+        // 重新查询实体，避免跨线程持久化对象问题
+        RmpEventDetailPO po = this.getById(eventId);
+        if (po == null) {
+            log.warn("异步分析时事件记录不存在, eventId: {}", eventId);
+            return;
+        }
+
+        try {
+            // Feign 调用链
+            LineDetailDataVO lineDetailData = lineFeignClient.getLineDetailData(lineId).getData();
+            String ip = lineDetailData.getIp();
+            EventAnalysisDTO eventAnalysisDTO = new EventAnalysisDTO();
+            eventAnalysisDTO.setIp(ip);
+            eventAnalysisDTO.setWaveName(wavePath);
+
+            EventAnalysisDTO result = eventCauseFeignClient.analysisCauseAndType(eventAnalysisDTO).getData();
+
+            // 转换结果
+            String reasonCode, typeCode;
+            if (Objects.isNull(result.getCause())) {
+                reasonCode = reasonReflection(0);
+            } else {
+                reasonCode = reasonReflection(result.getCause());
+            }
+            if (Objects.isNull(result.getType())) {
+                typeCode = advanceTypeReflection(10);
+            } else {
+                typeCode = advanceTypeReflection(result.getType());
+            }
+
+            DictData advancereason = dicDataFeignClient.getDicDataByCode(reasonCode).getData();
+            DictData advanceType = dicDataFeignClient.getDicDataByCode(typeCode).getData();
+
+            po.setAdvanceReason(advancereason.getId());
+            po.setAdvanceType(advanceType.getId());
+            if (Objects.equals(result.getCauseFlag(), 1) && Objects.equals(result.getTypeFlag(), 1)) {
+                po.setDealFlag(1);
+            } else {
+                po.setDealFlag(0);
+            }
+            // 更新数据库
+            this.updateById(po);
+        } catch (Exception e) {
+            // 关键点：所有异常被捕获并记录日志，不会抛出到主线程
+            log.error("异步分析失败, eventId={}, wavePath={}", eventId, wavePath, e);
+            // 可选：设置一个错误标志，避免一直处于未分析状态
+            po.setDealFlag(0);
+            this.updateById(po);
+        }
+    }
+
     private String advanceTypeReflection(Integer type) {
         String result = DicDataEnum.TYPE_REST.getCode();
         switch (type) {
@@ -353,5 +388,15 @@ public class EventDetailServiceImpl extends ServiceImpl<RmpEventDetailMapper, Rm
         return result;
     }
 
+    public static void main(String[] args) {
+        try{
+            System.out.println(1/0);
+        }catch (Exception e){
+            System.out.println(1);
+        }
+        System.out.println(1111);
+
+    }
+
 
 }

pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventReportServiceImpl.java

@@ -849,7 +849,7 @@ public class EventReportServiceImpl implements EventReportService {
                 } else {
                     builder2.append(startYear).append("-").append(startMonth + 1).append("-").append(startDays);
                 }
-                query = MonitorQuery(new StatisticsParam(statisticsParam.getLineIndex(), builder1.toString(), builder2.toString(), statisticsParam.getFlag()));
+                query = MonitorQuery(new StatisticsParam(statisticsParam.getLineIndex(), builder1.toString(), builder2.toString(), statisticsParam.getFlag(),null));
                 InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
                 List<EventDetail> eventDetailList = influxDBResultMapper.toPOJO(query, EventDetail.class);
                 long count = eventDetailList.stream().filter(x -> x.getEventType() == "1").count();
@@ -868,7 +868,7 @@ public class EventReportServiceImpl implements EventReportService {
             builder2.delete(0, builder2.length());
             builder1.append(startYear).append("-").append(startMonth).append("-").append(startDays);
             builder2.append(startYear).append("-").append(startMonth).append("-").append(endDays);
-            query = MonitorQuery(new StatisticsParam(statisticsParam.getLineIndex(), builder1.toString(), builder2.toString(), statisticsParam.getFlag()));
+            query = MonitorQuery(new StatisticsParam(statisticsParam.getLineIndex(), builder1.toString(), builder2.toString(), statisticsParam.getFlag(),null));
             InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
             List<EventDetail> eventDetailList = influxDBResultMapper.toPOJO(query, EventDetail.class);
             long count1 = eventDetailList.stream().filter(x -> x.getEventType() == "1").count();

pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/WaveServiceImpl.java

@@ -62,7 +62,7 @@ public class WaveServiceImpl implements WaveService {
                 if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) {
                     throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
                 }
-                waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 1);
+                waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 2);
             } catch (Exception e) {
                 try {
                     InputStream cfgStreamLower = fileStorageUtil.getFileStream(wavePath + GeneralConstant.CFG_LOWER);
@@ -70,7 +70,7 @@ public class WaveServiceImpl implements WaveService {
                     if (Objects.isNull(cfgStreamLower) || Objects.isNull(datStreamLower)) {
                         throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
                     }
-                    waveDataDTO = waveFileComponent.getComtrade(cfgStreamLower, datStreamLower, 1);
+                    waveDataDTO = waveFileComponent.getComtrade(cfgStreamLower, datStreamLower, 2);
                 } catch (Exception e1) {
                     throw new BusinessException(WaveFileResponseEnum.WAVE_DATA_INVALID);
                 }

pqs-gateway/src/main/java/com/njcn/gateway/filter/AuthGlobalFilter.java

@@ -44,7 +44,7 @@ import java.util.List;
 @RequiredArgsConstructor
 public class AuthGlobalFilter implements GlobalFilter, Ordered {
 
-    private final static List<String> USER_AGENT_IP = Arrays.asList("/pqs-auth/auth/getImgCode", "/pqs-auth/oauth/token", "/user-boot/user/generateSm2Key", "/user-boot/user/updateFirstPassword", "/user-boot/appUser/resetPsd");
+    private final static List<String> USER_AGENT_IP = Arrays.asList("/pqs-auth/auth/getImgCode", "/pqs-auth/oauth/token", "/user-boot/user/generateSm2Key", "/user-boot/user/updateFirstPassword", "/user-boot/appUser/resetPsd","/pqs-auth/oauth/lnLogin","/pqs-auth/oauth/lnCheck","/pqs-auth/oauth/lnRefreshToken");
 
     private final RedisUtil redisUtil;
 

pqs-gateway/src/main/resources/bootstrap-sjzx.yml

@@ -223,6 +223,9 @@ whitelist:
     - /user-boot/appUser/resetPsd
     - /pqs-auth/oauth/logout
     - /pqs-auth/oauth/token
+    - /pqs-auth/oauth/lnLogin
+    - /pqs-auth/oauth/lnCheck
+    - /pqs-auth/oauth/lnRefreshToken
     - /pqs-auth/oauth/autoLogin
     - /pqs-auth/auth/getImgCode
     - /pqs-auth/oauth/getPublicKey

pqs-gateway/src/main/resources/bootstrap.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: @spring.profiles.active@
+    active: @spring.profiles.active@

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/ReportSearchParam.java

@@ -36,6 +36,9 @@ public class ReportSearchParam {
     //目前用于区分不同系统资源，null默认 1.无线系统，配合cs-device
     private Integer resourceType;
 
+    //区分统计数据还是分钟数据，null默认统计数据 0.统计数据 1.分钟数据
+    private Integer isStatisticData;
+
     //浙江无线报表特殊标识 null为通用报表 1.浙江无线报表
     private Integer customType;
 

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/report/AreaHarmReportParam.java

@@ -3,6 +3,8 @@ package com.njcn.harmonic.pojo.param.report;
 import com.njcn.harmonic.pojo.dto.report.CommReportLedgerDto;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author: cdf
  * @CreateTime: 2026-01-06
@@ -17,4 +19,6 @@ public class AreaHarmReportParam {
 
     private String deptId;
 
+    private List<String> voltageIds;
+
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/OverAreaLimitVO.java

@@ -191,6 +191,11 @@ public class OverAreaLimitVO {
     private Double negativeOverDayBiLi = -1.0;
 
     //间谐波电压超标情况
+
+    /**
+     * 超标监测点集合，区域报告使用
+     */
+    private List<String> inHarmonicVMonitorList = new ArrayList<>();;
     /**
      * 个数
      */

pqs-harmonic/harmonic-boot/pom.xml

@@ -99,12 +99,12 @@
             <artifactId>joda-time</artifactId>
             <version>2.9.9</version>
         </dependency>
-   <!--     <dependency>
+        <!--     <dependency>
-            <groupId>com.njcn</groupId>
+                 <groupId>com.njcn</groupId>
-            <artifactId>prepare-api</artifactId>
+                 <artifactId>prepare-api</artifactId>
-            <version>1.0.0</version>
+                 <version>1.0.0</version>
-            <scope>compile</scope>
+                 <scope>compile</scope>
-        </dependency>-->
+             </dependency>-->
         <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>advance-api</artifactId>

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/GridDiagramHarmController.java

@@ -58,6 +58,16 @@ public class GridDiagramHarmController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, subLineGiveAnAlarm, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getAreaObjAlarm")
+    @ApiOperation("区域场站监测点规模")
+    @ApiImplicitParam(name = "param", value = "区域场站监测点规模参数", required = true)
+    public HttpResult<GridDiagramVO> getAreaObjAlarm(@RequestBody StatSubstationBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getAreaObjAlarm");
+        GridDiagramVO subLineGiveAnAlarm = irMpTargetWarnDService.getAreaObjAlarm(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, subLineGiveAnAlarm, methodDescribe);
+    }
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getPollutionAlarmData")
     @ApiOperation("变电站污染告警占比")

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/IRMpTargetWarnDService.java

@@ -20,4 +20,6 @@ public interface IRMpTargetWarnDService extends IService<RMpTargetWarnDPO> {
 
 
     GridDiagramVO getSubLineGiveAnAlarm(StatSubstationBizBaseParam param);
+
+    GridDiagramVO getAreaObjAlarm(StatSubstationBizBaseParam param);
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AnalyzeServiceImpl.java

@@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.njcn.common.config.GeneralInfo;
+import com.njcn.device.biz.commApi.CommLineClient;
+import com.njcn.device.biz.pojo.dto.LineALLInfoDTO;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.api.UserLedgerFeignClient;
@@ -48,6 +50,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.io.File;
 import java.math.BigDecimal;
@@ -83,7 +86,7 @@ public class AnalyzeServiceImpl implements IAnalyzeService {
     private final EventDetailFeignClient eventDetailFeignClient;
     private final DicDataFeignClient dicDataFeignClient;
     private final UserLedgerFeignClient userLedgerFeignClient;
-
+    private final CommLineClient commLineClient;
     @Override
     public Page<OverAreaLimitVO> getAreaData(OverAreaVO param) {
         Page<OverAreaLimitVO> page = new Page<>();
@@ -301,8 +304,31 @@ public class AnalyzeServiceImpl implements IAnalyzeService {
                 lineList.addAll(item.getLineIndexes());
             });
         }
-        if (CollectionUtil.isNotEmpty(lineList)) {
+        List<String> filterLineList = new ArrayList<>();
-            page = targetMapper.getSumLimitTargetPage(page, lineList, DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())),
+
+        if(CollectionUtil.isNotEmpty(lineList)){
+            //根据searchvalue过滤
+            String searchvalue=param.getSearchValue();
+            List<LineALLInfoDTO> data = commLineClient.getLineAllDetailList(lineList).getData();
+            filterLineList= data.stream()
+                    .filter(dto -> {
+                        LineALLInfoDTO.LineLineDTO lineDTO = dto.getLineLineDTO();
+                        String linename = lineDTO != null ? lineDTO.getLinename() : null;
+                        String objName2 = lineDTO != null ? lineDTO.getObjName2() : null;
+
+                        LineALLInfoDTO.LineSubStationDTO subStationDTO = dto.getLineSubStationDTO();
+                        String subStationName = subStationDTO != null ? subStationDTO.getSubStationName() : null;
+
+                        // 大小写敏感的模糊匹配（相当于 MySQL 的 LIKE '%keyword%'）
+                        return (linename != null && linename.contains(searchvalue))
+                                || (objName2 != null && objName2.contains(searchvalue))
+                                || (subStationName != null && subStationName.contains(searchvalue));
+                    }).map(dto -> dto.getLineLineDTO() != null ? dto.getLineLineDTO().getLineId() : null)
+
+                    .collect(Collectors.toList());
+        }
+        if (CollectionUtil.isNotEmpty(filterLineList)) {
+            page = targetMapper.getSumLimitTargetPage(page, filterLineList, DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())),
                     DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())));
             List<MonitorOverLimitVO> pageRecords = page.getRecords();
             if (CollectionUtils.isEmpty(pageRecords)) {
@@ -509,6 +535,7 @@ public class AnalyzeServiceImpl implements IAnalyzeService {
         Set<String> flickerMonitorList = new HashSet<>();
         Set<String> harmonicVoltageMonitorList = new HashSet<>();
         Set<String> harmonicCurrentMonitorList = new HashSet<>();
+        Set<String> harmonicInHarmonciVMonitorList = new HashSet<>();
 
         int threeV = 0, fiveV = 0, sevenV = 0, elevenV = 0, otherV = 0;
         Set<String> threeVList = new HashSet<>(), fiveVList = new HashSet<>(), sevenVList = new HashSet<>(), elevenVList = new HashSet<>(), otherVList = new HashSet<>();
@@ -553,6 +580,8 @@ public class AnalyzeServiceImpl implements IAnalyzeService {
                         inuharmCount++;
                     }
 
+
+
                     //区域报告
                     if (Objects.nonNull(param.getAreaReportFlag()) && param.getAreaReportFlag() == 1) {
                         if (item.getFreqDevOvertime() > 0) {
@@ -576,7 +605,9 @@ public class AnalyzeServiceImpl implements IAnalyzeService {
                         }
 
 
-
+                        if (inHarmFlag(item)) {
+                            harmonicInHarmonciVMonitorList.add(item.getLineId());
+                        }
 
                         if (item.getUharm3Overtime() > 0) {
                             threeV++;
@@ -620,6 +651,7 @@ public class AnalyzeServiceImpl implements IAnalyzeService {
                             otherI++;
                             otherIList.add(item.getLineId());
                         }
+
                     }
                 }
 
@@ -660,6 +692,8 @@ public class AnalyzeServiceImpl implements IAnalyzeService {
                 //间谐波电压
                 overAreaLimitVO.setInterHarmonicMonitorNumber(inuharmCount);
                 overAreaLimitVO.setInterHarmonicBiLi(BigDecimal.valueOf(inuharmCount * 1.0 / data.size() * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                overAreaLimitVO.setInHarmonicVMonitorList(new ArrayList<>(harmonicInHarmonciVMonitorList));
+
             }
 
 
@@ -912,6 +946,16 @@ public class AnalyzeServiceImpl implements IAnalyzeService {
         return count > 0;
     }
 
+    private boolean inHarmVFlag(RStatLimitTargetDPO rStatLimitRateDPO) {
+        int count = rStatLimitRateDPO.getInuharm1Overtime() + rStatLimitRateDPO.getInuharm2Overtime()  + rStatLimitRateDPO.getInuharm3Overtime() +
+                rStatLimitRateDPO.getInuharm4Overtime() + rStatLimitRateDPO.getInuharm5Overtime() + rStatLimitRateDPO.getInuharm6Overtime()  +
+                rStatLimitRateDPO.getInuharm7Overtime() + rStatLimitRateDPO.getInuharm8Overtime() +
+                rStatLimitRateDPO.getInuharm9Overtime() + rStatLimitRateDPO.getInuharm10Overtime() + rStatLimitRateDPO.getInuharm11Overtime()+
+                rStatLimitRateDPO.getInuharm12Overtime() + rStatLimitRateDPO.getInuharm13Overtime() + rStatLimitRateDPO.getInuharm14Overtime()+
+                rStatLimitRateDPO.getInuharm15Overtime() + rStatLimitRateDPO.getInuharm16Overtime();
+        return count > 0;
+    }
+
     private boolean inHarmFlag(RStatLimitTargetDPO t) {
         int count = t.getInuharm1Overtime() + t.getInuharm2Overtime() + t.getInuharm3Overtime() + t.getInuharm4Overtime() + t.getInuharm5Overtime() + t.getInuharm6Overtime() + t.getInuharm7Overtime() + t.getInuharm8Overtime() + t.getInuharm9Overtime() + t.getInuharm10Overtime() + t.getInuharm11Overtime() + t.getInuharm12Overtime() + t.getInuharm13Overtime() + t.getInuharm14Overtime() + t.getInuharm15Overtime() + t.getInuharm16Overtime();
         return count > 0;

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmInHarmServiceImpl.java

@@ -1,12 +1,20 @@
 package com.njcn.harmonic.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.common.utils.HarmonicTimesUtil;
 import com.njcn.common.utils.PubUtils;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.biz.pojo.po.Overlimit;
+import com.njcn.harmonic.common.mapper.RStatDataHarmRateVDMapper;
+import com.njcn.harmonic.common.mapper.RStatDataIDMapper;
 import com.njcn.harmonic.constant.Param;
+import com.njcn.harmonic.mapper.RStatDataHarmRateIDMapper;
 import com.njcn.harmonic.pojo.param.HarmInHarmParam;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmrateIDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataHarmrateVDPO;
+import com.njcn.harmonic.pojo.po.day.RStatDataIDPO;
 import com.njcn.harmonic.pojo.vo.HarmInHarmVO;
 import com.njcn.harmonic.service.HarmInHarmService;
 import com.njcn.influx.pojo.constant.InfluxDBTableConstant;
@@ -21,6 +29,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
@@ -41,7 +50,8 @@ public class HarmInHarmServiceImpl implements HarmInHarmService {
 
     private final IDataIService dataIService;
 
-
+    private final RStatDataHarmRateVDMapper dataHarmRateVDMapper;
+    private final RStatDataIDMapper dataIDMapper;
     @Override
     public HarmInHarmVO getHarmInHarmData(HarmInHarmParam harmInHarmParam) {
         HarmInHarmVO harmInHarmVO = new HarmInHarmVO();
@@ -77,33 +87,70 @@ public class HarmInHarmServiceImpl implements HarmInHarmService {
         List<Float> floatList = new ArrayList<>();
         if (StrUtil.isNotBlank(lineId)) {
             if (harmState == 0) {
-                InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmRateV.class);
+//                InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmRateV.class);
-                influxQueryWrapper.meanSamePrefixAndSuffix("v_", "", HarmonicTimesUtil.harmonicTimesList(2, 50, 1))
+//                influxQueryWrapper.meanSamePrefixAndSuffix("v_", "", HarmonicTimesUtil.harmonicTimesList(2, 50, 1))
-                        .between(DataHarmRateV::getTime, startTime, endTime)
+//                        .between(DataHarmRateV::getTime, startTime, endTime)
-                        .eq(DataHarmRateV::getLineId, lineId)
+//                        .eq(DataHarmRateV::getLineId, lineId)
-                        .eq(DataHarmRateV::getValueType, InfluxDBTableConstant.CP95)
+//                        .eq(DataHarmRateV::getValueType, InfluxDBTableConstant.CP95)
-                        .ne(DataHarmRateV::getPhaseType, InfluxDBTableConstant.PHASE_TYPE_T);
+//                        .ne(DataHarmRateV::getPhaseType, InfluxDBTableConstant.PHASE_TYPE_T);
-                DataHarmRateV dataHarmRateV = dataHarmRateVService.getMeanAllTimesData(influxQueryWrapper);
+//                DataHarmRateV dataHarmRateV = dataHarmRateVService.getMeanAllTimesData(influxQueryWrapper);
-                if (Objects.nonNull(dataHarmRateV)) {
+//                if (Objects.nonNull(dataHarmRateV)) {
+//                    for (int i = 2; i < 51; i++) {
+//                        floatList.add(PubUtils.getValueByMethodDouble(dataHarmRateV, "getV", i).floatValue());
+//                    }
+//                }else {
+//                    for (int i = 2; i < 51; i++) {
+//                        floatList.add(null);
+//                    }
+//                }
+                //转换成查mysql统计数据，分钟数据没有值
+                List<RStatDataHarmrateVDPO> harmV = dataHarmRateVDMapper.selectList(new LambdaQueryWrapper<RStatDataHarmrateVDPO>()
+                        .eq(RStatDataHarmrateVDPO::getLineId, lineId)
+                        .eq(RStatDataHarmrateVDPO::getValueType,"CP95")
+                        .in(RStatDataHarmrateVDPO::getPhaseType, Arrays.asList("A","B","C"))
+                        .ge(RStatDataHarmrateVDPO::getTime, DateUtil.beginOfDay(DateUtil.parse(startTime)))
+                        .le(RStatDataHarmrateVDPO::getTime, DateUtil.endOfDay(DateUtil.parse(endTime)))
+                );
+
+                if (Objects.nonNull(harmV)) {
                     for (int i = 2; i < 51; i++) {
-                        floatList.add(PubUtils.getValueByMethodDouble(dataHarmRateV, "getV", i).floatValue());
+                        floatList.add(PubUtils.getValueByMethodDouble(harmV,RStatDataHarmrateVDPO.class, "getV", i).floatValue());
                     }
                 }else {
                     for (int i = 2; i < 51; i++) {
                         floatList.add(null);
                     }
                 }
+
             } else {
-                InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataI.class);
+//                InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataI.class);
-                influxQueryWrapper.meanSamePrefixAndSuffix("i_", "", HarmonicTimesUtil.harmonicTimesList(2, 50, 1))
+//                influxQueryWrapper.meanSamePrefixAndSuffix("i_", "", HarmonicTimesUtil.harmonicTimesList(2, 50, 1))
-                        .between(DataHarmRateV::getTime, startTime, endTime)
+//                        .between(DataHarmRateV::getTime, startTime, endTime)
-                        .eq(DataHarmRateV::getLineId, lineId)
+//                        .eq(DataHarmRateV::getLineId, lineId)
-                        .eq(DataHarmRateV::getValueType, InfluxDBTableConstant.CP95)
+//                        .eq(DataHarmRateV::getValueType, InfluxDBTableConstant.CP95)
-                        .ne(DataHarmRateV::getPhaseType, InfluxDBTableConstant.PHASE_TYPE_T);
+//                        .ne(DataHarmRateV::getPhaseType, InfluxDBTableConstant.PHASE_TYPE_T);
-                DataI dataI = dataIService.getMeanAllTimesData(influxQueryWrapper);
+//                DataI dataI = dataIService.getMeanAllTimesData(influxQueryWrapper);
-                if (Objects.nonNull(dataI)) {
+//                if (Objects.nonNull(dataI)) {
+//                    for (int i = 2; i < 51; i++) {
+//                        floatList.add(PubUtils.getValueByMethodDouble(dataI, "getI", i).floatValue());
+//                    }
+//                }else {
+//                    for (int i = 2; i < 51; i++) {
+//                        floatList.add(null);
+//                    }
+//                }
+
+                //转换成查mysql统计数据，分钟数据没有值
+                List<RStatDataIDPO> harmI = dataIDMapper.selectList(new LambdaQueryWrapper<RStatDataIDPO>()
+                        .eq(RStatDataIDPO::getLineId, lineId)
+                        .eq(RStatDataIDPO::getValueType,"CP95")
+                        .in(RStatDataIDPO::getPhaseType, Arrays.asList("A","B","C"))
+                        .ge(RStatDataIDPO::getTime, DateUtil.beginOfDay(DateUtil.parse(startTime)))
+                        .le(RStatDataIDPO::getTime, DateUtil.endOfDay(DateUtil.parse(endTime)))
+                );
+                if (Objects.nonNull(harmI)) {
                     for (int i = 2; i < 51; i++) {
-                        floatList.add(PubUtils.getValueByMethodDouble(dataI, "getI", i).floatValue());
+                        floatList.add(PubUtils.getValueByMethodDouble(harmI,RStatDataIDPO.class, "getI", i).floatValue());
                     }
                 }else {
                     for (int i = 2; i < 51; i++) {

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java

@@ -329,7 +329,8 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                 DictData dictData = dicDataFeignClient.getDicDataById(lineDetailDataVO.getVoltageLevel()).getData();
                 float voltageLevel = Float.parseFloat(dictData.getValue());
                 float shortVal = COverlimitUtil.getDlCapByVoltageLevel(voltageLevel);
-                overlimit = COverlimitUtil.globalAssemble(voltageLevel, 10f, 10f, shortVal, 1, 1);
+                float devVal = COverlimitUtil.getDefaultDevCapacity(voltageLevel);
+                overlimit = COverlimitUtil.globalAssemble(voltageLevel, devVal, devVal, shortVal, 1, 0);
             }
 
             //组装sql语句

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpTargetWarnDServiceImpl.java

@@ -2,10 +2,10 @@ package com.njcn.harmonic.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
-import com.njcn.device.biz.pojo.dto.DeptGetSubStationDTO;
+import com.njcn.device.biz.pojo.dto.*;
-import com.njcn.device.biz.pojo.dto.SubGetBase;
 import com.njcn.device.biz.pojo.param.DeptGetLineParam;
 import com.njcn.device.pq.api.LineIntegrityClient;
 import com.njcn.device.pq.pojo.po.RStatIntegrityD;
@@ -124,6 +124,74 @@ public class RMpTargetWarnDServiceImpl extends ServiceImpl<RMpTargetWarnDMapper,
         return gridDiagramVO;
     }
 
+
+    @Override
+    public GridDiagramVO getAreaObjAlarm(StatSubstationBizBaseParam param) {
+        //获取电压等级
+        List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData();
+
+        List<DictData> v = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PANORAMIC_VOLTAGE.getCode()).getData();
+        List<String> voltageIds;
+        //获取电压等级550 220 110 35
+        if(CollUtil.isNotEmpty(v)){
+            List<String> vName = v.stream().map(DictData::getName).collect(Collectors.toList());
+            voltageIds = dictDataList.stream().filter(item -> vName.contains(item.getName())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList());
+        }else{
+            voltageIds = dictDataList.stream().filter(item -> Objects.equals(DicDataEnum.DY_500KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_220KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_110KV.getCode(), item.getCode()) || Objects.equals(DicDataEnum.DY_35KV.getCode(), item.getCode())).sorted(Comparator.comparing(DictData::getSort).reversed()).map(DictData::getId).collect(Collectors.toList());
+        }
+        GridDiagramVO gridDiagramVO = new GridDiagramVO();
+        List<GridDiagramVO.LineStatistics> info = new ArrayList<>();
+        List<GridDiagramVO.LineStatistics> gwInfo = new ArrayList<>();
+
+        //获取部门数据关系
+        List<Dept> data = deptFeignClient.getDirectSonSelf(param.getId()).getData();
+        DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
+        deptGetLineParam.setDeptId(param.getId());
+        deptGetLineParam.setMonitorStateRunning(false);
+        List<DeptGetChildrenMoreDTO> deptGetChildrenMoreDTOS = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
+
+        Map<String,DeptGetChildrenMoreDTO> listMap = deptGetChildrenMoreDTOS.stream().collect(Collectors.toMap(DeptGetChildrenMoreDTO::getUnitId,Function.identity()));
+
+        GridDiagramVO.LineStatistics lineStatistics;
+        GridDiagramVO.LineStatistics gwLineStatistics;
+        for (Dept datum : data) {
+            if (listMap.containsKey(datum.getId())) {
+                lineStatistics = new GridDiagramVO.LineStatistics();
+                lineStatistics.setOrgId(datum.getId());
+                lineStatistics.setOrgName(datum.getName());
+                gwLineStatistics = new GridDiagramVO.LineStatistics();
+                gwLineStatistics.setOrgId(datum.getId());
+                gwLineStatistics.setOrgName(datum.getName());
+                List<LineDevGetDTO> baseList = listMap.get(datum.getId()).getLineBaseList().stream().filter(it->StrUtil.isNotBlank(it.getObjId())).collect(Collectors.toList());
+                Map<String,List<LineDevGetDTO>> voltageMonitorMap = baseList.stream().collect(Collectors.groupingBy(LineDevGetDTO::getVoltageLevel));
+                List<GridDiagramVO.StatisticsData> statisticsData = new ArrayList<>();
+                List<GridDiagramVO.StatisticsData> gwStatisticsData = new ArrayList<>();
+
+                for(String voltage:voltageIds){
+                    GridDiagramVO.StatisticsData voltageItem = new GridDiagramVO.StatisticsData();
+                    voltageItem.setColumnName(voltage);
+                    if(voltageMonitorMap.containsKey(voltage)){
+                       List<String> ids = voltageMonitorMap.get(voltage).stream().map(LineDevGetDTO::getObjId).distinct().collect(Collectors.toList());
+                        voltageItem.setNumOne((long)ids.size());
+                        voltageItem.setNumOneList(ids);
+                    }else {
+                        voltageItem.setNumOne(0L);
+                        voltageItem.setNumOneList(new ArrayList<>());
+                    }
+                    statisticsData.add(voltageItem);
+                }
+                lineStatistics.setData(statisticsData);
+                gwLineStatistics.setData(gwStatisticsData);
+
+                info.add(lineStatistics);
+                gwInfo.add(gwLineStatistics);
+            }
+        }
+        gridDiagramVO.setInfo(info);
+        gridDiagramVO.setGwInfo(gwInfo);
+        return gridDiagramVO;
+    }
+
     private void getSubStationStatisticsData(List<GridDiagramVO.StatisticsData> statisticsData,
                                              List<GridDiagramVO.StatisticsData> gwStatisticsData,
                                              List<SubGetBase> subBaseList,

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/report/impl/AreaHarmonicServiceImpl.java

@@ -28,6 +28,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
@@ -132,9 +133,9 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
         tableList.add(new ArrayList<>());
 
         // 1. 台账表格
-        List<String[]> ledgerTable = buildLedgerTable(param.getDeptId());
+        List<String[]> ledgerTable = buildLedgerTable(param.getDeptId(),param.getVoltageIds());
         if(CollUtil.isEmpty(ledgerTable)){
-            throw new BusinessException(CommonResponseEnum.FAIL,"当前部门不存在在运监测点");
+            throw new BusinessException(CommonResponseEnum.FAIL,"未查询到在运监测点");
         }
         tableList.add(ledgerTable);
 
@@ -145,7 +146,7 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
         List<OverAreaLimitVO> qualityData = getPowerQualityData(param);
         if (CollUtil.isNotEmpty(qualityData)) {
             // 构建监控点名称映射
-            Map<String, String> monitorNameMap = buildMonitorNameMap(param.getDeptId());
+            Map<String, String> monitorNameMap = buildMonitorNameMap(param.getDeptId(),param.getVoltageIds());
 
             // 过滤有效数据（在线监控数>0）
             List<OverAreaLimitVO> validData = qualityData.stream()
@@ -159,6 +160,7 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
                 tableList.add(buildFlickerTable(validData));
                 tableList.add(buildVoltageHarmonicTable(validData));
                 tableList.add(buildCurrentHarmonicTable(validData));
+                tableList.add(buildIHarmonicVTable(validData));
 
                 // 计算并设置指标数据到临时存储，稍后合并
                 calculateAndStoreIndicatorData(reportData, validData, monitorNameMap);
@@ -176,8 +178,8 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
     /**
      * 构建台账表格
      */
-    private List<String[]> buildLedgerTable(String deptId) {
+    private List<String[]> buildLedgerTable(String deptId, List<String> voltageIds) {
-        List<MonitorCommLedgerInfoDTO> ledgerList = getLedgerInfo(deptId);
+        List<MonitorCommLedgerInfoDTO> ledgerList = getLedgerInfo(deptId,voltageIds);
         if (CollUtil.isEmpty(ledgerList)) {
             return new ArrayList<>();
         }
@@ -190,7 +192,7 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
                     MonitorCommLedgerInfoDTO ledger = ledgerList.get(i);
                     return new String[]{
                             String.valueOf(i + 1),
-                            ledger.getMonitorName(),
+                            StringUtils.hasText(ledger.getObjName())? ledger.getObjName()+"_"+ledger.getMonitorName():ledger.getMonitorName(),
                             ledger.getBdName(),
                             ledger.getBusBarName(),
                             voltageLevelMap.getOrDefault(ledger.getVoltageLevel(), ""),
@@ -270,6 +272,23 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
                 .collect(Collectors.toList());
     }
 
+    /**
+     * 构建间谐波表格
+     */
+    private List<String[]> buildIHarmonicVTable(List<OverAreaLimitVO> dataList) {
+        return dataList.stream()
+                .filter(vo -> vo.getOnlineMonitorNumber() != null && vo.getOnlineMonitorNumber() > 0)
+                .map(vo -> new String[]{
+                        vo.getName(),
+                        vo.getOnlineMonitorNumber().toString(),
+                        vo.getInterHarmonicMonitorNumber().toString(),
+                        vo.getInterHarmonicBiLi().toString(),
+                        vo.getInterHarmonicDayAvgBiLi().toString(),
+                        vo.getInterHarmonicOverDayBiLi().toString()
+                })
+                .collect(Collectors.toList());
+    }
+
     /**
      * 构建谐波电压表格
      */
@@ -329,7 +348,7 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
                     vo.getOnlineMonitorNumber().toString(),
                     vo.getHarmonicCurrentMonitorNumber().toString(),
                     vo.getHarmonicCurrentBiLi().toString(),
-                    vo.getHarmonicVoltageDayAvgBiLi().toString(), // 注意：这里保持原逻辑，使用谐波电压日均值
+                    vo.getHarmonicCurrentDayAvgBiLi().toString(), // 注意：这里保持原逻辑，使用谐波电压日均值
                     vo.getHarmonicCurrentOverDayBiLi().toString()
             });
 
@@ -376,6 +395,8 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
         // 谐波电流
         processCurrentHarmonic(reportData, validData, monitorNameMap);
 
+        //间谐波电压含有率
+        processIHarmonicV(reportData, validData, monitorNameMap);
         // 生成结论
         generateConclusion(reportData);
     }
@@ -440,6 +461,22 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
         reportData.put("$flickerLine$", formatMonitorList(monitorList));
     }
 
+    /**
+     * 处理间谐波电压含有率
+     */
+    private void processIHarmonicV(Map<String, Object> reportData,
+                                List<OverAreaLimitVO> dataList,
+                                Map<String, String> monitorNameMap) {
+        double avgRate = calculateAverage(dataList, OverAreaLimitVO::getInterHarmonicBiLi);
+        List<String> monitorList = extractMonitorNames(dataList,
+                vo -> vo.getInHarmonicVMonitorList(), monitorNameMap);
+
+        reportData.put("$iharmVRate$", formatPercentage(avgRate));
+        reportData.put("$iharmVMark$", getGrade(avgRate));
+        reportData.put("$iharmVLine$", formatMonitorList(monitorList));
+    }
+
+
     /**
      * 处理谐波电压
      */
@@ -511,7 +548,7 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
         indicatorScores.put("闪变", reportData.get("$flickerMark$").toString());
         indicatorScores.put("谐波电压", reportData.get("$v_all_Mark$").toString());
         indicatorScores.put("谐波电流", reportData.get("$i_all_Mark$").toString());
-
+        indicatorScores.put("间谐波电压含有率", reportData.get("$iharmVMark$").toString());
         // 按等级分类指标
         Map<String, List<String>> categorizedIndicators = categorizeIndicators(indicatorScores);
 
@@ -750,10 +787,14 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
     /**
      * 获取台账信息
      */
-    private List<MonitorCommLedgerInfoDTO> getLedgerInfo(String deptId) {
+    private List<MonitorCommLedgerInfoDTO> getLedgerInfo(String deptId, List<String> voltageIds) {
         DeptGetLineParam param = new DeptGetLineParam();
         param.setDeptId(deptId);
-        return commTerminalGeneralClient.deptGetLineInfo(param).getData();
+        List<MonitorCommLedgerInfoDTO> data = commTerminalGeneralClient.deptGetLineInfo(param).getData();
+        if(CollUtil.isNotEmpty(voltageIds)){
+            data=data.stream().filter(temp->voltageIds.contains(temp.getVoltageLevel())).collect(Collectors.toList());
+        }
+        return data;
     }
 
     /**
@@ -770,13 +811,14 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
     /**
      * 构建监控点名称映射
      */
-    private Map<String, String> buildMonitorNameMap(String deptId) {
+    private Map<String, String> buildMonitorNameMap(String deptId, List<String> voltageIds) {
-        List<MonitorCommLedgerInfoDTO> ledgerList = getLedgerInfo(deptId);
+        List<MonitorCommLedgerInfoDTO> ledgerList = getLedgerInfo(deptId, voltageIds);
         return ledgerList.stream()
                 .collect(Collectors.toMap(
-                        MonitorCommLedgerInfoDTO::getMonitorId,
+                                MonitorCommLedgerInfoDTO::getMonitorId,
-                        MonitorCommLedgerInfoDTO::getMonitorName
+                            temp-> StringUtils.hasText(temp.getObjName())? temp.getObjName()+"_"+temp.getMonitorName():temp.getMonitorName()
-                ));
+
+                        ));
     }
 
     /**
@@ -791,6 +833,16 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
         queryParam.setSearchEndTime(param.getEndTime());
         queryParam.setStatisticalType(new SimpleDTO());
         queryParam.setAreaReportFlag(1);
+        if(CollUtil.isNotEmpty(param.getVoltageIds())){
+            List<SimpleDTO> collect = param.getVoltageIds().stream().map(temp -> {
+                SimpleDTO simpleDTO = new SimpleDTO();
+                simpleDTO.setId(temp);
+                return simpleDTO;
+            }).collect(Collectors.toList());
+            queryParam.setScale(collect);
+        }
+
+
 
         Page<OverAreaLimitVO> page = iAnalyzeService.getAreaData(queryParam);
         return page.getRecords();

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/report/impl/CustomReportServiceImpl.java

@@ -106,7 +106,6 @@ public class CustomReportServiceImpl implements CustomReportService {
 
     private final WlRecordFeignClient wlRecordFeignClient;
 
-    private final ExecutorService executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() + 1);
 
     private final String CELL_DATA = "celldata";
     private final String V = "v";
@@ -863,260 +862,7 @@ public class CustomReportServiceImpl implements CustomReportService {
     }
 
 
-    /**
-     * 处理
-     *
-     * @author cdf
-     * @date 2023/10/8
-     */
 
-/*
-    private void analyzeReport(ReportSearchParam reportSearchParam, ExcelRptTemp excelRptTemp, HttpServletResponse response) {
-        //定义一个线程集合
-        List<Future<?>> futures = new ArrayList<>();
-        //指标
-        List<ReportTemplateDTO> reportTemplateDTOList = new ArrayList<>();
-        //限值
-        List<ReportTemplateDTO> reportLimitList = new ArrayList<>();
-        //台账
-        List<ReportTemplateDTO> terminalList = new ArrayList<>();
-        JSONArray jsonArray;
-        try (InputStream fileStream = fileStorageUtil.getFileStream(excelRptTemp.getContent())) {
-            jsonArray = new JSONArray(new JSONTokener(fileStream, new JSONConfig()));
-            parseTemplate(jsonArray, reportTemplateDTOList, reportLimitList, terminalList);
-        } catch (Exception e) {
-            if(e instanceof BusinessException){
-                throw new BusinessException(e.getMessage());
-            }else {
-                throw new BusinessException(HarmonicResponseEnum.CUSTOM_REPORT_JSON);
-            }
-        }
-        //查询不分相别的指标
-        DictData dictData = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.EPD.getCode(), DicDataTypeEnum.CS_DATA_TYPE.getCode()).getData();
-        if(Objects.isNull(dictData)){
-            throw new BusinessException(CommonResponseEnum.FAIL,"字典类型模板缺少!");
-        }
-        List<EleEpdPqd> temTargetList = eleEpdMapper.selectList(new LambdaQueryWrapper<EleEpdPqd>().eq(EleEpdPqd::getDataType,dictData.getId()).in(EleEpdPqd::getPhase,Arrays.asList("T", "M")));
-        List<String> noPhaseList = temTargetList.stream().filter(it->StrUtil.isNotBlank(it.getOtherName())).map(it->it.getOtherName().toUpperCase()).collect(Collectors.toList());
-
-        //处理指标是否合格
-        reportLimitList = new LinkedHashSet<>(reportLimitList).stream().sorted(Comparator.comparing(ReportTemplateDTO::getItemName)).collect(Collectors.toList());
-        Map<String, Float> limitMap = overLimitDeal(reportLimitList, reportSearchParam);
-        //存放限值指标的map
-        Map<String, ReportTemplateDTO> limitTargetMapX = reportLimitList.stream().collect(Collectors.toMap(ReportTemplateDTO::getItemName, Function.identity()));
-
-        List<ReportTemplateDTO> endList = new CopyOnWriteArrayList<>();
-        if (CollUtil.isNotEmpty(reportTemplateDTOList)) {
-            //开始组织sql
-            reportTemplateDTOList = new LinkedHashSet<>(reportTemplateDTOList).stream().sorted(Comparator.comparing(ReportTemplateDTO::getItemName)).collect(Collectors.toList());
-            Map<String, List<ReportTemplateDTO>> classMap = reportTemplateDTOList.stream().collect(Collectors.groupingBy(ReportTemplateDTO::getResourceId));
-            //定义存放越限指标的map
-            Map<String, ReportTemplateDTO> assNoPassMap = new HashMap<>();
-            classMap.forEach((classKey, templateValue) -> {
-                Map<String, List<ReportTemplateDTO>> valueTypeMap = templateValue.stream().collect(Collectors.groupingBy(ReportTemplateDTO::getStatMethod));
-                //每张表开启一个独立线程查询
-                futures.add(executorService.submit(() -> {
-                    //avg.max,min,cp95
-                    valueTypeMap.forEach((valueTypeKey, valueTypeVal) -> {
-                        //相别分组
-                        Map<String, List<ReportTemplateDTO>> phaseMap = valueTypeVal.stream().collect(Collectors.groupingBy(ReportTemplateDTO::getPhase));
-                        phaseMap.forEach((phaseKey, phaseVal) -> {
-                            StringBuilder sql = new StringBuilder(InfluxDbSqlConstant.SELECT);
-                            if (InfluxDbSqlConstant.MAX.equalsIgnoreCase(valueTypeKey)) {
-                                assSqlByMysql(phaseVal, sql, endList, InfluxDbSqlConstant.MAX, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap,noPhaseList);
-                            } else if (InfluxDbSqlConstant.MIN.equalsIgnoreCase(valueTypeKey)) {
-                                assSqlByMysql(phaseVal, sql, endList, InfluxDbSqlConstant.MIN, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap,noPhaseList);
-                            } else if (InfluxDbSqlConstant.AVG_WEB.equalsIgnoreCase(valueTypeKey)) {
-                                assSqlByMysql(phaseVal, sql, endList, InfluxDbSqlConstant.AVG_WEB, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap,noPhaseList);
-                            } else if (InfluxDbSqlConstant.CP95.equalsIgnoreCase(valueTypeKey)) {
-                                assSqlByMysql(phaseVal, sql, endList, InfluxDbSqlConstant.CP95, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap,noPhaseList);
-                            }
-
-                        });
-                    });
-                }));
-
-            });
-
-            // 等待所有任务完成
-            for (Future<?> future : futures) {
-                try {
-                    future.get(); // 这会阻塞直到任务完成或抛出异常
-                } catch (InterruptedException | ExecutionException e) {
-                    e.printStackTrace();
-                    log.error("自定义报表多线程查询流程出错！错误信息{}",e.getMessage());
-                }
-            }
-
-            //处理指标最终判定合格还是不合格
-            dealTargetResult(assNoPassMap, limitTargetMapX, endList);
-        }
-        if (CollUtil.isNotEmpty(endList)) {
-            //数据单位信息
-            Map<String, String> unit = unitMap(reportSearchParam);
-            //进行反向赋值到模板
-            //1、根据itemName分组
-            Map<String, List<ReportTemplateDTO>> assMap = endList.stream().collect(Collectors.groupingBy(ReportTemplateDTO::getItemName));
-            //处理台账信息
-            Map<String, String> finalTerminalMap;
-            if (CollUtil.isNotEmpty(terminalList)) {
-                finalTerminalMap = convertKeysToUpperCase(commTerminalGeneralClient.getCustomDetailByLineId(reportSearchParam.getLineId()).getData());
-            }else {
-                finalTerminalMap = new HashMap<>();
-            }
-            //2、把itemName的value赋给v和m
-            jsonArray.forEach(item -> {
-                JSONObject jsonObject = (JSONObject) item;
-                JSONArray itemArr = (JSONArray) jsonObject.get(CELL_DATA);
-                itemArr.forEach((it) -> {
-                    if (Objects.nonNull(it) && !"null".equals(it.toString())) {
-                        //获取到1列
-                        JSONObject data = (JSONObject) it;
-                        JSONObject son = (JSONObject) data.get(V);
-                        if (son.containsKey(V)) {
-                            String v = son.getStr(V);
-                            //数据格式：$HA[_25]#B#max#classId$ 或 $HA[_25]#max#classId$
-                            if (v.charAt(0) == '$' && v.contains(STR_ONE)) {
-                                String str = "";
-                                List<ReportTemplateDTO> rDto = assMap.get(v.replace(STR_TWO, "").toUpperCase());
-                                if (Objects.nonNull(rDto)) {
-                                    str = rDto.get(0).getValue();
-                                    //没有值，赋"/"
-                                    if (StringUtils.isBlank(str)) {
-                                        str = "/";
-                                    }
-                                    son.set(V, str);
-                                    if (Objects.nonNull(rDto.get(0).getOverLimitFlag()) && rDto.get(0).getOverLimitFlag() == 1) {
-                                        son.set("fc", "#990000");
-                                    }
-                                }
-                            } else if (v.charAt(0) == '%' && v.contains(STR_ONE)) {
-                                //指标合格情况
-                                String str = "";
-                                List<ReportTemplateDTO> rDto = assMap.get(v.replace(STR_FOUR, "").toUpperCase());
-                                if (Objects.nonNull(rDto)) {
-                                    str = rDto.get(0).getValue();
-                                    //没有值，赋"/"
-                                    if (StringUtils.isBlank(str)) {
-                                        str = "/";
-                                    }
-                                    son.set(V, str);
-                                    if ("不合格".equals(str)) {
-                                        son.set("fc", "#990000");
-                                    }
-                                }
-                            } else if (v.charAt(0) == '&') {
-                                //结论
-                                String tem = v.replace(STR_THREE, "").toUpperCase();
-                                if (Objects.nonNull(finalTerminalMap)) {
-                                    if ("STATIS_TIME".equals(tem)) {
-                                        //如何时间是大于当前时间则用当前时间
-                                        String localTime = InfluxDbSqlConstant.END_TIME;
-                                        LocalDate localDate = LocalDateTimeUtil.parseDate(reportSearchParam.getEndTime(), DatePattern.NORM_DATE_PATTERN);
-                                        LocalDate nowDate = LocalDate.now();
-                                        if (nowDate.isAfter(localDate)) {
-                                            son.set(V, reportSearchParam.getStartTime() + InfluxDbSqlConstant.START_TIME + "_" + reportSearchParam.getEndTime() + localTime);
-                                        } else {
-                                            localTime = " " + LocalTime.now().format(DatePattern.NORM_TIME_FORMATTER);
-                                            son.set(V, reportSearchParam.getStartTime() + InfluxDbSqlConstant.START_TIME + "_" + nowDate + localTime);
-                                        }
-                                    } else {
-                                        //台账信息
-                                        son.set(V, finalTerminalMap.getOrDefault(tem, "/"));
-                                    }
-                                }
-                            }
-                            //解决数据单位问题 @指标#类型@
-                            if (v.charAt(0) == '@' && v.contains(STR_ONE)) {
-                                String replace = v.replace("@", "");
-                                son.set(V, unit.getOrDefault(replace, "/"));
-
-                            }
-                        }
-                    }
-                });
-            });
-        }
-        //导出自定义报表
-        downReport(jsonArray, response);
-    }
-
-*/
-
-    /**
-     * 解析模板
-     * @author cdf
-     * @date 2023/10/20
-     */
-  /*  private void parseTemplate(JSONArray jsonArray, List<ReportTemplateDTO> reportTemplateDTOList, List<ReportTemplateDTO> reportLimitList, List<ReportTemplateDTO> terminalList) {
-        try {
-            //通过文件服务器获取
-            jsonArray.forEach(item -> {
-                JSONObject jsonObject = (JSONObject) item;
-                JSONArray itemArr = (JSONArray) jsonObject.get(CELL_DATA);
-                itemArr.forEach((it) -> {
-                    if (Objects.nonNull(it) && !"null".equals(it.toString())) {
-                        //获取到1列
-                        JSONObject data = (JSONObject) it;
-                        JSONObject son = (JSONObject) data.get(V);
-                        if (son.containsKey(V)) {
-                            String v = son.getStr(V);
-                            //数据格式：$HA[_25]#B#max#classId$ 或 $HA[_25]#max#classId$
-                            if (v.charAt(0) == '$' && v.contains(STR_ONE)) {
-                                //剔除前后$
-                                v = v.replace(STR_TWO, "");
-                                //封装ReportTemplateDTO
-                                ReportTemplateDTO reportTemplateDTO = new ReportTemplateDTO();
-                                reportTemplateDTO.setItemName(v.toUpperCase());
-                                //根据#分割数据
-                                String[] vItem = v.split(STR_ONE);
-                                if (vItem.length == 5) {
-                                    //$HA[_25]#B#max#classId$
-                                    reportTemplateDTO.setTemplateName(vItem[0].toUpperCase());
-                                    reportTemplateDTO.setPhase(vItem[1].substring(0, 1).toUpperCase());
-                                    reportTemplateDTO.setStatMethod(vItem[2].toUpperCase());
-                                    reportTemplateDTO.setResourceId(vItem[3].toUpperCase());
-                                    reportTemplateDTO.setLimitName(vItem[4].toUpperCase());
-                                } else if (vItem.length == 4) {
-                                    //$HA[_25]#max#classId$
-                                    reportTemplateDTO.setTemplateName(vItem[0].toUpperCase());
-                                    reportTemplateDTO.setPhase("T");
-                                    reportTemplateDTO.setStatMethod(vItem[1].toUpperCase());
-                                    reportTemplateDTO.setResourceId(vItem[2].toUpperCase());
-                                    reportTemplateDTO.setLimitName(vItem[3].toUpperCase());
-                                }
-
-                                reportTemplateDTOList.add(reportTemplateDTO);
-                            } else if (v.charAt(0) == '%' && v.contains(STR_ONE)) {
-                                //封装指标结论ReportTemplateDTO
-                                ReportTemplateDTO reportTemplateDTO = new ReportTemplateDTO();
-                                v = v.replace(STR_FOUR, "");
-                                reportTemplateDTO.setItemName(v.toUpperCase());
-                                //根据#分割数据
-                                String[] vItem = v.split(STR_ONE);
-                                if (vItem.length == 3) {
-                                    reportTemplateDTO.setTemplateName(vItem[0].toUpperCase());
-                                    reportTemplateDTO.setStatMethod(vItem[1].toUpperCase());
-                                    reportTemplateDTO.setResourceId(vItem[2].toUpperCase());
-                                }
-                                reportLimitList.add(reportTemplateDTO);
-                            } else if (v.charAt(0) == '&') {
-                                //封装ReportTemplateDTO
-                                ReportTemplateDTO reportTemplateDTO = new ReportTemplateDTO();
-                                v = v.replace(STR_THREE, "");
-                                reportTemplateDTO.setItemName(v.toUpperCase());
-                                reportTemplateDTO.setTemplateName(v.toUpperCase());
-                                terminalList.add(reportTemplateDTO);
-                            }
-                        }
-                    }
-                });
-            });
-        } catch (Exception e) {
-            throw new BusinessException(HarmonicResponseEnum.CUSTOM_REPORT_JSON);
-        }
-    }
-*/
 
     /**
      * 获取测点限值