diff --git a/user-service/src/main/java/com/mh/user/constants/Constant.java b/user-service/src/main/java/com/mh/user/constants/Constant.java index a0abce5..d05e5f6 100644 --- a/user-service/src/main/java/com/mh/user/constants/Constant.java +++ b/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 String MOMENT_COOLING = "0014"; + public static String MOMENT_COOLING = "0020"; // 进水温度值 public static String INT_TEMP = "0073"; diff --git a/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java index 4415d42..9f0d7d2 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java @@ -319,7 +319,7 @@ public class DataResultServiceImpl implements DataResultService { try { Date date1 = sdf.parse(o1.getTime()); Date date2 = sdf.parse(o2.getTime()); - return date1.compareTo(date2); + return date2.compareTo(date1); } catch (ParseException e) { throw new IllegalArgumentException("Invalid date format", e); }