diff --git a/pqs-common/common-event/src/main/java/com/njcn/event/file/component/WaveFileComponent.java b/pqs-common/common-event/src/main/java/com/njcn/event/file/component/WaveFileComponent.java index c876b8f49..ada6c1390 100644 --- a/pqs-common/common-event/src/main/java/com/njcn/event/file/component/WaveFileComponent.java +++ b/pqs-common/common-event/src/main/java/com/njcn/event/file/component/WaveFileComponent.java @@ -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); }