Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.审计管理

Browse Source 
2.谐波检测bug修改
This commit is contained in:
wr
2023-05-19 16:20:57 +08:00
parent 6b7dfdb6f7
commit 373fe16ee1
18 changed files with 528 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,11 +143,19 @@ public class HistoryResultServiceImpl implements HistoryResultService {
Date d = formatter.parse(objectList.get(0).toString());
time.add(d);
fValue.add(BigDecimal.valueOf(Float.parseFloat(objectList.get(1).toString())).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue());
if (Integer.parseInt(contion) == 14) {
bValue.add(BigDecimal.valueOf(Float.parseFloat(objectList.get(2).toString())).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue());
cValue.add(BigDecimal.valueOf(Float.parseFloat(objectList.get(3).toString())).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue());
}
}
for (int i = 0; i < time.size(); i++) {
List<Object> objects = new ArrayList<>();
objects.add(time.get(i));
objects.add(fValue.get(i));
if (Integer.parseInt(contion) == 14) {
objects.add(bValue.get(i));
objects.add(cValue.get(i));
}
objectListData.add(objects);
}
historyDataResultVO.setTopLimit(queryResultLimitVO.getTopLimit());
@@ -291,7 +299,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
break;
case 14:
//电压不平衡
sql = "SELECT time as time, v_zero as aValue FROM data_v WHERE " + stringBuilder.toString() +
sql = "SELECT time as time, v_zero as aValue, v_pos as bValue, v_neg as cValue FROM data_v WHERE " + stringBuilder.toString() +
" and (phasic_type ='T') group by phasic_type order by time asc tz('Asia/Shanghai');";
phasicType.add("零序电压");
phasicType.add("正序电压");