From 7c85579c86b68abdbeee9ab05ba98dc7678383ed Mon Sep 17 00:00:00 2001 From: ZZ Date: Mon, 23 Aug 2021 19:16:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=81=8F=E7=A7=BB=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java | 4 +--- .../java/com/xhpc/pp/utils/security/CacheDataUtils.java | 6 +++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java index f38400b5..82cdd725 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java @@ -127,9 +127,7 @@ public class RealtimeDataLogic implements ServiceLogic { return new ServiceResult(false); } - - - private CacheRealtimeData translate(RealtimeData realtimeData) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, NoSuchFieldException, InstantiationException { + private CacheRealtimeData translate(RealtimeData realtimeData) throws InvocationTargetException, IllegalAccessException, InstantiationException { Class crdclz = CacheRealtimeData.class; Class rdclz = RealtimeData.class; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CacheDataUtils.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CacheDataUtils.java index 1ba85013..d8138bf0 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CacheDataUtils.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CacheDataUtils.java @@ -24,7 +24,11 @@ public class CacheDataUtils { Object tarval; if (tarfield.getType().getSimpleName().equals("Integer")) { if (srcval.length() == 2) { - tarval = Integer.parseInt(srcval, 16); + tarval = Integer.valueOf(srcval, 16); + if (tarfield.getName().endsWith("Temperature")) { + tarval = (Integer) tarval - 50; + tarval = (Integer) tarval > 0 ? tarval : 0; + } } else { tarval = HexUtils.reverseHexInt(srcval); }