From 67d06a785d5fc4524639ace27651c01ff05a4b58 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期四, 29 五月 2025 22:31:33 +0800 Subject: [PATCH] 修改bug --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TRoleSiteController.java | 64 +++++++++++++++++++++++++++++++- 1 files changed, 62 insertions(+), 2 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TRoleSiteController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TRoleSiteController.java index 0fa48ec..7a1f511 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TRoleSiteController.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TRoleSiteController.java @@ -1,9 +1,17 @@ package com.ruoyi.other.controller; -import org.springframework.web.bind.annotation.RequestMapping; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.ruoyi.chargingPile.api.feignClient.SiteClient; +import com.ruoyi.chargingPile.api.model.Site; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.other.api.domain.TRoleSite; +import com.ruoyi.other.service.TRoleSiteService; +import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; /** * <p> @@ -17,5 +25,57 @@ @RequestMapping("/t-role-site") public class TRoleSiteController { + @Resource + private TRoleSiteService roleSiteService; + + @Resource + private SiteClient siteClient; + + + + /** + * 查询角色站点数据 + * @param roleId + * @return + */ + @ResponseBody + @PostMapping("/getSiteIds/{roleId}") + public R<List<Integer>> getSiteIds(@PathVariable Long roleId){ + List<TRoleSite> list = roleSiteService.list(new LambdaQueryWrapper<TRoleSite>().eq(TRoleSite::getRoleId, roleId)); + if(list.size() == 1){ + Integer siteId = list.get(0).getSiteId(); + if(0 == siteId){ + List<Site> data = siteClient.getSiteAll().getData(); + List<Integer> collect = data.stream().map(Site::getId).collect(Collectors.toList()); + return R.ok(collect); + } + } + List<Integer> collect = list.stream().map(TRoleSite::getSiteId).collect(Collectors.toList()); + return R.ok(collect); + } + + /** + * 添加角色站点数据 + * @param roleSites + * @return + */ + @ResponseBody + @PostMapping("/addRoleSite") + public R addRoleSite(@RequestBody List<TRoleSite> roleSites){ + roleSiteService.saveBatch(roleSites); + return R.ok(); + } + + /** + * 删除角色站点数据 + * @param roleId + * @return + */ + @ResponseBody + @DeleteMapping("/delRoleSite/{roleId}") + public R delRoleSite(@PathVariable("roleId") Long roleId){ + roleSiteService.remove(new LambdaQueryWrapper<TRoleSite>().eq(TRoleSite::getRoleId, roleId)); + return R.ok(); + } } -- Gitblit v1.7.1