From dcd97d683792b5d47cc13966b24e3bbb92ee9854 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 11 十二月 2024 19:11:36 +0800
Subject: [PATCH] 修改安全相关功能和合作商权限功能
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java
index 8494f33..64d447b 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java
@@ -1,13 +1,12 @@
package com.ruoyi.chargingPile.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.ruoyi.chargingPile.api.dto.GetPermissionConfigurationDTO;
import com.ruoyi.chargingPile.api.dto.PartnerListDTO;
import com.ruoyi.chargingPile.api.model.Partner;
import com.ruoyi.chargingPile.api.query.GetPartnerList;
import com.ruoyi.chargingPile.api.query.SetPermissionConfiguration;
-import com.ruoyi.chargingPile.domain.SiteMenu;
+import com.ruoyi.chargingPile.api.domain.SiteMenu;
import com.ruoyi.chargingPile.dto.ResetPassword;
import com.ruoyi.chargingPile.service.IPartnerService;
import com.ruoyi.common.core.domain.R;
@@ -15,6 +14,8 @@
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.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
@@ -41,10 +42,11 @@
@Resource
private SysUserClient sysUserClient;
-
+
+ @RequiresPermissions(value = {"/balanceSheetRecord", "/partners", "/chargingPile/add", "/chargingPile/select", "/chargingPile/update"}, logical = Logical.OR)
@ResponseBody
@GetMapping("/getPartnerList")
@ApiOperation(value = "获取合作商列表", tags = {"管理后台-合作商管理"})
@@ -54,6 +56,8 @@
}
+
+ @RequiresPermissions(value = {"/partners/add"}, logical = Logical.OR)
@ResponseBody
@PostMapping("/addPartner")
@ApiOperation(value = "添加合作商", tags = {"管理后台-合作商管理"})
@@ -64,6 +68,7 @@
+ @RequiresPermissions(value = {"/partners/seleete", "/partners/update"}, logical = Logical.OR)
@ResponseBody
@GetMapping("/getPartner/{id}")
@ApiOperation(value = "获取合作商详情", tags = {"管理后台-合作商管理", "管理后台-充电桩信息"})
@@ -74,6 +79,9 @@
Partner partner = partnerService.getPartner(id);
return AjaxResult.success(partner);
}
+
+
+
@ResponseBody
@GetMapping("/getPartnerR/{id}")
public R<Partner> getPartnerR(@PathVariable("id") Integer id){
@@ -83,6 +91,7 @@
+ @RequiresPermissions(value = {"/partners/update"}, logical = Logical.OR)
@ResponseBody
@PostMapping("/editPartner")
@ApiOperation(value = "编辑合作商", tags = {"管理后台-合作商管理"})
@@ -93,6 +102,7 @@
+ @RequiresPermissions(value = {"/partners/del"}, logical = Logical.OR)
@ResponseBody
@DeleteMapping("/delPartner")
@ApiOperation(value = "删除合作商", tags = {"管理后台-合作商管理"})
@@ -105,6 +115,7 @@
}
+ @RequiresPermissions(value = {"/partners/resetPassword"}, logical = Logical.OR)
@ResponseBody
@PostMapping("/resetPassword")
@ApiOperation(value = "合作商重置密码", tags = {"管理后台-合作商管理"})
@@ -114,6 +125,8 @@
}
+
+ @RequiresPermissions(value = {"/site/add", "/site/update"}, logical = Logical.OR)
@ResponseBody
@GetMapping("/getPartner")
@ApiOperation(value = "获取所有合作商", tags = {"管理后台-站点管理"})
@@ -131,6 +144,8 @@
+
+ @RequiresPermissions(value = {"/site/partner_authority"}, logical = Logical.OR)
@ResponseBody
@GetMapping("/getPermissionConfiguration/{siteId}")
@ApiOperation(value = "获取合作商权限设置", tags = {"管理后台-站点管理"})
@@ -140,6 +155,7 @@
}
+ @RequiresPermissions(value = {"/site/partner_authority"}, logical = Logical.OR)
@ResponseBody
@PostMapping("/setPermissionConfiguration/{siteId}")
@ApiOperation(value = "设置合作商权限", tags = {"管理后台-站点管理"})
@@ -169,7 +185,19 @@
*/
@PostMapping("/authSite/{partnerId}")
public R<Set<Integer>> authSite(@PathVariable("partnerId") Integer partnerId, @RequestParam("siteMenu") String siteMenu){
- Set<Integer> integers = partnerService.authSite(partnerId, SiteMenu.valueOf(siteMenu));
+ Set<Integer> integers = partnerService.authSite(partnerId, SiteMenu.getSiteMenu(siteMenu));
return R.ok(integers);
}
+
+ /**
+ * 判断合作商权限
+ * @param partnerId
+ * @param siteId
+ * @param siteMenu
+ * @return
+ */
+ @PostMapping("/authMenu/{partnerId}")
+ public Boolean authMenu(@PathVariable("partnerId") Integer partnerId, @RequestParam("siteId") Integer siteId, @RequestParam("siteMenu") String siteMenu){
+ return partnerService.authMenu(partnerId, siteId, SiteMenu.getSiteMenu(siteMenu));
+ }
}
--
Gitblit v1.7.1