From 02f902272200e3cd531b496a8757360bbe74bb40 Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 27 Nov 2024 14:22:04 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AE=9E=E6=97=B6=E8=83=BD=E6=95=88?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0=E5=86=B7=E5=86=BB=E6=B0=B4?= =?UTF-8?q?=E8=BF=9B=E5=87=BA=E6=B0=B4=E6=B8=A9=E5=BA=A6=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- user-service/src/main/java/com/mh/user/constants/Constant.java | 2 +- .../java/com/mh/user/service/impl/DataResultServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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); }