From 38174984b14eef78fb933e7948a711e8e468220d Mon Sep 17 00:00:00 2001 From: ZZ Date: Fri, 29 Oct 2021 11:23:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E4=BA=86=E4=B8=80=E4=B8=AANPE?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8=E5=88=A4=E6=96=AD?= =?UTF-8?q?,=E5=B0=91=E4=BA=86=E5=87=A0=E8=A1=8C=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QueryEquipBusinessPolicyController.java | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipBusinessPolicyController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipBusinessPolicyController.java index dbeee3a1..f17efe65 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipBusinessPolicyController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipBusinessPolicyController.java @@ -31,26 +31,18 @@ public class QueryEquipBusinessPolicyController { EquipBizRequest equipBizRequest = JSONUtil.readParams(commonRequest.getData(), EquipBizRequest.class); String connectorId = equipBizRequest.getConnectorId(); //获取枪所对应的桩编码 - String bySerialNumber = xhpcTerminalRepository.selectBySql(connectorId); - String pileSerialNumber = bySerialNumber; - - //找不到对应的桩编码，说明充电设备接口编码有误 - if (pileSerialNumber == null) { + String pileSerialNumber = xhpcTerminalRepository.selectBySql(connectorId); + Map cachePile = REDIS.getCacheMap("pile:" + pileSerialNumber); + if (pileSerialNumber == null || cachePile == null) { CommonResponse commonResponse = new CommonResponse(); - commonResponse.setMsg("error connectorId"); + commonResponse.setMsg("ConnectorID not found"); commonResponse.setRet("1"); - commonResponse.setData(null); return commonResponse; } - //通过桩编码，进入redis，找到其所用的费率模型id - Map cacheMap = REDIS.getCacheMap("pile:" + pileSerialNumber); - - Long rateModelId = (Long) cacheMap.get("rateModelId"); - //通过指定费率模型id，找到其对应的费率模型 + Long rateModelId = (Long) cachePile.get("rateModelId"); CacheRateModel rateModel = REDIS.getCacheObject("rateModel:" + rateModelId); String[] tfPricesSeq = rateModel.getTfPricesSeq(); - //遍历获取每一个时段 //存储时段 ArrayList modelTypes = new ArrayList<>(); //存储时段个数 @@ -61,6 +53,7 @@ public class QueryEquipBusinessPolicyController { int count = 0; //最后一个时段的前一个时段的下标索引 int index = 0; + //遍历获取每一个时段 for (int i = 0; i < tfPricesSeq.length - 1; i++) { count++; //如果当前时段与后面的时段不相同，则表示当前时段已经结束，添加当前时段到list中,并将其坐标存放到另一个集合中。