From a3ded5d8e0c4f750fb4ad190e165ddeb8446f05a Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 09 八月 2024 16:47:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 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 6bb56a7..d740784 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,13 +1,19 @@
package com.ruoyi.chargingPile.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.query.GetSiteList;
import com.ruoyi.chargingPile.api.query.SiteQuery;
import com.ruoyi.chargingPile.api.vo.SiteVO;
+import com.ruoyi.chargingPile.domain.SiteMenu;
+import com.ruoyi.chargingPile.service.IPartnerService;
import com.ruoyi.chargingPile.service.ISiteService;
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.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;
@@ -15,6 +21,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* @author zhibing.pu
@@ -26,6 +33,17 @@
@Resource
private ISiteService siteService;
+
+ @Resource
+ private IPartnerService partnerService;
+
+ @Resource
+ private SysUserClient sysUserClient;
+
+
+
+
+
@ResponseBody
@@ -59,7 +77,7 @@
@ResponseBody
@DeleteMapping("/delSite/{id}")
- @ApiOperation(value = "编辑站点", tags = {"管理后台-站点管理"})
+ @ApiOperation(value = "删除站点", tags = {"管理后台-站点管理"})
@ApiImplicitParams({
@ApiImplicitParam(value = "站点id", name = "id", dataTypeClass = Integer.class, required = true)
})
@@ -68,7 +86,33 @@
}
+ @ResponseBody
+ @PostMapping("/setAccountingStrategy/{id}")
+ @ApiOperation(value = "设置站点计费策略", tags = {"管理后台-站点管理"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "站点id", name = "id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(value = "计费策略id", name = "accountingStrategyId", dataTypeClass = Integer.class, required = true)
+ })
+ public AjaxResult setAccountingStrategy(@PathVariable("id") Integer id, @RequestParam("accountingStrategyId") Integer accountingStrategyId){
+ siteService.setAccountingStrategy(id, accountingStrategyId);
+ return AjaxResult.success();
+ }
-
+ @ResponseBody
+ @GetMapping("/getAllSiteList")
+ @ApiOperation(value = "获取所有站点数据", tags = {"管理后台-充电桩信息"})
+ public AjaxResult<List<Site>> getAllSiteList(){
+ //校验当前账户站点权限
+ 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){
+ List<Integer> list = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
+ wrapper.in(Site::getId, list);
+ }
+ List<Site> list = siteService.list(wrapper.orderByDesc(Site::getCreateTime));
+ return AjaxResult.success(list);
+ }
}
--
Gitblit v1.7.1