Browse Source

1、实时能效数据增加冷冻水进出水温度;

dev
mh 7 months ago
parent
commit
02f9022722
  1. 2
      user-service/src/main/java/com/mh/user/constants/Constant.java
  2. 2
      user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java

2
user-service/src/main/java/com/mh/user/constants/Constant.java

@ -28,7 +28,7 @@ public class Constant {
public static float CARBON_EMISSION_FACTOR = 0.6379f; public static float CARBON_EMISSION_FACTOR = 0.6379f;
// 瞬时产冷量 // 瞬时产冷量
public static String MOMENT_COOLING = "0014"; public static String MOMENT_COOLING = "0020";
// 进水温度值 // 进水温度值
public static String INT_TEMP = "0073"; public static String INT_TEMP = "0073";

2
user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java

@ -319,7 +319,7 @@ public class DataResultServiceImpl implements DataResultService {
try { try {
Date date1 = sdf.parse(o1.getTime()); Date date1 = sdf.parse(o1.getTime());
Date date2 = sdf.parse(o2.getTime()); Date date2 = sdf.parse(o2.getTime());
return date1.compareTo(date2); return date2.compareTo(date1);
} catch (ParseException e) { } catch (ParseException e) {
throw new IllegalArgumentException("Invalid date format", e); throw new IllegalArgumentException("Invalid date format", e);
} }

Loading…
Cancel
Save