From 5df9beddb0e8f7bca303a50f59b960d3d8f1346a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 16 十月 2024 10:05:15 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 376 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 337 insertions(+), 39 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 88c1b86..dc9f996 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,43 +1,51 @@
package com.ruoyi.chargingPile.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.feignClient.ParkingLotClient;
+import com.ruoyi.chargingPile.api.model.*;
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.api.vo.*;
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.chargingPile.dto.ChargingPercentBack;
+import com.ruoyi.common.core.dto.ChargingOrderGroup;
+import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
+import com.ruoyi.chargingPile.service.*;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.GeodesyUtil;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
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.security.utils.SecurityUtils;
+import com.ruoyi.order.api.feignClient.ChargingOrderClient;
+import com.ruoyi.order.api.model.TChargingOrder;
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 com.ruoyi.system.api.feignClient.SysUserRoleClient;
+import com.ruoyi.system.api.model.SysUserRoleVo;
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;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -62,73 +70,349 @@
@Resource
private RoleSiteClient roleSiteClient;
@Resource
+ private ParkingLotClient parkingLotClient;
+ @Resource
private TChargingPileService chargingPileService;
@Resource
private TChargingGunService chargingGunService;
+ @Autowired
+ private TParkingLotService parkingLotService;
+ @Autowired
+ private TAccountingStrategyService accountingStrategyService;
+ @Autowired
+ private TAccountingStrategyDetailService accountingStrategyDetailService;
+
+ @Resource
+ private ChargingOrderClient chargingOrderClient;
+
+ @Resource
+ private SysUserRoleClient userRoleClient;
+
+
+
+ /**
+ * 根据站点id 查询所有充电桩
+ * @param siteId
+ * @return
+ */
+ @GetMapping("/getPileListBySiteId/{siteId}")
+ public R<List<TChargingPile>> getPileListBySiteId(@PathVariable("siteId")Integer siteId){
+
+ return R.ok(chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, siteId).list());
+ }
+ /**
+ * 小程序扫一扫
+ * @param number
+ * @return
+ */
+ @GetMapping("/getSiteInfoByNumber")
+ @ApiOperation(value = "扫一扫后通过桩编号获取电站信息", tags = {"小程序-扫一扫"})
+ public R<SiteInfoVO> getSiteInfoByNumber(@RequestParam("number") String number){
+ SiteInfoVO siteInfoVO = new SiteInfoVO();
+ String chargingPileCode = number.substring(0, number.length() - 2);
+ String chargingGunCode = number.substring(number.length() - 2);
+ TChargingPile one = chargingPileService.lambdaQuery().eq(TChargingPile::getCode, chargingPileCode).one();
+ TChargingGun chargingGun = chargingGunService.getOne(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getCode, chargingGunCode).eq(TChargingGun::getChargingPileId, one.getId()));
+ Site byId = siteService.getById(one.getSiteId());
+ TAccountingStrategy byId1 = accountingStrategyService.getById(byId.getAccountingStrategyId());
+ List<TAccountingStrategyDetail> list = accountingStrategyDetailService.lambdaQuery().eq(TAccountingStrategyDetail::getAccountingStrategyId, byId1.getId()).list();
+ for (TAccountingStrategyDetail tAccountingStrategyDetail : list) {
+ // 当前时间属于那个阶段 取哪个阶段的电价
+ if(LocalTime.now().isAfter(LocalTime.parse(tAccountingStrategyDetail.getStartTime())) && LocalTime.now().isBefore(LocalTime.parse(tAccountingStrategyDetail.getEndTime()))){
+ siteInfoVO.setElectrovalence(tAccountingStrategyDetail.getElectrovalence());
+ if(null != byId1.getDiscount()){
+ siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().multiply(byId1.getDiscount()).setScale(4, BigDecimal.ROUND_HALF_UP));
+ }else{
+ siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence());
+ }
+ }
+ }
+ siteInfoVO.setChargingGunId(chargingGun.getId());
+ siteInfoVO.setChargingPileId(one.getId());
+ siteInfoVO.setName(byId.getName());
+ siteInfoVO.setNumber(one.getNumber().toString());
+ siteInfoVO.setSpaceChargeExplain(byId.getSpaceChargeExplain());
+ return R.ok(siteInfoVO);
+ }
+ /**
+ * 通过桩编号获取电站信息 遠程調用
+ * @param number
+ * @return
+ */
+ @PostMapping("/getSiteInfoByNumber1")
+ 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());
+ List<TAccountingStrategyDetail> list = accountingStrategyDetailService.lambdaQuery().eq(TAccountingStrategyDetail::getAccountingStrategyId, byId1.getId()).list();
+ for (TAccountingStrategyDetail tAccountingStrategyDetail : list) {
+ // 当前时间属于那个阶段 取哪个阶段的电价
+ if(LocalTime.now().isAfter(LocalTime.parse(tAccountingStrategyDetail.getStartTime())) && LocalTime.now().isBefore(LocalTime.parse(tAccountingStrategyDetail.getEndTime()))){
+ siteInfoVO.setElectrovalence(tAccountingStrategyDetail.getElectrovalence());
+ if(null != byId1.getDiscount()){
+ siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().multiply(byId1.getDiscount()).setScale(4, BigDecimal.ROUND_HALF_UP));
+ }else{
+ siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence());
+ }
+ }
+ }
+ siteInfoVO.setChargingPileId(one.getId());
+ siteInfoVO.setName(byId.getName());
+ siteInfoVO.setNumber(one.getNumber().toString());
+ siteInfoVO.setSpaceChargeExplain(byId.getSpaceChargeExplain());
+ return R.ok(siteInfoVO);
+ }
-
-
-
- @ResponseBody
@GetMapping("/getSiteList")
@ApiOperation(value = "获取站点列表", tags = {"管理后台-站点管理"})
public AjaxResult<PageInfo<GetSiteListDTO>> getSiteList(GetSiteList siteList){
PageInfo<GetSiteListDTO> list = siteService.getSiteList(siteList);
return AjaxResult.success(list);
}
-
- @ApiOperation(value = "获取站点分页列表", tags = {"小程序-站点管理"})
- @PostMapping("/pageList")
- public AjaxResult<PageInfo<SiteVO>> pageList(@Validated @RequestBody SiteQuery query){
- return AjaxResult.success(siteService.pageList(query));
+
+
+ @GetMapping("/getSiteList/byUserId")
+ @ApiOperation(value = "获取站点列表", tags = {"管理后台-站点管理"})
+ public R<List<GetSiteListDTO>> getSiteListByUserId(@RequestParam("userId") Long userId){
+ PageInfo<GetSiteListDTO> list = siteService.getSiteList1(userId);
+ return R.ok(list.getRecords());
}
+
+
+ @GetMapping("/map/getSiteList")
+ @ApiOperation(value = "获取站点", tags = {"管理后台-数据分析-电站分析"})
+ public R<List<GetSiteListDTO>> getMapSiteList(GetSiteList siteList){
+
+ siteList.setPageCurr(1);
+ siteList.setPageSize(99999);
+ PageInfo<GetSiteListDTO> list = siteService.getSiteList(siteList);
+ for (GetSiteListDTO record : list.getRecords()) {
+ Long count = chargingGunService.lambdaQuery().eq(TChargingGun::getChargingPileId, record.getId()).eq(TChargingGun::getChargeMode, 1).eq(TChargingGun::getStatus, new int[]{3, 4, 5, 6}).count();
+ record.setC1(count);
+ Long count1 = chargingGunService.lambdaQuery().eq(TChargingGun::getChargingPileId, record.getId()).eq(TChargingGun::getChargeMode, 1).eq(TChargingGun::getStatus, 2).count();
+ record.setC2(count1);
+ Long count2 = chargingGunService.lambdaQuery().eq(TChargingGun::getChargingPileId, record.getId()).eq(TChargingGun::getChargeMode, 2).eq(TChargingGun::getStatus, new int[]{3, 4, 5, 6}).count();
+ record.setK1(count2);
+ Long count3 = chargingGunService.lambdaQuery().eq(TChargingGun::getChargingPileId, record.getId()).eq(TChargingGun::getChargeMode, 2).eq(TChargingGun::getStatus, 2).count();
+ record.setK2(count3);
+ Long count4 = chargingGunService.lambdaQuery().eq(TChargingGun::getChargingPileId, record.getId()).eq(TChargingGun::getChargeMode, 3).eq(TChargingGun::getStatus, new int[]{3, 4, 5, 6}).count();
+ record.setM1(count4);
+ Long count5 = chargingGunService.lambdaQuery().eq(TChargingGun::getChargingPileId, record.getId()).eq(TChargingGun::getChargeMode, 3).eq(TChargingGun::getStatus, 2).count();
+ record.setM2(count5);
+
+ //利用率
+ BigDecimal bigDecimal = new BigDecimal("0");
+ //获取该站点的总充电度数
+ List<TChargingOrder> chargingOrders = chargingOrderClient.getList(record.getId()).getData();
+ for (TChargingOrder chargingOrder : chargingOrders) {
+ bigDecimal = bigDecimal.add(chargingOrder.getChargingCapacity());
+ }
+ //获取该站点的所有充电桩
+ List<TChargingPile> chargingPiles = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, record.getId()).list();
+ BigDecimal bigDecimal1 = new BigDecimal("0");
+ for (TChargingPile chargingPile : chargingPiles) {
+ bigDecimal1 = bigDecimal1.add(chargingPile.getRatedPower());
+ }
+ BigDecimal multiply = bigDecimal1.multiply(new BigDecimal("24"));
+
+ BigDecimal divide = bigDecimal.divide(multiply, 0, BigDecimal.ROUND_HALF_UP);
+ record.setP1(divide);
+
+ }
+ return R.ok(list.getRecords());
+ }
+
+
+ @GetMapping("/map/getPercent")
+ @ApiOperation(value = "获取该充电站的利用率", tags = {"管理后台-数据分析-电站分析"})
+ public R getPercent(Integer siteId){
+ BigDecimal bigDecimal = new BigDecimal("0");
+ //获取该站点的总充电度数
+ List<TChargingOrder> chargingOrders = chargingOrderClient.getList(siteId).getData();
+ for (TChargingOrder chargingOrder : chargingOrders) {
+ bigDecimal = bigDecimal.add(chargingOrder.getChargingCapacity());
+ }
+ //获取该站点的所有充电桩
+ List<TChargingPile> chargingPiles = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, siteId).list();
+ BigDecimal bigDecimal1 = new BigDecimal("0");
+ for (TChargingPile chargingPile : chargingPiles) {
+ bigDecimal1 = bigDecimal1.add(chargingPile.getRatedPower());
+ }
+ BigDecimal multiply = bigDecimal1.multiply(new BigDecimal("24"));
+
+ BigDecimal divide = bigDecimal.divide(multiply, 0, BigDecimal.ROUND_HALF_UP);
+
+
+ return R.ok(divide);
+ }
+
+
+
+
+ @PostMapping("/map/getPercentByprovinceCode")
+ @ApiOperation(value = "获取该充电站的利用率", tags = {"管理后台-数据分析-电站分析"})
+ public R getPercentByCityCode(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto){
+
+ if (chargingPercentProvinceDto.getDate1()==null){
+ LocalDate today = LocalDate.now();
+ LocalDate lastMonth = today.minusMonths(1);
+ LocalDate firstDayOfLastMonth = lastMonth.withDayOfMonth(1);
+ LocalDate lastDayOfLastMonth =lastMonth.withDayOfMonth(lastMonth.lengthOfMonth());
+ chargingPercentProvinceDto.setDate1(firstDayOfLastMonth);
+ chargingPercentProvinceDto.setDate2(lastDayOfLastMonth);
+ }
+
+
+
+ GetSiteList siteList = new GetSiteList();
+ siteList.setProvinceCode(chargingPercentProvinceDto.getProvinceCode());
+ siteList.setPageCurr(1);
+ siteList.setPageCurr(9999);
+ ChargingPercentBack chargingPercentBack = new ChargingPercentBack();
+
+ //通过省编码获取充电站id
+ List<GetSiteListDTO> records = siteService.getSiteList(siteList).getRecords();
+ List<Integer> collect = records.stream().map(GetSiteListDTO::getId).collect(Collectors.toList());
+ // 通过时间段获取和充电桩id获取各个充电站的充电订单
+ List<ChargingOrderGroup> data = chargingOrderClient.getBySiteIdAndTime(chargingPercentProvinceDto).getData();
+ // 计算利用率展示
+ for (ChargingOrderGroup datum : data) {
+ List<TChargingPile> chargingPiles = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, datum.getSiteId()).list();
+ BigDecimal bigDecimal1 = new BigDecimal("0");
+ for (TChargingPile chargingPile : chargingPiles) {
+ bigDecimal1 = bigDecimal1.add(chargingPile.getRatedPower());
+ }
+
+ long daysBetween = ChronoUnit.DAYS.between(chargingPercentProvinceDto.getDate1(), chargingPercentProvinceDto.getDate2()) + 1;
+ BigDecimal multiply = bigDecimal1.multiply(new BigDecimal("24")).multiply(BigDecimal.valueOf(daysBetween));
+ //得到利用率
+ BigDecimal divide = datum.getChargingCapacity().divide(multiply, 0, BigDecimal.ROUND_HALF_UP);
+ //如果利用率大于等于10
+ if (divide.compareTo(BigDecimal.valueOf(10))>=0){
+ chargingPercentBack.setCount1(chargingPercentBack.getCount1()+1);
+ }
+
+ //如果利用率大于等于5小于10
+ if (divide.compareTo(BigDecimal.valueOf(5))>=0 && divide.compareTo(BigDecimal.valueOf(10))<0){
+ chargingPercentBack.setCount2(chargingPercentBack.getCount2()+1);
+ }
+ //如果利用率大于等于1小于5
+ if (divide.compareTo(BigDecimal.valueOf(1))>=0 && divide.compareTo(BigDecimal.valueOf(5))<0){
+ chargingPercentBack.setCount3(chargingPercentBack.getCount3()+1);
+ }
+ //如果利用率小于1
+ if (divide.compareTo(BigDecimal.valueOf(1))<0){
+ chargingPercentBack.setCount4(chargingPercentBack.getCount4()+1);
+ }
+
+ }
+ return R.ok(chargingPercentBack);
+ }
+
+
+ @GetMapping("/getSiteList1")
+ @ApiOperation(value = "获取站点列表 不分页", tags = {"管理后台-活动费用统计"})
+ public AjaxResult<List<Site>> getSiteList1(){
+ return AjaxResult.success(siteService.list(new QueryWrapper<>()));
+ }
+
+ @GetMapping("/getSiteListGun")
+ @ApiOperation(value = "获取站点列表 不分页", tags = {"管理后台-接口信息使用"})
+ public AjaxResult<List<Site>> getSiteListGun(){
+ return AjaxResult.success(siteService.getSiteListGun());
+ }
+
+ @GetMapping("/getSiteListParkLot")
+ @ApiOperation(value = "获取站点列表不分页", tags = {"管理后台-停车场绑定"})
+ public AjaxResult<List<Site>> getSiteListParkLot(){
+ return AjaxResult.success(siteService.getSiteListParkLot());
+ }
+ @ApiOperation(value = "获取站点分页列表", tags = {"小程序-站点管理-首页"})
+ @PostMapping("/pageList")
+ public AjaxResult<PageInfo<SiteVO>> pageList(@Validated @RequestBody SiteQuery query, HttpServletRequest request){
+ int isLogin = StringUtils.isEmpty(SecurityUtils.getToken(request)) ? 0 : 1;
+ return AjaxResult.success(siteService.pageList(query,isLogin));
+ }
+
+ @ApiOperation(value = "获取站点列表", tags = {"小程序-站点管理-地图导航站点"})
+ @PostMapping("/getMapSiteList")
+ public AjaxResult<List<SiteVO>> getMapSiteList(@Validated @RequestBody SiteQuery query){
+ return AjaxResult.success(siteService.getMapSiteList(query));
+ }
@ApiOperation(value = "获取站点详细信息", tags = {"小程序-站点管理-站点详情"})
@PostMapping("/getDetailById")
public AjaxResult<SiteDetailVO> getDetailById(@Validated @RequestBody SiteDetailQuery query){
- SiteDetailVO siteDetailVO = siteService.getDetailById(query.getSiteId());
+ SiteDetailVO siteDetailVO = siteService.getDetailById(query);
+ // 查询合作商名称
+ Partner partner = partnerService.getById(siteDetailVO.getPartnerId());
+ if(Objects.nonNull(partner)){
+ siteDetailVO.setPartnerName(partner.getName());
+ }
// 计算距离
- Map<String, Double> distance = GeodesyUtil.getDistance(query.getLat() + "," + query.getLon(), siteDetailVO.getLat() + "," + siteDetailVO.getLon());
- siteDetailVO.setDistance(distance.get("WGS84"));
- // TODO 查询绑定车牌提示文案
+// Map<String, Double> distance = GeodesyUtil.getDistance(query.getLat() + "," + query.getLon(), siteDetailVO.getLat() + "," + siteDetailVO.getLon());
+// siteDetailVO.setDistance(distance.get("WGS84"));
+ // 查询绑定车牌提示文案
+ TParkingLot parkingLot = parkingLotService.getOne(Wrappers.lambdaQuery(TParkingLot.class)
+ .eq(TParkingLot::getSiteId, query.getSiteId()));
+ if(Objects.nonNull(parkingLot)){
+ siteDetailVO.setRemark(parkingLot.getRemark());
+ }
return AjaxResult.success(siteDetailVO);
}
@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 = "type",required = false)@ApiParam(value = "类型 1=超充，2=快充，3=慢充")Integer type){
+ return AjaxResult.success(chargingPileService.getChargingGunList(siteId,type));
}
- @ApiOperation(value = "获取站点下充电枪数量统计", tags = {"小程序-站点管理-站点详情"})
+ @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));
}
@ResponseBody
- @PostMapping("/getSiteList")
+ @PostMapping("/addSite")
@ApiOperation(value = "添加站点", tags = {"管理后台-站点管理"})
+ @Log(title = "【站点管理】添加站点", businessType = BusinessType.INSERT)
public AjaxResult addSite(@RequestBody Site site){
return siteService.addSite(site);
}
+
+
+ @ResponseBody
+ @PostMapping("/getSiteInfo/{id}")
+ @ApiOperation(value = "获取站点详情", tags = {"管理后台-站点管理"})
+ public AjaxResult<Site> getSiteInfo(@PathVariable Integer id){
+ Site site = siteService.getById(id);
+ return AjaxResult.success(site);
+ }
+
+
+
@ResponseBody
@PostMapping("/editSite")
@ApiOperation(value = "编辑站点", tags = {"管理后台-站点管理"})
+ @Log(title = "【站点管理】编辑站点", businessType = BusinessType.UPDATE)
public AjaxResult editSite(@RequestBody Site site){
return siteService.editSite(site);
}
@ResponseBody
- @DeleteMapping("/delSite/{id}")
+ @DeleteMapping("/delSite")
@ApiOperation(value = "删除站点", tags = {"管理后台-站点管理"})
@ApiImplicitParams({
@ApiImplicitParam(value = "站点id", name = "id", dataTypeClass = Integer.class, required = true)
})
- public AjaxResult delSite(@PathVariable Integer[] id){
+ @Log(title = "【站点管理】删除站点", businessType = BusinessType.DELETE)
+ public AjaxResult delSite(@RequestParam("id") Integer[] id){
return siteService.delSite(id);
}
@@ -140,6 +424,7 @@
@ApiImplicitParam(value = "站点id", name = "id", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(value = "计费策略id", name = "accountingStrategyId", dataTypeClass = Integer.class, required = true)
})
+ @Log(title = "【站点管理】设置站点计费策略", businessType = BusinessType.OTHER)
public AjaxResult setAccountingStrategy(@PathVariable("id") Integer id, @RequestParam("accountingStrategyId") Integer accountingStrategyId){
siteService.setAccountingStrategy(id, accountingStrategyId);
return AjaxResult.success();
@@ -148,7 +433,7 @@
@ResponseBody
@GetMapping("/getAllSiteList")
- @ApiOperation(value = "获取所有站点数据", tags = {"管理后台-充电桩信息", "管理后台-系统用户管理", "管理后台-角色管理", "管理后台-系统通知"})
+ @ApiOperation(value = "获取所有站点数据", tags = {"管理后台-充电桩信息", "管理后台-系统用户管理", "管理后台-角色管理", "管理后台-系统通知", "管理后台-充电评价"})
public AjaxResult<List<Site>> getAllSiteList(){
//校验当前账户站点权限
SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
@@ -162,7 +447,8 @@
//非管理员需要根据角色和用户配置查询允许的站点数据
if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
- List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).getData();
+ List<SysUserRoleVo> data2 = userRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
+ List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
data.addAll(data1);
Set<Integer> list = new HashSet<>(data);
wrapper.in(Site::getId, list);
@@ -181,7 +467,19 @@
@ResponseBody
@PostMapping("/getSiteByIds")
public R<List<Site>> getSiteByIds(@RequestBody List<Integer> ids){
- List<Site> sites = siteService.listByIds(ids);
+ List<Site> sites = siteService.list(new LambdaQueryWrapper<Site>().in(Site::getId, ids).eq(Site::getDelFlag, 0));
return R.ok(sites);
}
+
+
+ /**
+ * 获取所有站点数据
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/getSiteAll")
+ public R<List<Site>> getSiteAll(){
+ List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getDelFlag, 0));
+ return R.ok(list);
+ }
}
--
Gitblit v1.7.1