From e26004fd172c33e70346c97a050af69ca0f53b03 Mon Sep 17 00:00:00 2001 From: zz Date: Fri, 19 Nov 2021 16:31:11 +0800 Subject: [PATCH] =?UTF-8?q?todo:=20=E4=BC=98=E5=8C=96=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/evcs/api/QueryTokenController.java | 2 +- .../com/xhpc/pp/logic/OrderDataLogic.java | 2 +- .../com/xhpc/pp/logic/RealtimeDataLogic.java | 21 +++++++++++-------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryTokenController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryTokenController.java index a706425e..30c6d1f3 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryTokenController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryTokenController.java @@ -52,7 +52,7 @@ public class QueryTokenController { tokenResponse.setOperatorId("MA6DFCTD5"); tokenResponse.setSuccStat(0); tokenResponse.setFailReason(0); - String data = null; + String data = null; //todo 优化OperatorIdEvcs like XhpcInternetUser xhpcInternetUser = xhpcInternetUserRepository.findByOperatorIdEvcsAndCooperationStartTimeBeforeAndCooperationEndTimeAfter(tokenRequest.getOperatorId(), Instant.now(), Instant.now()); if (xhpcInternetUser != null) { diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java index 3dcb98c4..c276b8a1 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java @@ -68,7 +68,7 @@ public class OrderDataLogic implements ServiceLogic { String resultStr = "6815".concat(req.get("seqhex").toString()).concat("0040").concat(orderNo).concat(ServiceResult.HEX_00); resultStr = resultStr.concat(CRCCalculator.calcCrc(resultStr)); - final R r = pileOrderService.pileEndOrder(orderNo); + final R r = pileOrderService.pileEndOrder(orderNo); //todo 优化 通知第三方 if (r.getCode() == 200) return new ServiceResult(HexUtils.toBytes(resultStr), ServiceResult.OK); else 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 ad570d5e..ded0f7d2 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 @@ -23,7 +23,10 @@ import org.springframework.stereotype.Component; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static cn.hutool.core.util.NumberUtil.isInteger; import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; @@ -187,12 +190,12 @@ public class RealtimeDataLogic implements ServiceLogic { R r = null; final String stopResult = (String) cacheOrder.get("stopResult"); if (cacheRData == null) { - r = pileOrderService.abnormalOrder(orderNo); + r = pileOrderService.abnormalOrder(orderNo); //todo 优化 通知第三方 } else if ("01".equals(stopResult)) { CacheOrderData lordAsOd = new CacheOrderData(cacheRData, (String) cacheOrder.get("orderstarttime"), (Integer) cacheOrder.get("startSoc"), (Integer) cacheOrder.get("stopSoc")); cacheOrder.put("orderData", lordAsOd); - r = pileOrderService.pileEndOrder(orderNo); + r = pileOrderService.pileEndOrder(orderNo); //todo 优化 通知第三方 REDIS.setCacheMap(orderkey, cacheOrder); } if (r == null || r.getCode() != 200) { @@ -217,16 +220,16 @@ public class RealtimeDataLogic implements ServiceLogic { Object orderData = problematicOrder.get("orderData"); String status = (String) problematicOrder.get("status"); if (!isInteger(status) && !status.equals("充电中") && orderData == null) { - pileOrderService.abnormalOrder(orderNo); + pileOrderService.abnormalOrder(orderNo); //todo 优化 通知第三方 log.error("abnormal.2 order[{}]", orderNo); cacheGun.put("orderkey", null); idleCnt = 0; } - } else { - Collection cacheOrderKyes = REDIS.keys("order:".concat(terminalId).concat("*")); - for (String cacheOrderKye : cacheOrderKyes) { - - } +// } else { +// Collection cacheOrderKyes = REDIS.keys("order:".concat(terminalId).concat("*")); +// for (String cacheOrderKye : cacheOrderKyes) { //todo ??? +// +// } } } cacheGun.put("idleCnt", idleCnt);