diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/CacheOrderData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/CacheOrderData.java index cd189b37..5bb89dc7 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/CacheOrderData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/CacheOrderData.java @@ -41,7 +41,7 @@ public class CacheOrderData extends BaseData { private Integer status;//1自动结算,2异常 public CacheOrderData() { - + super(); } public CacheOrderData(CacheRealtimeData cacheRData, String startTime, Integer startSoc, Integer endSoc) { diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java index f279e7c5..44ca9d91 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java @@ -160,20 +160,21 @@ public class ChargingController { // r = R.fail("错误的订单号"); // } 算了容易坑 String gunStatus = REDIS.getCacheMapValue(gunkey, "status"); - if (!("空闲".equals(gunStatus) || "离线".equals(gunStatus) || "故障".equals(gunStatus))) { - if (r.getCode() == 200) { - String svcSrv = cachePile.get("svcSrv"); - String response = HttpUtils.get(fmt(svcSrv) - .concat("/native/charging/stop/") - .concat(pileNo).concat("/") - .concat(connectorId).concat("/") - .concat(version)); - r = getRR(response); - } - } else { - log.error("端口不在充电中, status[{}]", status); - r = R.fail("端口不在充电中"); + if (("空闲".equals(gunStatus) || "离线".equals(gunStatus) || "故障".equals(gunStatus))) { + log.error("端口不在充电中, status[{}]", gunStatus); } + if (r.getCode() == 200) { + String svcSrv = cachePile.get("svcSrv"); + String response = HttpUtils.get(fmt(svcSrv) + .concat("/native/charging/stop/") + .concat(pileNo).concat("/") + .concat(connectorId).concat("/") + .concat(version)); + r = getRR(response); + } +// } else { +// r = R.fail("端口不在充电中"); +// } return r; } 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 7d398dc5..0a478cca 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 @@ -143,7 +143,7 @@ public class RealtimeDataLogic implements ServiceLogic { cacheOrder.put("realtimeDataList", realtimeDataList); pileOrderService.pileRimeOrder(orderNo); Integer vul = (Integer) cachePile.get("voltageUpperLimits"); - Integer cul = (Integer) cachePile.get("current"); + Integer cul = (Integer) cachePile.get("currentLimit"); if (wc > cul || wv > vul) { R r = chargingController.nativeStopCharging(pileNo, gunId, default_version); if (r.getCode() == 200) { 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 0d6457a5..97b5e6b9 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 @@ -3,6 +3,7 @@ package com.xhpc.pp.utils.security; import cn.hutool.core.date.DateUtil; import com.xhpc.pp.utils.HexUtils; +import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.util.concurrent.TimeUnit; @@ -16,30 +17,36 @@ public class CacheDataUtils { public static Object reflectTranslate(Object srcobj, Class tarclz, Class srcclz, Field[] targetfields) throws IllegalAccessException, InvocationTargetException, InstantiationException { - Object tarobj = tarclz.getConstructors()[0].newInstance(); - for (Field tarfield : targetfields) { - String tarFieldName = tarfield.getName(); - String srcval = null; - try { - srcval = (String) srcclz.getMethod("get".concat(capitalize(tarFieldName))).invoke(srcobj); - Object tarval; - if (tarfield.getType().getSimpleName().equals("Integer") && !tarfield.getName().equals("stopReason")) { - if (srcval.length() == 2) { - tarval = Integer.valueOf(srcval, 16); - if (tarfield.getName().endsWith("Temperature")) { - tarval = (Integer) tarval - 50; - tarval = (Integer) tarval > 0 ? tarval : 0; + Constructor[] constructors = tarclz.getConstructors(); + Object tarobj = null; + for (Constructor c : constructors) { + if (c.getParameters().length == 0) { + tarobj = constructors[0].newInstance(); + for (Field tarfield : targetfields) { + String tarFieldName = tarfield.getName(); + String srcval = null; + try { + srcval = (String) srcclz.getMethod("get".concat(capitalize(tarFieldName))).invoke(srcobj); + Object tarval; + if (tarfield.getType().getSimpleName().equals("Integer") && !tarfield.getName().equals("stopReason")) { + if (srcval.length() == 2) { + 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); + } + } else if (tarFieldName.contains("ime")) { + tarval = DateUtil.format(cp56toDate(srcval), NORM_DATETIME_FORMAT); + } else { + tarval = srcval; } - } else { - tarval = HexUtils.reverseHexInt(srcval); + tarclz.getMethod("set".concat(capitalize(tarFieldName)), tarfield.getType()).invoke(tarobj, tarval); + } catch (NoSuchMethodException ignored) { } - } else if (tarFieldName.contains("ime")) { - tarval = DateUtil.format(cp56toDate(srcval), NORM_DATETIME_FORMAT); - } else { - tarval = srcval; } - tarclz.getMethod("set".concat(capitalize(tarFieldName)), tarfield.getType()).invoke(tarobj, tarval); - } catch (NoSuchMethodException ignored) { } } return tarobj; diff --git a/xhpc-modules/xhpc-power-pile/src/main/resources/logback.xml b/xhpc-modules/xhpc-power-pile/src/main/resources/logback.xml index 745e4aba..e8528088 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/resources/logback.xml +++ b/xhpc-modules/xhpc-power-pile/src/main/resources/logback.xml @@ -59,7 +59,7 @@ - +