From 67f416634f95c81e618123b826e18a57ae08220d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 17:55:30 +0800
Subject: [PATCH] 11.6
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/HomePageController.java | 83 +++++++++++++++++++++++++++--------------
1 files changed, 55 insertions(+), 28 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 d0aa1c1..60dca9e 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
@@ -1,8 +1,8 @@
package com.ruoyi.admin.controller;
-import com.ruoyi.admin.netty.NettyChannelMap;
-import com.ruoyi.admin.netty.NettyWebSocketController;
+import com.ruoyi.admin.entity.Franchisee;
import com.ruoyi.admin.request.UserDataCountRequest;
+import com.ruoyi.admin.service.FranchiseeService;
import com.ruoyi.admin.service.MasterWorkerService;
import com.ruoyi.admin.service.UserService;
import com.ruoyi.admin.vo.MasterWorkerRankVO;
@@ -15,12 +15,15 @@
import com.ruoyi.order.api.entity.OrderResultVO;
import com.ruoyi.order.api.feignClient.OrderClient;
import com.ruoyi.system.api.model.LoginUser;
-import io.netty.channel.ChannelHandlerContext;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.Arrays;
import java.util.List;
/**
@@ -43,21 +46,6 @@
private TokenService tokenService;
/**
- * netty测试
- *
- * @param workerId 请求参数
- */
- @ApiOperation(value = "netty测试", tags = {"后台-首页"})
- @GetMapping(value = "/nettySend")
- public R<?> nettySend(@RequestParam Integer workerId) {
- ChannelHandlerContext context = NettyChannelMap.getData(String.valueOf(workerId));
- if (null != context) {
- NettyWebSocketController.sendMsgToClient(context, "您有一条新的订单，请注意查收！");
- }
- return R.ok();
- }
-
- /**
* 用户数据统计
*
* @param userDataCountRequest 请求参数
@@ -66,16 +54,34 @@
@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()) {
+
+ Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
+ String[] siteIds = new String[0];
+ if (franchiseeId!=null){
+ Franchisee byId = franchiseeService.getById(franchiseeId);
+ siteIds = byId.getSiteIds().split(",");
+ if (loginUser.getIsFranchisee()&&siteIds.length==0){
+ return R.ok();
+ }
+ }
+ userDataCountRequest.setSiteIds(Arrays.asList(siteIds));
+
+
+ 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.queryIdsBycodeAndSite(userDataCountRequest.getCityList(),userDataCountRequest.getSiteIds());
+
+ return R.ok(userService.userDataCount1(userDataCountRequest, listR.getData(),userDataCountRequest.getSiteIds()));
+
}
return R.ok(userService.userDataCount(userDataCountRequest));
}
@@ -93,16 +99,22 @@
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));
}
+ @Resource
+ private FranchiseeService franchiseeService;
/**
* 回收订单统计
*
@@ -120,9 +132,20 @@
if (null == orderCount.getCityList() || orderCount.getCityList().isEmpty()) {
orderCount.setCityList(loginUser.getCityList());
} else {
- orderCount.getCityList().addAll(loginUser.getCityList());
+// orderCount.getCityList().addAll(loginUser.getCityList());
}
}
+ Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
+ String[] siteIds = new String[0];
+ if (franchiseeId!=null) {
+ Franchisee byId = franchiseeService.getById(franchiseeId);
+ siteIds = byId.getSiteIds().split(",");
+ orderCount.setSiteIds(siteIds);
+ if (loginUser.getIsFranchisee() && siteIds.length == 0) {
+ return R.ok(new OrderResultVO());
+ }
+ }
+ orderCount.setSiteIds(siteIds);
return orderClient.orderCountHome(orderCount);
}
@@ -143,9 +166,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