From 05f53069a91f979ec3d18e0a7abc8ce67c2656b2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 04 九月 2025 14:35:01 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
index 4ceeab6..28f2485 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
@@ -38,6 +38,7 @@
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -80,13 +81,8 @@
@GetMapping("/map/getSiteList")
@ApiOperation(value = "获取站点", tags = {"2.0-管理后台-数据分析-电站分布"})
public R<List<GetSiteListDTO>> getMapSiteList(GetSiteList siteList){
- Long userid = tokenService.getLoginUser().getUserid();
- SysUser data = sysUserClient.getSysUser(userid).getData();
-
- if (data.getRoleType()==2){
- siteList.setSiteId(data.getSiteId());
- }
- List<GetSiteListDTO> list = siteService.getSiteListNolimit(siteList);
+ SysUser sysUser = tokenService.getLoginUser().getSysUser();
+ List<GetSiteListDTO> list = siteService.getSiteListNolimit(siteList,sysUser);
List<GetSiteListDTO> records = list;
for (GetSiteListDTO record : records) {
@@ -253,7 +249,12 @@
long daysBetween = ChronoUnit.DAYS.between(chargingPercentProvinceDto.getDate1(), chargingPercentProvinceDto.getDate2());
BigDecimal multiply = bigDecimal1.multiply(new BigDecimal("24")).multiply(BigDecimal.valueOf(daysBetween));
//得到利用率
- BigDecimal divide = datum.getChargingCapacity().divide(multiply, 0, BigDecimal.ROUND_HALF_UP);
+ BigDecimal divide;
+ if(CollectionUtils.isEmpty(chargingPiles)){
+ divide = BigDecimal.ZERO;
+ }else {
+ divide = datum.getChargingCapacity().divide(multiply, 0, BigDecimal.ROUND_HALF_UP);
+ }
//如果利用率大于等于10
if (divide.compareTo(BigDecimal.valueOf(10))>=0){
chargingPercentBack.setCount1(chargingPercentBack.getCount1()+1);
@@ -322,7 +323,7 @@
SysUser data = sysUserClient.getSysUser(site.getUserId()).getData();
if (data!=null){
res.setAccount(data.getUserName());
- res.setPassword("********");
+// res.setPassword("********");
}
BeanUtils.copyProperties(site, res);
return R.ok(res);
--
Gitblit v1.7.1