From 7085ba24d8decee4b13c86a55b93a3bcc4ea0d03 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 23 八月 2024 09:27:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TRoleSiteController.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 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 9be842e..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
@@ -2,6 +2,8 @@
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;
@@ -26,15 +28,54 @@
@Resource
private TRoleSiteService roleSiteService;
+ @Resource
+ private SiteClient siteClient;
+
+
+ /**
+ * 查询角色站点数据
+ * @param roleId
+ * @return
+ */
@ResponseBody
- @GetMapping("/getSiteIds")
- public R<List<Integer>> getSiteIds(@RequestParam("roleId") Long roleId){
+ @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