From ecca9ab70a9a87bcb60977c92fbf81053b8fc1bb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 04 九月 2024 09:17:55 +0800
Subject: [PATCH] 新增优化
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/HomePageController.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 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..b4d9189 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,16 +51,21 @@
@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("登录失效！");
}
- if (loginUser.getIsFranchisee()) {
+ if (loginUser.getIsFranchisee()||!userDataCountRequest.getCityList().isEmpty()) {
if (null == userDataCountRequest.getCityList() || userDataCountRequest.getCityList().isEmpty()) {
userDataCountRequest.setCityList(loginUser.getCityList());
- } else {
- userDataCountRequest.getCityList().addAll(loginUser.getCityList());
}
+// else {
+//// 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));
}
@@ -78,12 +83,16 @@
if (null == loginUser) {
return R.loginExpire("登录失效！");
}
- if (loginUser.getIsFranchisee()) {
+ if (loginUser.getIsFranchisee()||!cityList.isEmpty()) {
if (null == cityList || cityList.isEmpty()) {
cityList = loginUser.getCityList();
- } else {
- cityList.addAll(loginUser.getCityList());
}
+// else {
+//// 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 +114,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,9 +137,13 @@
if (null == cityList || cityList.isEmpty()) {
cityList = loginUser.getCityList();
} else {
- cityList.addAll(loginUser.getCityList());
+// cityList.addAll(loginUser.getCityList());
}
}
+ List<MasterWorkerRankVO> masterWorkerRankVOS = masterWorkerService.workerRanking(cityList);
+ if (masterWorkerRankVOS.size()>10){
+ return R.ok(masterWorkerRankVOS.subList(0,10));
+ }
return R.ok(masterWorkerService.workerRanking(cityList));
}
--
Gitblit v1.7.1