From 0ef46975993c06e780ec4981d7535167673aa51d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 25 八月 2025 10:39:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/gy_jifenshangcheng into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java
index 6272f48..cb17939 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java
@@ -8,13 +8,20 @@
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.utils.WebUtils;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.dto.GetImportOrderDTO;
import com.ruoyi.order.export.ChargeOrderExport;
import com.ruoyi.order.model.ChargeOrder;
import com.ruoyi.order.service.ChargeOrderService;
+import com.ruoyi.other.api.domain.TIntegralRule;
+import com.ruoyi.system.api.domain.SysConfig;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
+import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -32,6 +39,8 @@
public class ChargeOrderController {
@Resource
private ChargeOrderService chargeOrderService;
+ @Resource
+ private SysUserClient sysUserClient;
@PostMapping(value = "/getBySiteIdAndTime")
public R<List<ChargingOrderGroup>> getBySiteIdAndTime(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto) {
@@ -49,10 +58,11 @@
if (file.isEmpty()) {
return R.fail("请选择要上传的文件");
}
-
return chargeOrderService.importExpress(file);
}
+ @Autowired
+ private TokenService tokenService;
/**
* 获取导入订单列表
*/
@@ -60,7 +70,13 @@
@PostMapping("/getImportData")
@ApiOperation(value = "获取导入订单列表", tags = "后台-充电订单")
public R<PageInfo<ChargeOrder>> getUserPointPageList(@RequestBody GetImportOrderDTO getImportOrderDTO) {
-
+ LoginUser loginUser = tokenService.getLoginUser();
+ R<SysUser> sysUser = sysUserClient.getSysUser(loginUser.getUserid());
+ SysUser data = sysUser.getData();
+ if (data.getRoleType() == 2){
+ // 只查询当前站点数据
+ getImportOrderDTO.setSiteId(data.getSiteId());
+ }
PageInfo<ChargeOrder> pageInfo=chargeOrderService.getUserPointPageList(getImportOrderDTO);
return R.ok(pageInfo);
--
Gitblit v1.7.1