Merge remote-tracking branch 'origin/master'

xuhy

2024-08-09 96249691045b3c0ad7858384c16be33d34636a96

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java

@@ -4,11 +4,18 @@
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.SiteDetailQuery;
import com.ruoyi.chargingPile.api.query.SiteQuery;
import com.ruoyi.chargingPile.api.vo.SiteDetailVO;
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;
@@ -28,6 +35,17 @@
   
   @Resource
   private ISiteService siteService;
	
   @Resource
   private IPartnerService partnerService;
	
   @Resource
   private SysUserClient sysUserClient;
	
	
	
	
	


   @ResponseBody
@@ -42,6 +60,15 @@
   @PostMapping("/pageList")
   public AjaxResult<PageInfo<SiteVO>> pageList(@Validated @RequestBody SiteQuery query){
      return AjaxResult.success(siteService.pageList(query));
   }

   @ApiOperation(value = "获取站点详细信息", tags = {"小程序-站点管理"})
   @GetMapping("/getDetailById")
   public AjaxResult<SiteDetailVO> getDetailById(@Validated @RequestBody SiteDetailQuery query){
      SiteDetailVO siteDetailVO = siteService.getDetailById(query.getSiteId());

      // TODO 查询绑定车牌提示文案
      return AjaxResult.success(siteDetailVO);
   }

   
@@ -87,8 +114,16 @@
   @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){
         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);
   }
}