From dcc3e09be0ab15def087340ba09928f209c8ff6a Mon Sep 17 00:00:00 2001 From: yuyang Date: Fri, 26 Aug 2022 15:01:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E6=97=B6=E9=97=B4=E5=80=92=E5=8F=99=E3=80=81=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E8=AE=A2=E5=8D=95=E7=BB=93=E7=AE=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/XhpcChargingStationMapper.xml | 1 + .../xhpc/order/mapper/XhpcRealTimeOrderMapper.java | 4 ++++ .../service/impl/XhpcRealTimeOrderServiceImpl.java | 9 ++++++++- .../service/impl/XhpcStatisticsServiceImpl.java | 13 ++++++++++++- .../resources/mapper/XhpcHistoryOrderMapper.xml | 2 +- .../resources/mapper/XhpcRealTimeOrderMapper.xml | 7 +++++++ 6 files changed, 33 insertions(+), 3 deletions(-) diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcChargingStationMapper.xml index 1a192dd0..668e58b3 100644 --- a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -566,6 +566,7 @@ and find_in_set(tenant_id, #{tenantIdsStr}) order by create_time desc + LIMIT 50 \ No newline at end of file diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcRealTimeOrderMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcRealTimeOrderMapper.java index 409cd57e..85cf5999 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcRealTimeOrderMapper.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcRealTimeOrderMapper.java @@ -73,6 +73,10 @@ public interface XhpcRealTimeOrderMapper { */ Map getMessage(@Param("realTimeOrderId")Long realTimeOrderId); + /** + * 获取场站信息 + */ + Map getXhpcChargingStationById(Long chargingStationId); /** * 异常订单详情接口(PC端) * @param chargeOrderId diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java index 2f7c3a5b..e4d80b5d 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java @@ -182,7 +182,10 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe } //获取开始充电时间、结束时间、计费模型、充电度数、已充金额 XhpcChargeOrder chargeOrder = xhpcChargeOrderService.getChargingOrderId(Long.parseLong(message.get("chargeOrderId").toString())); - + if(chargeOrder.getRateModelId()==null || "".equals(chargeOrder.getRateModelId())){ + Map xhpcChargingStationMap = xhpcRealTimeOrderMapper.getXhpcChargingStationById(chargeOrder.getChargingStationId()); + chargeOrder.setRateModelId(Long.valueOf(xhpcChargingStationMap.get("rateModelId").toString())); + } //获取该订单最后一条实时数据 Map cacheMap = redisService.getCacheMap("order:" + chargeOrder.getSerialNumber()); List list = (List) cacheMap.get("realtimeDataList"); @@ -334,6 +337,10 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder); return AjaxResult.success(); } + if(xhpcChargeOrder.getRateModelId()==null || "".equals(xhpcChargeOrder.getRateModelId())){ + Map xhpcChargingStationMap = xhpcRealTimeOrderMapper.getXhpcChargingStationById(xhpcChargeOrder.getChargingStationId()); + xhpcChargeOrder.setRateModelId(Long.valueOf(xhpcChargingStationMap.get("rateModelId").toString())); + } //总金额 BigDecimal money = powerPrice.add(servicePrice); //总服务费 servicePrice diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java index eb0149ec..05cc47c5 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java @@ -1291,6 +1291,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati int freeTime =0;//空闲 int charge =0;//充电 int unknown =0;//未知 + int insertGun =0;//已插枪 if(terminal !=null && terminal.size()>0){ for (String st:terminal) { Map cacheMap = redisService.getCacheMap("gun:" + st); @@ -1303,7 +1304,11 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati fault++; }else if(cacheMap.containsKey("status") && "空闲".equals(cacheMap.get("status").toString())){ - freeTime++; + if("是".equals(cacheMap.get("vehicleGunStatus").toString())){ + insertGun++; + }else{ + freeTime++; + } }else{ charge++; } @@ -1347,6 +1352,12 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati mapList4.add(objectMap4); mapList.addAll(mapList4); + List> mapList5 =new ArrayList<>(); + Map objectMap5 =new HashMap<>(); + objectMap5.put("name","已插枪"); + objectMap5.put("value",insertGun); + mapList5.add(objectMap5); + mapList.addAll(mapList5); return mapList; } diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml index b4e0504e..18af0925 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -1162,7 +1162,7 @@ and ho.total_price >=0 - order by ho.create_time desc + order by ho.end_time desc + +