From 2ea58df947a8fad75b81911a355bbce80f7f23df Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 21 十月 2024 13:50:06 +0800
Subject: [PATCH] bug修改

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java          |    2 +-
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java            |   14 ++++++++------
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java |    4 ++--
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java             |    1 -
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
index 1d083c1..1c1442d 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
@@ -252,10 +252,10 @@
         TChargingGun chargingGun = chargingGunService.getById(id);
         siteNameVO.setGunName(chargingGun.getName());
         siteNameVO.setGunNumber(chargingGun.getCode());
-        TChargingPile chargingPile = chargingPileService.getById(id);
+        TChargingPile chargingPile = chargingPileService.getById(chargingGun.getChargingPileId());
         siteNameVO.setPileName(chargingPile.getName());
         siteNameVO.setPileNumber(chargingPile.getNumber());
-        Site site = siteService.getById(id);
+        Site site = siteService.getById(chargingGun.getSiteId());
         siteNameVO.setSiteName(site.getName());
         return R.ok(siteNameVO);
     }
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index d010b53..c45017b 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -814,7 +814,6 @@
         }
         List<TChargingOrder> list = chargingOrderService.lambdaQuery().ge(TChargingOrder::getStartTime, start).le(TChargingOrder::getEndTime, end).in(TChargingOrder::getSiteId, siteIds).list();
         List<Long> chargingOrderIds = list.stream().map(TChargingOrder::getId).collect(Collectors.toList());
-        chargingOrderIds.add(-1l);
         //上方饼图
          List<Map<String,Object>> maps =   chargingOrderService.getSumByType(chargingOrderIds);
 
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index cc24259..e149b4e 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1427,7 +1427,7 @@
 			// 获取开始SOC 结束soc
 			if (chargingOrderListVO.getCode()!=null){
 				List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrderListVO.getCode()).getData();
-				if (!data6.isEmpty()){
+			if (data6!=null && !data6.isEmpty()){
 					// 第一条数据soc为开始 最后一条数据soc为结束soc
 					chargingOrderListVO.setStartSoc(data6.get(0).getSoc().toString());
 					chargingOrderListVO.setEndSoc(data6.get(data6.size()-1).getSoc().toString());
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
index 5273411..544e9ff 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
@@ -63,12 +63,14 @@
                 if(Objects.nonNull(tChargingOrder)){
                     item.setChargingOrder(tChargingOrder);
                     SiteNameVO siteNameVO = chargingGunClient.getAllInfoById(tChargingOrder.getChargingGunId()).getData();
-                    item.setGunName(siteNameVO.getGunName());
-                    item.setGunNumber(siteNameVO.getGunNumber());
-                    item.setPileName(siteNameVO.getPileName());
-                    item.setPileNumber(siteNameVO.getPileNumber());
-                    item.setSiteName(siteNameVO.getSiteName());
-                    item.setEndMode(tChargingOrder.getEndMode());
+                    if(Objects.nonNull(siteNameVO)){
+                        item.setGunName(siteNameVO.getGunName());
+                        item.setGunNumber(siteNameVO.getGunNumber());
+                        item.setPileName(siteNameVO.getPileName());
+                        item.setPileNumber(siteNameVO.getPileNumber());
+                        item.setSiteName(siteNameVO.getSiteName());
+                        item.setEndMode(tChargingOrder.getEndMode());
+                    }
                 }
             }else if (item.getOrderType() == 2) {
                 TShoppingOrder tShoppingOrder = shoppingOrders.stream().filter(shoppingOrder -> shoppingOrder.getId().equals(item.getOrderId())).findFirst().orElse(null);

--
Gitblit v1.7.1