From 562699fa6d0c279fe0f4f81ce87c336a34a3fb91 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期二, 23 七月 2024 14:32:23 +0800
Subject: [PATCH] feat: 数据迁移;netty通信;bug修改

---
 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/HomePageController.java |   71 +++++++++++++++++++++++++++++++++--
 1 files changed, 67 insertions(+), 4 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 cfcf91e..d0aa1c1 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,5 +1,7 @@
 package com.ruoyi.admin.controller;
 
+import com.ruoyi.admin.netty.NettyChannelMap;
+import com.ruoyi.admin.netty.NettyWebSocketController;
 import com.ruoyi.admin.request.UserDataCountRequest;
 import com.ruoyi.admin.service.MasterWorkerService;
 import com.ruoyi.admin.service.UserService;
@@ -8,15 +10,15 @@
 import com.ruoyi.admin.vo.UserTrendsVO;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.order.api.entity.OrderCountRequest;
 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.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -37,6 +39,23 @@
     private UserService userService;
     @Resource
     private OrderClient orderClient;
+    @Resource
+    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();
+    }
 
     /**
      * 用户数据统计
@@ -47,6 +66,17 @@
     @ApiOperation(value = "后台-用户数据统计", tags = {"后台-首页"})
     @PostMapping(value = "/userDataCount")
     public R<UserDataCountVO> userDataCount(@RequestBody UserDataCountRequest userDataCountRequest) {
+        LoginUser loginUser = tokenService.getLoginUser();
+        if (null == loginUser) {
+            return R.loginExpire("登录失效！");
+        }
+        if (loginUser.getIsFranchisee()) {
+            if (null == userDataCountRequest.getCityList() || userDataCountRequest.getCityList().isEmpty()) {
+                userDataCountRequest.setCityList(loginUser.getCityList());
+            } else {
+                userDataCountRequest.getCityList().addAll(loginUser.getCityList());
+            }
+        }
         return R.ok(userService.userDataCount(userDataCountRequest));
     }
 
@@ -59,6 +89,17 @@
     @ApiOperation(value = "后台-用户增量", tags = {"后台-首页"})
     @PostMapping(value = "/userTrends")
     public R<List<UserTrendsVO>> userTrends(@RequestBody List<String> cityList) {
+        LoginUser loginUser = tokenService.getLoginUser();
+        if (null == loginUser) {
+            return R.loginExpire("登录失效！");
+        }
+        if (loginUser.getIsFranchisee()) {
+            if (null == cityList || cityList.isEmpty()) {
+                cityList = loginUser.getCityList();
+            } else {
+                cityList.addAll(loginUser.getCityList());
+            }
+        }
         return R.ok(userService.userTrends(cityList));
     }
 
@@ -71,6 +112,17 @@
     @ApiOperation(value = "后台-回收订单统计", tags = {"后台-首页"})
     @PostMapping(value = "/orderCountHome")
     public R<OrderResultVO> orderCountHome(@RequestBody OrderCountRequest orderCount) {
+        LoginUser loginUser = tokenService.getLoginUser();
+        if (null == loginUser) {
+            return R.loginExpire("登录失效！");
+        }
+        if (loginUser.getIsFranchisee()) {
+            if (null == orderCount.getCityList() || orderCount.getCityList().isEmpty()) {
+                orderCount.setCityList(loginUser.getCityList());
+            } else {
+                orderCount.getCityList().addAll(loginUser.getCityList());
+            }
+        }
         return orderClient.orderCountHome(orderCount);
     }
 
@@ -83,6 +135,17 @@
     @ApiOperation(value = "后台-师傅接单排行", tags = {"后台-首页"})
     @PostMapping(value = "/workerRanking")
     public R<List<MasterWorkerRankVO>> workerRanking(@RequestBody List<String> cityList) {
+        LoginUser loginUser = tokenService.getLoginUser();
+        if (null == loginUser) {
+            return R.loginExpire("登录失效！");
+        }
+        if (loginUser.getIsFranchisee()) {
+            if (null == cityList || cityList.isEmpty()) {
+                cityList = loginUser.getCityList();
+            } else {
+                cityList.addAll(loginUser.getCityList());
+            }
+        }
         return R.ok(masterWorkerService.workerRanking(cityList));
     }
 

--
Gitblit v1.7.1