From 67157345fe1878681e39ec186ef37ff6b3b5c1fc Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 03 八月 2024 18:07:00 +0800
Subject: [PATCH] 8.3
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/HomePageController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/HomePageController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/HomePageController.java
index c1f197a..0f8a7b5 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/HomePageController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/HomePageController.java
@@ -51,7 +51,7 @@
@ApiOperation(value = "后台-用户数据统计", tags = {"后台-首页"})
@PostMapping(value = "/userDataCount")
public R<UserDataCountVO> userDataCount(@RequestBody UserDataCountRequest userDataCountRequest) {
- LoginUser loginUser = tokenService.getLoginUser();
+ LoginUser loginUser = tokenService.getLoginUser();
if (null == loginUser) {
return R.loginExpire("登录失效！");
}
@@ -59,8 +59,12 @@
if (null == userDataCountRequest.getCityList() || userDataCountRequest.getCityList().isEmpty()) {
userDataCountRequest.setCityList(loginUser.getCityList());
} else {
- userDataCountRequest.getCityList().addAll(loginUser.getCityList());
+// userDataCountRequest.getCityList().addAll(loginUser.getCityList());
}
+ R<List<Integer>> listR = orderClient.queryIdsBycode(userDataCountRequest.getCityList());
+
+ return R.ok(userService.userDataCount1(userDataCountRequest, listR.getData()));
+
}
return R.ok(userService.userDataCount(userDataCountRequest));
}
@@ -82,8 +86,11 @@
if (null == cityList || cityList.isEmpty()) {
cityList = loginUser.getCityList();
} else {
- cityList.addAll(loginUser.getCityList());
+// cityList.addAll(loginUser.getCityList());
}
+ R<List<Integer>> listR = orderClient.queryIdsBycode(cityList);
+
+ return R.ok(userService.userTrends1(cityList,listR.getData()));
}
return R.ok(userService.userTrends(cityList));
}
@@ -105,7 +112,7 @@
if (null == orderCount.getCityList() || orderCount.getCityList().isEmpty()) {
orderCount.setCityList(loginUser.getCityList());
} else {
- orderCount.getCityList().addAll(loginUser.getCityList());
+// orderCount.getCityList().addAll(loginUser.getCityList());
}
}
return orderClient.orderCountHome(orderCount);
@@ -128,7 +135,7 @@
if (null == cityList || cityList.isEmpty()) {
cityList = loginUser.getCityList();
} else {
- cityList.addAll(loginUser.getCityList());
+// cityList.addAll(loginUser.getCityList());
}
}
return R.ok(masterWorkerService.workerRanking(cityList));
--
Gitblit v1.7.1