From a4ad16516eb955ddd6a53a181da4d690468572c2 Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Thu, 8 Aug 2024 10:09:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=BB=9F=E8=AE=A1=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/scale/controller/ArchiveController.java   | 8 ++++----
 .../main/java/org/dromara/scale/mapper/ArchiveMapper.java | 3 ++-
 .../java/org/dromara/scale/service/IArchiveService.java   | 4 ++--
 .../dromara/scale/service/impl/ArchiveServiceImpl.java    | 7 ++-----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ArchiveController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ArchiveController.java
index 1b2c30b..9b967da 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ArchiveController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ArchiveController.java
@@ -54,8 +54,8 @@ public class ArchiveController {
      */
     @SaCheckPermission("scale:archive:statistic")
     @GetMapping("/statistic/scale")
-    public R<List<StatisticScaleVo>> statisticScale() {
-        return R.ok(archiveService.queryStatisticScale());
+    public R<List<StatisticScaleVo>> statisticScale(Long userId) {
+        return R.ok(archiveService.queryStatisticScale(userId));
     }
 
     /**
@@ -63,8 +63,8 @@ public class ArchiveController {
      */
     @SaCheckPermission("scale:archive:statistic")
     @GetMapping("/statistic/warn")
-    public R<StatisticWarnVo> statisticWarn() {
-        return R.ok(archiveService.queryStatisticWarn());
+    public R<StatisticWarnVo> statisticWarn(Long userId) {
+        return R.ok(archiveService.queryStatisticWarn(userId));
     }
 
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ArchiveMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ArchiveMapper.java
index c92cb2c..ef81b4e 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ArchiveMapper.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ArchiveMapper.java
@@ -23,7 +23,8 @@ public interface ArchiveMapper {
     Page<ArchiveStatisticVo> selectStatisticVoPage(@Param("page") Page<ArchiveStatisticVo> page, @Param("userId") Long userId);
 
     List<SysEvaluationRecordVo> selectScaleRecordByUserId(@Param("userId") Long userId);
-   StatisticWarnVo selectWarnByUserId(@Param("userId") Long userId);
+
+    StatisticWarnVo selectWarnByUserId(@Param("userId") Long userId);
 
 
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IArchiveService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IArchiveService.java
index 9d31841..4c881e0 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IArchiveService.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IArchiveService.java
@@ -15,7 +15,7 @@ public interface IArchiveService {
 
     TableDataInfo<ArchiveStatisticVo> queryStatisticPageList(Long usetId, PageQuery pageQuery);
 
-    List<StatisticScaleVo> queryStatisticScale();
+    List<StatisticScaleVo> queryStatisticScale(Long userId);
 
-    StatisticWarnVo queryStatisticWarn();
+    StatisticWarnVo queryStatisticWarn(Long userId);
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ArchiveServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ArchiveServiceImpl.java
index 67382c2..4fd30c4 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ArchiveServiceImpl.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ArchiveServiceImpl.java
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.scale.domain.vo.*;
 import org.dromara.scale.mapper.ArchiveMapper;
 import org.dromara.scale.service.IArchiveService;
@@ -46,8 +45,7 @@ public class ArchiveServiceImpl implements IArchiveService {
     }
 
     @Override
-    public List<StatisticScaleVo> queryStatisticScale() {
-        Long userId = LoginHelper.getUserId();
+    public List<StatisticScaleVo> queryStatisticScale(Long userId) {
         List<SysEvaluationRecordVo> list = archiveMapper.selectScaleRecordByUserId(userId);
         Map<String, List<Instant>> groupedTimes = list.stream()
             .sorted(Comparator.comparing(e -> e.getCreateTime().toInstant())) // 先排序
@@ -81,8 +79,7 @@ public class ArchiveServiceImpl implements IArchiveService {
     }
 
     @Override
-    public StatisticWarnVo queryStatisticWarn() {
-        Long userId = LoginHelper.getUserId();
+    public StatisticWarnVo queryStatisticWarn(Long userId) {
         return archiveMapper.selectWarnByUserId(userId);
     }
 }