调整终端运行部分代码

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

@@ -264,7 +264,7 @@ public class AnalyWave {
                                 break;
                             case 1:// 总点数 //这里的strTemp是一个偏移量
                                 OneRate.nSampleNum = (long) (Float.parseFloat(strTempArray[j]) - nOffset);
-                                nOffset = OneRate.nSampleNum;
+                                nOffset += OneRate.nSampleNum;
                                 break;
                         }
                     }

pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/GovernSchemeCalcServiceImpl.java

@@ -73,6 +73,7 @@ public class GovernSchemeCalcServiceImpl implements IGovernSchemeCalcService {
             throw new BusinessException(AdvanceResponseEnum.INCOMING_LINE_DATA_MISS);
         }
         sgGovernSchemeHistoryAllVO.setInComingLineName(sgIncomingLine.getName());
+        sgGovernSchemeHistoryAllVO.getQuick().setIncomingLineId(sgIncomingLine.getName());
         //时间内的电网接入水平（暂降次数）
         String startTime = sgGovernSchemeHistoryParam.getStartTime();
         String endTime = sgGovernSchemeHistoryParam.getEndTime();

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

@@ -432,7 +432,7 @@ public class WaveFileComponent {
                 rateDTO.setNOneSample(result);
                 // 总点数 //这里的strTemp是一个偏移量
                 rateDTO.setNSampleNum((Integer.parseInt(strTempArray[1]) - nOffset));
-                nOffset = rateDTO.getNSampleNum();
+                nOffset += rateDTO.getNSampleNum();
                 lstRate.add(rateDTO);
             }
             comtradeCfgDTO.setLstRate(lstRate);
@@ -497,7 +497,7 @@ public class WaveFileComponent {
             int nDigSize = (comtradeCfgDTO.getNDigitalNum() % 16) > 0 ? (comtradeCfgDTO.getNDigitalNum() / 16 + 1) * 2 : comtradeCfgDTO.getNDigitalNum() / 16 * 2;
             int nBlockSize = 2 * Integer.SIZE / 8 + comtradeCfgDTO.getNAnalogNum() * 2 + nDigSize;
             // 总长度除以每个块的大小
-            int nBlockNum = datArray.length / nBlockSize;
+            int nBlockNum = (int)Math.floor(datArray.length / nBlockSize);
 
             // 获取采样率
             int finalSampleRate = getFinalWaveSample(comtradeCfgDTO.getLstRate(), iType);
@@ -612,6 +612,9 @@ public class WaveFileComponent {
                                         }
                                         float fCoef = comtradeCfgDTO.getLstAnalogDTO().get(j).getFCoefficent();
 
+                                        if((i * nBlockSize + 2 * 4 + j * 2) == 2437568){
+                                            System.out.println(55);
+                                        }
                                         fValue = BitConverter.byte2ToUnsignedShort(datArray, i * nBlockSize + 2 * 4 + j * 2) * fCoef;
                                         //WW 2019-11-14
                                         /*************************
@@ -767,6 +770,7 @@ public class WaveFileComponent {
                 }
             }
         } catch (Exception e) {
+            e.printStackTrace();
             throw new BusinessException(WaveFileResponseEnum.DAT_DATA_ERROR);
         }
 

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

@@ -95,7 +95,7 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService {
         DeviceRunEvaluateVO.Info evaluateVO;
         for (GeneralDeviceDTO deptDeviceInfo : deptDeviceInfos) {
             List<String> lineIndexes = deptDeviceInfo.getLineIndexes();
-            List<String> devIndexes = deptDeviceInfo.getLineIndexes();
+            List<String> devIndexes = deptDeviceInfo.getDeviceIndexes();
             if (CollUtil.isNotEmpty(lineIndexes)) {
                 evaluateVO = new DeviceRunEvaluateVO.Info();
                 evaluateVO.setName(deptDeviceInfo.getName());

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

@@ -56,7 +56,7 @@ public class QualifiedReportController extends BaseController {
         TimeInterval timeInterval = new TimeInterval();
         String searchValue = qualifiedReportParam.getSearchValue();
         Pattern pattern = Pattern.compile(PatternRegex.SPECIAL_REGEX);
-        if(!pattern.matcher(searchValue).find()){
+        if(pattern.matcher(searchValue).find()){
             throw new BusinessException(ValidMessage.SPECIAL_REGEX);
         }
         String methodDescribe = getMethodDescribe("pageTable");