ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2025-03-14 16:31:20 +08:00
parent 751dc56568
commit ff53c91279
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java
View File

@@ -1145,15 +1145,15 @@ public class DetectionServiceImpl {
if (devData - channelData != 0) { if (devData - channelData != 0) {
switch (errorValueType) { switch (errorValueType) {
case 2: case 2:
//下发的谐波电压幅值，返回的是谐波电压含有率，拿（含有率值*基波 - 源下发对应谐波值幅值）/下发的幅值 //下发的谐波电压幅值，返回的是谐波电压含有率，拿（含有率值*基波 - 源下发对应谐波值幅值）/下发的幅值 注：相对值-1型。
return BigDecimal.valueOf(devData - channelData) return BigDecimal.valueOf(devData - channelData)
.divide(BigDecimal.valueOf(channelData), 4, RoundingMode.HALF_UP); .divide(BigDecimal.valueOf(channelData), 4, RoundingMode.HALF_UP);
case 3: case 3:
//下发的谐波电压幅值，返回的是谐波电压含有率，拿（含有率值*基波 - 源下发对应谐波值幅值）/装置返回值 //下发的谐波电压幅值，返回的是谐波电压含有率，拿（含有率值*基波 - 源下发对应谐波值幅值）/装置返回值 注：相对值-2型。
return BigDecimal.valueOf(devData - channelData) return BigDecimal.valueOf(devData - channelData)
.divide(BigDecimal.valueOf(devData), 4, RoundingMode.HALF_UP); .divide(BigDecimal.valueOf(devData), 4, RoundingMode.HALF_UP);
} }
return BigDecimal.valueOf(devData - channelData); return BigDecimal.valueOf(devData).subtract(BigDecimal.valueOf(channelData));
} }
return BigDecimal.valueOf(0); return BigDecimal.valueOf(0);
} }

1
detection/src/main/java/com/njcn/gather/result/pojo/vo/RawDataExcel.java
View File

@@ -1,7 +1,6 @@
package com.njcn.gather.result.pojo.vo; package com.njcn.gather.result.pojo.vo;
import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.annotation.Excel;
import com.njcn.gather.device.pojo.vo.PqDevExcel;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;