From 8c4bbe846095733960c17905746bc40882a50f88 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 12 十二月 2024 16:40:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 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 b048a6b..b71a9d6 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
@@ -659,7 +659,7 @@
     @GetMapping(value = "/six/charge")
     @ApiOperation(value = "电站收入分析", tags = {"后台-数据分析-平台收入分析"})
     public R<List<SixChargingDto>> charge(Integer siteId) {
-        Long userId = SecurityUtils.getUserId();
+        Long userId = tokenService.getLoginUser().getUserid();
         //如果没传siteId,获取当前登陆人所有的siteIds
         List<Integer> siteIds = new ArrayList<>();
         if (siteId==null){
@@ -669,6 +669,9 @@
             }
         }else {
             siteIds.add(siteId);
+        }
+        if (siteIds.isEmpty()){
+            siteIds.add(-1);
         }
         LocalDate sixBefore = PreviousSixMonths.get();
         //通过siteIds进行sql查询统计
@@ -709,7 +712,7 @@
     @GetMapping(value = "/six/circle")
     @ApiOperation(value = "电站收入占比", tags = {"后台-数据分析-平台收入分析"})
     public R<List<SixCircleDto>> circle() {
-        Long userId = SecurityUtils.getUserId();
+        Long userId = tokenService.getLoginUser().getUserid();
         //获取当前登录的siteIds
         List<Integer> siteIds = new ArrayList<>();
             List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
@@ -915,7 +918,7 @@
     public R<TCharingOrderMapVO> watchChargingOrder(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto){
         List<Integer> siteIds =new ArrayList<>();
         if (statisticsQueryDto.getSiteId()==null) {
-            Long userId = SecurityUtils.getUserId();
+            Long userId = tokenService.getLoginUser().getUserid();
             //获取当前登录的siteIds
             List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
             for (GetSiteListDTO datum : data) {
@@ -1147,7 +1150,7 @@
     public R<TCharingOrderPowerMapVO> power(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto) {
         List<Integer> siteIds = new ArrayList<>();
         if (statisticsQueryDto.getSiteId() == null) {
-            Long userId = SecurityUtils.getUserId();
+            Long userId = tokenService.getLoginUser().getUserid();
             //获取当前登录的siteIds
             List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
             for (GetSiteListDTO datum : data) {
@@ -1352,7 +1355,7 @@
     public R<TCharingUserEvaluateVO> sites(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto){
         List<Integer> siteIds =new ArrayList<>();
         if (statisticsQueryDto.getSiteId()==null) {
-            Long userId = SecurityUtils.getUserId();
+            Long userId = tokenService.getLoginUser().getUserid();
             //获取当前登录的siteIds
             List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
             for (GetSiteListDTO datum : data) {
@@ -1398,7 +1401,7 @@
     public R<TCharingUserEquimentVO> equipment(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto){
         List<Integer> siteIds =new ArrayList<>();
         if (statisticsQueryDto.getSiteId()==null||statisticsQueryDto.getSiteId()==0) {
-            Long userId = SecurityUtils.getUserId();
+            Long userId = tokenService.getLoginUser().getUserid();
             //获取当前登录的siteIds
             List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
             for (GetSiteListDTO datum : data) {
@@ -1536,7 +1539,7 @@
     public R<TCharingWorkVO> workCharge(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto) {
         List<Integer> siteIds = new ArrayList<>();
         if (statisticsQueryDto.getSiteId() == null) {
-            Long userId = SecurityUtils.getUserId();
+            Long userId = tokenService.getLoginUser().getUserid();
             //获取当前登录的siteIds
             List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
             for (GetSiteListDTO datum : data) {
@@ -1582,7 +1585,7 @@
     public R workCharge(@RequestBody ChargingDetailQueryDto statisticsQueryDto) {
         List<Integer> siteIds = new ArrayList<>();
         if (statisticsQueryDto.getSiteId() == null) {
-            Long userId = SecurityUtils.getUserId();
+            Long userId = tokenService.getLoginUser().getUserid();
             //获取当前登录的siteIds
             List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
             for (GetSiteListDTO datum : data) {
@@ -1708,7 +1711,7 @@
     public R workUse(@RequestBody ChargingDetailQueryDto statisticsQueryDto) {
         List<Integer> siteIds = new ArrayList<>();
         if (statisticsQueryDto.getSiteId() == null) {
-            Long userId = SecurityUtils.getUserId();
+            Long userId = tokenService.getLoginUser().getUserid();
             //获取当前登录的siteIds
             List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
             for (GetSiteListDTO datum : data) {

--
Gitblit v1.7.1