From 71d710e252dccfaf35804c5d0e6a3f00dac9be2b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 11 九月 2024 09:30:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 61 +++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 7 deletions(-)
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 d12f4b6..8362c2c 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
@@ -849,16 +849,53 @@
tCharingUserEvaluateVO.setBlackCount(count);
+ //好评标签
+ List<Map<String,Object>> goodTop = orderEvaluateService.goodTop(siteIds);
+ //差评标签
+ List<Map<String,Object>> badTop = orderEvaluateService.badTop(siteIds);
- //标签
- //查出好评ids
-// orderEvaluateService.goodTop();
-
-
-
-
+ //流量分析
+ List<Map<String,Object>> sourceMap = chargingOrderService.countBySource(siteIds);
+ tCharingUserEvaluateVO.setGoodTop(goodTop);
+ tCharingUserEvaluateVO.setBadTop(badTop);
+ tCharingUserEvaluateVO.setFlow(sourceMap);
//流量
return R.ok(tCharingUserEvaluateVO);
+ }
+
+ @ResponseBody
+ @PostMapping(value = "/charging/equipment")
+ @ApiOperation(value = "电站评价", tags = {"管理后台-数据分析-设备运维分析"})
+ public R<TCharingUserEvaluateVO> equipment(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto){
+ List<Integer> siteIds =new ArrayList<>();
+ if (statisticsQueryDto.getSiteId()==null) {
+ Long userId = SecurityUtils.getUserId();
+ //获取当前登录的siteIds
+ List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
+ for (GetSiteListDTO datum : data) {
+ siteIds.add(datum.getId());
+ }
+ }else {
+ siteIds.add(statisticsQueryDto.getSiteId());
+ }
+ //直流可用率
+ List<Map<String,Object>> equipmentMap1 = chargingOrderService.equipmentUserType1(siteIds,statisticsQueryDto);
+ //交流可用率
+ List<Map<String,Object>> equipmentMap2= chargingOrderService.equipmentUserType2(siteIds,statisticsQueryDto);
+ //直流故障率
+ List<Map<String,Object>> equipmentMapbroke1 = chargingOrderService.equipmentMapbroke1(siteIds,statisticsQueryDto);
+ //交流故障率
+ List<Map<String,Object>> equipmentMapbroke2 = chargingOrderService.equipmentMapbroke2(siteIds,statisticsQueryDto);
+ //直流离网率
+ List<Map<String,Object>> equipmentMapOut1 = chargingOrderService.equipmentMapOut1(siteIds,statisticsQueryDto);
+ //交流离网率
+ List<Map<String,Object>> equipmentMapOut2 = chargingOrderService.equipmentMapOut2(siteIds,statisticsQueryDto);
+
+
+ //需求电流满足率
+
+
+
}
public static void main(String[] args) {
@@ -944,4 +981,14 @@
TChargingOrder chargingOrder = chargingOrderService.getChargingOrderByLicensePlate(query);
return R.ok(chargingOrder);
}
+ /**
+ * 修改充电订单
+ * @param chargingOrder
+ * @return
+ */
+ @PostMapping("/updateChargingOrder")
+ public R<String> updateChargingOrder(@RequestBody TChargingOrder chargingOrder){
+ chargingOrderService.updateById(chargingOrder);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1