From 7f288c7515fa04cf83fadc3506317d08fb099630 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 10 八月 2024 11:44:53 +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 | 87 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 85 insertions(+), 2 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 f43f5d8..2e6c5f6 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
@@ -4,20 +4,41 @@
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;
+import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.chargingPile.api.query.GetSiteList;
+import com.ruoyi.chargingPile.api.query.SiteDetailQuery;
import com.ruoyi.chargingPile.api.query.SiteQuery;
+import com.ruoyi.chargingPile.api.vo.ChargingGunCountVO;
+import com.ruoyi.chargingPile.api.vo.SiteDetailVO;
import com.ruoyi.chargingPile.api.vo.SiteVO;
+import com.ruoyi.chargingPile.api.vo.TChargingPileVO;
+import com.ruoyi.chargingPile.domain.SiteMenu;
+import com.ruoyi.chargingPile.service.IPartnerService;
import com.ruoyi.chargingPile.service.ISiteService;
+import com.ruoyi.chargingPile.service.TChargingGunService;
+import com.ruoyi.chargingPile.service.TChargingPileService;
+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;
/**
* @author zhibing.pu
@@ -29,7 +50,28 @@
@Resource
private ISiteService siteService;
+
+ @Resource
+ private IPartnerService partnerService;
+ @Resource
+ private SysUserClient sysUserClient;
+
+ @Resource
+ private UserSiteClient userSiteClient;
+
+ @Resource
+ private RoleSiteClient roleSiteClient;
+
+
+
+
+
+
+ @Autowired
+ private TChargingPileService chargingPileService;
+ @Autowired
+ private TChargingGunService chargingGunService;
@ResponseBody
@GetMapping("/getSiteList")
@@ -48,6 +90,30 @@
@PostMapping("/pageList")
public AjaxResult<PageInfo<SiteVO>> pageList(@Validated @RequestBody SiteQuery query){
return AjaxResult.success(siteService.pageList(query));
+ }
+
+ @ApiOperation(value = "获取站点详细信息", tags = {"小程序-站点管理-站点详情"})
+ @PostMapping("/getDetailById")
+ public AjaxResult<SiteDetailVO> getDetailById(@Validated @RequestBody SiteDetailQuery query){
+ SiteDetailVO siteDetailVO = siteService.getDetailById(query.getSiteId());
+ // 计算距离
+ Map<String, Double> distance = GeodesyUtil.getDistance(query.getLat() + "," + query.getLon(), siteDetailVO.getLat() + "," + siteDetailVO.getLon());
+ siteDetailVO.setDistance(distance.get("WGS84"));
+ // TODO 查询绑定车牌提示文案
+ return AjaxResult.success(siteDetailVO);
+ }
+
+ @ApiOperation(value = "获取站点下充电桩及充电枪列表", tags = {"小程序-站点管理-站点详情"})
+ @GetMapping("/getChargingGunList")
+ 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));
+ }
+
+ @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));
}
@@ -93,8 +159,25 @@
@GetMapping("/getAllSiteList")
@ApiOperation(value = "获取所有站点数据", tags = {"管理后台-充电桩信息"})
public AjaxResult<List<Site>> getAllSiteList(){
- List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getDelFlag, 0)
- .orderByDesc(Site::getCreateTime));
+ //校验当前账户站点权限
+ SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ Integer roleType = sysUser.getRoleType();
+ Integer objectId = sysUser.getObjectId();
+ LambdaQueryWrapper<Site> wrapper = new LambdaQueryWrapper<Site>().eq(Site::getDelFlag, 0);
+ if(2 == roleType){
+ 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);
}
}
--
Gitblit v1.7.1