From b9da8289051937fbbbd47bbda97414ad6c769a90 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 18 七月 2024 14:37:00 +0800
Subject: [PATCH] feat: 代码重构
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/HomePageController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 f5e8800..cfcf91e 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,14 +1,16 @@
package com.ruoyi.admin.controller;
-import com.ruoyi.admin.request.OrderCountRequest;
import com.ruoyi.admin.request.UserDataCountRequest;
import com.ruoyi.admin.service.MasterWorkerService;
-import com.ruoyi.admin.service.OrderService;
import com.ruoyi.admin.service.UserService;
import com.ruoyi.admin.vo.MasterWorkerRankVO;
-import com.ruoyi.admin.vo.OrderResultVO;
+import com.ruoyi.admin.vo.UserDataCountVO;
import com.ruoyi.admin.vo.UserTrendsVO;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.order.api.entity.OrderCountRequest;
+import com.ruoyi.order.api.entity.OrderResultVO;
+import com.ruoyi.order.api.feignClient.OrderClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
@@ -34,16 +36,17 @@
@Resource
private UserService userService;
@Resource
- private OrderService orderService;
+ private OrderClient orderClient;
/**
* 用户数据统计
*
* @param userDataCountRequest 请求参数
*/
+ @RequiresPermissions("homepage")
@ApiOperation(value = "后台-用户数据统计", tags = {"后台-首页"})
@PostMapping(value = "/userDataCount")
- public R<Object> userDataCount(@RequestBody UserDataCountRequest userDataCountRequest) {
+ public R<UserDataCountVO> userDataCount(@RequestBody UserDataCountRequest userDataCountRequest) {
return R.ok(userService.userDataCount(userDataCountRequest));
}
@@ -52,6 +55,7 @@
*
* @param cityList 城市列表
*/
+ @RequiresPermissions("homepage")
@ApiOperation(value = "后台-用户增量", tags = {"后台-首页"})
@PostMapping(value = "/userTrends")
public R<List<UserTrendsVO>> userTrends(@RequestBody List<String> cityList) {
@@ -63,10 +67,11 @@
*
* @param orderCount 查询所需参数
*/
+ @RequiresPermissions("homepage")
@ApiOperation(value = "后台-回收订单统计", tags = {"后台-首页"})
@PostMapping(value = "/orderCountHome")
public R<OrderResultVO> orderCountHome(@RequestBody OrderCountRequest orderCount) {
- return R.ok(orderService.orderCountHome(orderCount));
+ return orderClient.orderCountHome(orderCount);
}
/**
@@ -74,6 +79,7 @@
*
* @param cityList 城市集合
*/
+ @RequiresPermissions("homepage")
@ApiOperation(value = "后台-师傅接单排行", tags = {"后台-首页"})
@PostMapping(value = "/workerRanking")
public R<List<MasterWorkerRankVO>> workerRanking(@RequestBody List<String> cityList) {
--
Gitblit v1.7.1