1.解决监测点实际安装位置

2.解决稳态合格率统计表和图形数据问题
This commit is contained in:
wr
2025-05-06 16:04:06 +08:00
parent 8e5cab30c9
commit df1f744a7d
4 changed files with 176 additions and 358 deletions

View File

@@ -1,5 +1,6 @@
package com.njcn.harmonic.utils;
import cn.hutool.core.util.ObjectUtil;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
@@ -87,8 +88,11 @@ public class PubUtils {
}
}
public static Double dataLimits(Double data){
return data>100?100:data;
public static Double dataLimits(Double data) {
if (ObjectUtil.isNotNull(data)) {
return data > 100 ? 100 : data;
}
return data;
}
@SneakyThrows
@@ -190,7 +194,7 @@ public class PubUtils {
}
@SneakyThrows
public static List<String> getIntervalDateTime(Integer startTime,int beginDay, Integer endTime, Integer dd) {
public static List<String> getIntervalDateTime(Integer startTime, int beginDay, Integer endTime, Integer dd) {
List<String> list = new ArrayList<>();
Calendar calendar = Calendar.getInstance(Locale.CHINA);
calendar.set(startTime, endTime - 1, 1);