Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码优化

Browse Source
This commit is contained in:
xy
2024-12-20 15:08:55 +08:00
parent 2191276185
commit b93faee241
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
View File

@@ -336,8 +336,14 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
double re = 0; double re = 0;
if (Objects.equals("Primary",commonStatisticalQueryParam.getDataLevel())) { if (Objects.equals("Primary",commonStatisticalQueryParam.getDataLevel())) {
if (Objects.equals("Primary",csDataSet.getDataLevel())) { if (Objects.equals("Primary",csDataSet.getDataLevel())) {
vo.setStatisticalData(Double.valueOf(df.format(temp.getValue()))); if (HarmonicConstant.POWER_LIST.contains(epdPqd.getShowName())) {
unit = epdPqd.getUnit(); re = Objects.isNull(temp.getValue()) ? 3.14159 : temp.getValue() / 1000;
vo.setStatisticalData(Double.valueOf(df.format(re)));
unit = "k" + epdPqd.getUnit();
} else {
vo.setStatisticalData(Objects.isNull(temp.getValue()) ? 3.14159 : Double.parseDouble(df.format(temp.getValue())));
unit = epdPqd.getUnit();
}
} else { } else {
if(Objects.nonNull(epdPqd.getPrimaryFormula())){ if(Objects.nonNull(epdPqd.getPrimaryFormula())){
switch (epdPqd.getPrimaryFormula()) { switch (epdPqd.getPrimaryFormula()) {

10
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java
View File

@@ -219,8 +219,14 @@ public class DataServiceImpl implements IDataService {
vo.setSort(item2.getSort()); vo.setSort(item2.getSort());
if (Objects.equals("Primary",dataLevel)) { if (Objects.equals("Primary",dataLevel)) {
if (Objects.equals("Primary",csDataSetLevel)) { if (Objects.equals("Primary",csDataSetLevel)) {
vo.setAvgValue(Objects.isNull(statisticalDataDTO) ? 3.14159 : Double.parseDouble(df.format(statisticalDataDTO.getValue()))); if (HarmonicConstant.POWER_LIST.contains(item2.getShowName())) {
unit = item2.getUnit(); re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() / 1000;
vo.setAvgValue(Double.valueOf(df.format(re)));
unit = "k" + item2.getUnit();
} else {
vo.setAvgValue(Objects.isNull(statisticalDataDTO) ? 3.14159 : Double.parseDouble(df.format(statisticalDataDTO.getValue())));
unit = item2.getUnit();
}
} else { } else {
if(Objects.nonNull(item2.getPrimaryFormula())){ if(Objects.nonNull(item2.getPrimaryFormula())){
switch (item2.getPrimaryFormula()) { switch (item2.getPrimaryFormula()) {