From c3363d35b8dd42a862681d505360cd2c72d070a1 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期六, 10 八月 2024 18:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 66 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 11 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 1b69eef..3750bc9 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
@@ -1,6 +1,7 @@
package com.ruoyi.chargingPile.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
@@ -17,21 +18,27 @@
import com.ruoyi.chargingPile.service.ISiteService;
import com.ruoyi.chargingPile.service.TChargingGunService;
import com.ruoyi.chargingPile.service.TChargingPileService;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.GeodesyUtil;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.other.api.feignClient.RoleSiteClient;
+import com.ruoyi.other.api.feignClient.UserSiteClient;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import java.util.Map;
/**
@@ -50,20 +57,34 @@
@Resource
private SysUserClient sysUserClient;
-
- @Autowired
+
+ @Resource
+ private UserSiteClient userSiteClient;
+
+ @Resource
+ private RoleSiteClient roleSiteClient;
+ @Resource
private TChargingPileService chargingPileService;
- @Autowired
+ @Resource
private TChargingGunService chargingGunService;
+
+
+
+
@ResponseBody
@GetMapping("/getSiteList")
@ApiOperation(value = "获取站点列表", tags = {"管理后台-站点管理"})
- public AjaxResult<PageInfo<GetSiteListDTO>> getSiteList(@RequestBody GetSiteList siteList){
+ public AjaxResult<PageInfo<GetSiteListDTO>> getSiteList(GetSiteList siteList){
PageInfo<GetSiteListDTO> list = siteService.getSiteList(siteList);
return AjaxResult.success(list);
}
-
+ @ResponseBody
+ @GetMapping("/getSiteList1")
+ @ApiOperation(value = "获取站点列表 不分页", tags = {"管理后台-活动费用统计"})
+ public AjaxResult<List<Site>> getSiteList1(){
+ return AjaxResult.success(siteService.list(new QueryWrapper<>()));
+ }
@ApiOperation(value = "获取站点分页列表", tags = {"小程序-站点管理"})
@PostMapping("/pageList")
public AjaxResult<PageInfo<SiteVO>> pageList(@Validated @RequestBody SiteQuery query){
@@ -83,13 +104,14 @@
@ApiOperation(value = "获取站点下充电桩及充电枪列表", tags = {"小程序-站点管理-站点详情"})
@GetMapping("/getChargingGunList")
- public AjaxResult<List<TChargingPileVO>> getChargingGunList(@RequestParam(name = "siteId",value = "站点id")Integer siteId){
- return AjaxResult.success(chargingPileService.getChargingGunList(siteId));
+ public AjaxResult<List<TChargingPileVO>> getChargingGunList(@RequestParam(value = "siteId")@ApiParam(value = "站点id", required = true)Integer siteId,
+ @RequestParam(value = "siteId",required = false)@ApiParam(value = "类型 1=超充，2=快充，3=慢充")Integer type){
+ return AjaxResult.success(chargingPileService.getChargingGunList(siteId,type));
}
@ApiOperation(value = "获取站点下充电枪数量统计", tags = {"小程序-站点管理-站点详情"})
@GetMapping("/getChargingGunCount")
- public AjaxResult<Map<String,ChargingGunCountVO>> getChargingGunCount(@RequestParam(name = "siteId",value = "站点id")Integer siteId){
+ public AjaxResult<Map<String,ChargingGunCountVO>> getChargingGunCount(@RequestParam(value = "siteId")@ApiParam(value = "站点id", required = true)Integer siteId){
return AjaxResult.success(chargingGunService.getChargingGunCount(siteId));
}
@@ -114,7 +136,7 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "站点id", name = "id", dataTypeClass = Integer.class, required = true)
})
- public AjaxResult delSite(@PathVariable Integer id){
+ public AjaxResult delSite(@PathVariable Integer[] id){
return siteService.delSite(id);
}
@@ -134,7 +156,7 @@
@ResponseBody
@GetMapping("/getAllSiteList")
- @ApiOperation(value = "获取所有站点数据", tags = {"管理后台-充电桩信息"})
+ @ApiOperation(value = "获取所有站点数据", tags = {"管理后台-充电桩信息", "管理后台-系统用户管理", "管理后台-角色管理", "管理后台-系统通知"})
public AjaxResult<List<Site>> getAllSiteList(){
//校验当前账户站点权限
SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
@@ -142,10 +164,32 @@
Integer objectId = sysUser.getObjectId();
LambdaQueryWrapper<Site> wrapper = new LambdaQueryWrapper<Site>().eq(Site::getDelFlag, 0);
if(2 == roleType){
- List<Integer> list = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
+ Set<Integer> list = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
wrapper.in(Site::getId, list);
+ }else{
+ //非管理员需要根据角色和用户配置查询允许的站点数据
+ if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
+ List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).getData();
+ data.addAll(data1);
+ Set<Integer> list = new HashSet<>(data);
+ wrapper.in(Site::getId, list);
+ }
}
List<Site> list = siteService.list(wrapper.orderByDesc(Site::getCreateTime));
return AjaxResult.success(list);
}
+
+
+ /**
+ * 获取站点数据集合
+ * @param ids
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/getSiteByIds")
+ public R<List<Site>> getSiteByIds(@RequestBody List<Integer> ids){
+ List<Site> sites = siteService.listByIds(ids);
+ return R.ok(sites);
+ }
}
--
Gitblit v1.7.1