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/EvaluateController.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java
index 50b526d..bc95d95 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java
@@ -3,10 +3,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.entity.Evaluate;
import com.ruoyi.order.api.entity.EvaluatePageVO;
import com.ruoyi.order.api.feignClient.EvaluateClient;
+import com.ruoyi.order.api.request.EvaluatePageRequest;
+import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -17,6 +21,8 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
/**
* <p>
@@ -33,6 +39,8 @@
@Resource
private EvaluateClient evaluateClient;
+ @Resource
+ private TokenService tokenService;
/**
* 订单评价分页列表
@@ -40,7 +48,7 @@
* @param pageNum 页码
* @param pageSize 每页显示条数
*/
- @RequiresPermissions("order_evaluate")
+ @RequiresPermissions(value = {"user_detail", "order_evaluate"}, logical = Logical.OR)
@ApiOperation(value = "订单评价分页查询列表", tags = {"后台-系统设置-订单评价管理"})
@GetMapping(value = "/page")
@ApiImplicitParams({
@@ -53,7 +61,22 @@
public R<Page<EvaluatePageVO>> queryPageList(String userNo, String orderNumber, String workerName,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
- return evaluateClient.queryPageList(userNo, orderNumber, workerName, pageNum, pageSize);
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (null == loginUser) {
+ return R.loginExpire("登录失效！");
+ }
+ List<String> cityList = new ArrayList<>();
+ if (loginUser.getIsFranchisee()) {
+ cityList = loginUser.getCityList();
+ }
+ EvaluatePageRequest evaluatePageRequest = new EvaluatePageRequest();
+ evaluatePageRequest.setUserNo(userNo);
+ evaluatePageRequest.setOrderNumber(orderNumber);
+ evaluatePageRequest.setWorkerName(workerName);
+ evaluatePageRequest.setCityList(cityList);
+ evaluatePageRequest.setPageNum(pageNum);
+ evaluatePageRequest.setPageSize(pageSize);
+ return evaluateClient.queryPageList(evaluatePageRequest);
}
/**
@@ -61,7 +84,7 @@
*
* @param id 订单评价id
*/
- @RequiresPermissions("order_evaluate")
+ @RequiresPermissions(value = {"user_detail", "evaluate_detail"}, logical = Logical.OR)
@ApiOperation(value = "订单评价详情", tags = {"后台-系统设置-订单评价管理"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@@ -76,7 +99,7 @@
*
* @param ids 订单评价多条id拼接
*/
- @RequiresPermissions("order_evaluate")
+ @RequiresPermissions(value = {"user_detail", "evaluate_delete"}, logical = Logical.OR)
@ApiOperation(value = "批量删除订单评价", tags = {"后台-系统设置-订单评价管理"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
--
Gitblit v1.7.1