From 3244b550596e0330031b3f4547356927df83b0ad Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 19 五月 2025 11:48:35 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 107 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 83 insertions(+), 24 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 67d1285..4b52944 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
@@ -31,6 +31,7 @@
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.log.enums.OperatorType;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.service.TokenService;
@@ -85,7 +86,7 @@
@Resource
private RoleSiteClient roleSiteClient;
@Resource
- private ParkingLotClient parkingLotClient;
+ private SysUserRoleClient sysUserRoleClient;
@Resource
private TChargingPileService chargingPileService;
@Resource
@@ -132,9 +133,13 @@
public R<SiteInfoVO> getSiteInfoByNumber(@RequestParam("number") String number){
SiteInfoVO siteInfoVO = new SiteInfoVO();
TChargingGun chargingGun = chargingGunService.getOne(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getFullNumber, number));
+ Site site = siteService.getById(chargingGun.getSiteId());
+ Integer accountingStrategyId = chargingGun.getAccountingStrategyId();
+ if(null == accountingStrategyId){
+ accountingStrategyId = site.getAccountingStrategyId();
+ }
TChargingPile one = chargingPileService.getById(chargingGun.getChargingPileId());
- Site byId = siteService.getById(chargingGun.getSiteId());
- TAccountingStrategy byId1 = accountingStrategyService.getById(chargingGun.getAccountingStrategyId());
+ TAccountingStrategy byId1 = accountingStrategyService.getById(accountingStrategyId);
List<TAccountingStrategyDetail> list = accountingStrategyDetailService.lambdaQuery().eq(TAccountingStrategyDetail::getAccountingStrategyId, byId1.getId()).list();
list.stream().filter(item -> "00:00".equals(item.getEndTime())).forEach(item -> item.setEndTime("23:59:59"));
for (TAccountingStrategyDetail tAccountingStrategyDetail : list) {
@@ -170,9 +175,9 @@
}
siteInfoVO.setChargingGunId(chargingGun.getId());
siteInfoVO.setChargingPileId(one.getId());
- siteInfoVO.setName(byId.getName());
+ siteInfoVO.setName(site.getName());
siteInfoVO.setNumber(one.getNumber().toString());
- siteInfoVO.setSpaceChargeExplain(byId.getSpaceChargeExplain());
+ siteInfoVO.setSpaceChargeExplain(site.getSpaceChargeExplain());
return R.ok(siteInfoVO);
}
/**
@@ -184,8 +189,13 @@
public R<SiteInfoVO> getSiteInfoByNumber1(@RequestParam("number") String number){
SiteInfoVO siteInfoVO = new SiteInfoVO();
TChargingPile one = chargingPileService.lambdaQuery().eq(TChargingPile::getCode, number).one();
- Site byId = siteService.getById(one.getSiteId());
- TAccountingStrategy byId1 = accountingStrategyService.getById(byId.getAccountingStrategyId());
+ TChargingGun chargingGun = chargingGunService.getOne(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, one.getId()).last(" limit 0, 1"));
+ Site site = siteService.getById(chargingGun.getSiteId());
+ Integer accountingStrategyId = chargingGun.getAccountingStrategyId();
+ if(null == accountingStrategyId){
+ accountingStrategyId = site.getAccountingStrategyId();
+ }
+ TAccountingStrategy byId1 = accountingStrategyService.getById(accountingStrategyId);
List<TAccountingStrategyDetail> list = accountingStrategyDetailService.lambdaQuery().eq(TAccountingStrategyDetail::getAccountingStrategyId, byId1.getId()).list();
list.stream().filter(item -> "00:00".equals(item.getEndTime())).forEach(item -> item.setEndTime("23:59:59"));
for (TAccountingStrategyDetail tAccountingStrategyDetail : list) {
@@ -232,9 +242,9 @@
siteInfoVO.setCouponCount(num);
}
siteInfoVO.setChargingPileId(one.getId());
- siteInfoVO.setName(byId.getName());
+ siteInfoVO.setName(site.getName());
siteInfoVO.setNumber(one.getNumber().toString());
- siteInfoVO.setSpaceChargeExplain(byId.getSpaceChargeExplain());
+ siteInfoVO.setSpaceChargeExplain(site.getSpaceChargeExplain());
return R.ok(siteInfoVO);
}
@@ -300,7 +310,7 @@
}
BigDecimal multiply = bigDecimal1.multiply(new BigDecimal("24"));
- BigDecimal divide = bigDecimal.divide(multiply, 0, BigDecimal.ROUND_HALF_UP);
+ BigDecimal divide = bigDecimal.divide(multiply, 4, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
record.setP1(divide);
}
@@ -332,8 +342,7 @@
return R.ok(divide);
}
- @Resource
- private SiteClient siteClient;
+
@@ -343,15 +352,29 @@
@PostMapping("/map/getPercentByprovinceCode")
@ApiOperation(value = "获取该充电站的利用率", tags = {"管理后台-数据分析-电站分析"})
public R getPercentByCityCode(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto){
-
- Long userid = tokenService.getLoginUser().getUserid();
- List<Integer> siteIds = new ArrayList<>();
-
- List<GetSiteListDTO> data1 = siteClient.getSiteListByUserId(userid).getData();
- for (GetSiteListDTO datum : data1) {
- siteIds.add(datum.getId());
+ Set<Integer> ids = null;
+ //校验合作商权限
+ SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ Integer roleType = sysUser.getRoleType();
+ Integer objectId = sysUser.getObjectId();
+ R<Integer> admin = sysUserClient.isAdmin(SecurityUtils.getUserId());
+ //合作商
+ if(roleType == 2){
+ ids = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
+ }else{
+ //非管理员需要根据角色和用户配置查询允许的站点数据
+ //改用roleId=1来判断
+ if(admin.getData()!=1){
+ List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
+ List<SysUserRoleVo> data2 = sysUserRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
+ if(data2.size() > 0){
+ List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
+ data.addAll(data1);
+ }
+ ids = new HashSet<>(data);
+ }
}
- chargingPercentProvinceDto.setSiteIds(siteIds);
+ chargingPercentProvinceDto.setSiteIds(ids);
GetSiteList siteList = new GetSiteList();
@@ -367,7 +390,7 @@
if (chargingPercentProvinceDto.getDate1().equals(chargingPercentProvinceDto.getDate2())){
chargingPercentProvinceDto.setDate2(chargingPercentProvinceDto.getDate1().plusDays(1));
}
- List<ChargingOrderGroup> data = chargingOrderClient.getBySiteIdAndTime(chargingPercentProvinceDto).getData();
+ List<ChargingOrderGroup> data = chargingOrderClient.getBySiteIdAndTime(chargingPercentProvinceDto).getData();
// 计算利用率展示
for (ChargingOrderGroup datum : data) {
List<TChargingPile> chargingPiles = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, datum.getSiteId()).list();
@@ -433,7 +456,6 @@
int isLogin = StringUtils.isEmpty(SecurityUtils.getToken(request)) ? 0 : 1;
return AjaxResult.success(siteService.pageList(query,isLogin));
}
-
@ApiOperation(value = "获取站点列表", tags = {"小程序-站点管理-地图导航站点"})
@@ -442,6 +464,8 @@
int isLogin = StringUtils.isEmpty(SecurityUtils.getToken(request)) ? 0 : 1;
return AjaxResult.success(siteService.getMapSiteList(query,isLogin));
}
+
+
@ApiOperation(value = "获取站点详细信息", tags = {"小程序-站点管理-站点详情"})
@PostMapping("/getDetailById")
public AjaxResult<SiteDetailVO> getDetailById(@Validated @RequestBody SiteDetailQuery query){
@@ -462,7 +486,8 @@
}
return AjaxResult.success(siteDetailVO);
}
-
+
+
@ApiOperation(value = "获取站点下充电桩及充电枪列表", tags = {"小程序-站点管理-站点详情"})
@GetMapping("/getChargingGunList")
public AjaxResult<List<TChargingPileVO>> getChargingGunList(@RequestParam(value = "siteId")@ApiParam(value = "站点id", required = true)Integer siteId,
@@ -470,13 +495,18 @@
return AjaxResult.success(chargingPileService.getChargingGunList(siteId,type));
}
- @ApiOperation(value = "获取站点下充电枪数量统计", tags = {"小程序-站点管理-站点详情","管理后台-数据分析-电站分析"})
+ @ApiOperation(value = "获取站点下充电枪数量统计", tags = {"管理后台-数据分析-电站分析"})
@GetMapping("/getChargingGunCount")
public AjaxResult<Map<String,ChargingGunCountVO>> getChargingGunCount(@RequestParam(value = "siteId")@ApiParam(value = "站点id", required = true)Integer siteId){
return AjaxResult.success(chargingGunService.getChargingGunCount(siteId));
}
+ @ApiOperation(value = "获取站点下充电枪数量统计", tags = {"小程序-站点管理-站点详情"})
+ @GetMapping("/getChargingGunCount1")
+ public AjaxResult<Map<String,ChargingGunCountVO>> getChargingGunCount1(@RequestParam(value = "siteId")@ApiParam(value = "站点id", required = true)Integer siteId){
+ return AjaxResult.success(chargingGunService.getChargingGunCount(siteId));
+ }
@RequiresPermissions(value = {"/site/add"}, logical = Logical.OR)
@ResponseBody
@@ -593,4 +623,33 @@
List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getDelFlag, 0));
return R.ok(list);
}
+
+
+ /**
+ * 分页查询站电数据
+ * @param PageNo
+ * @param PageSize
+ * @return
+ */
+ @PostMapping("/getSiteListPaging")
+ public PageInfo<Site> getSiteListPaging(@RequestParam("PageNo") Integer PageNo, @RequestParam("PageSize") Integer PageSize,
+ @RequestParam("ids") List<String> ids){
+ PageInfo<Site> pageInfo = new PageInfo<>(PageNo, PageSize);
+ PageInfo<Site> page = siteService.lambdaQuery().eq(Site::getStatus, 1).in(ids.size() > 0, Site::getId, ids)
+ .ne(Site::getSiteType, 2).page(pageInfo);
+ return page;
+ }
+ /**
+ * 分页查询站电数据
+ * @param PageNo
+ * @param PageSize
+ * @return
+ */
+ @PostMapping("/getSiteListPagingJianGuan")
+ public PageInfo<Site> getSiteListPagingJianGuan(@RequestParam("PageNo") Integer PageNo, @RequestParam("PageSize") Integer PageSize,
+ @RequestParam("ids") List<String> ids){
+ PageInfo<Site> pageInfo = new PageInfo<>(PageNo, PageSize);
+ PageInfo<Site> page = siteService.lambdaQuery().eq(Site::getStatus, 1).in(ids.size() > 0, Site::getId, ids).page(pageInfo);
+ return page;
+ }
}
--
Gitblit v1.7.1