From 0e1004894fd801da35c5815845fc737f384f9a70 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 十一月 2024 20:30:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 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 3c71cd9..8494f33 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
@@ -7,10 +7,14 @@
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.dto.ResetPassword;
import com.ruoyi.chargingPile.service.IPartnerService;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
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.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
@@ -21,6 +25,7 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.Set;
/**
* @author zhibing.pu
@@ -52,6 +57,7 @@
@ResponseBody
@PostMapping("/addPartner")
@ApiOperation(value = "添加合作商", tags = {"管理后台-合作商管理"})
+ @Log(title = "【合作商列表】添加合作商", businessType = BusinessType.INSERT)
public AjaxResult addPartner(@RequestBody Partner partner){
return partnerService.addPartner(partner);
}
@@ -68,12 +74,19 @@
Partner partner = partnerService.getPartner(id);
return AjaxResult.success(partner);
}
+ @ResponseBody
+ @GetMapping("/getPartnerR/{id}")
+ public R<Partner> getPartnerR(@PathVariable("id") Integer id){
+ Partner partner = partnerService.getPartner(id);
+ return R.ok(partner);
+ }
@ResponseBody
@PostMapping("/editPartner")
@ApiOperation(value = "编辑合作商", tags = {"管理后台-合作商管理"})
+ @Log(title = "【合作商列表】编辑合作商", businessType = BusinessType.UPDATE)
public AjaxResult editPartner(@RequestBody Partner partner){
return partnerService.editPartner(partner);
}
@@ -86,6 +99,7 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "合作商id", name = "id", dataTypeClass = Integer.class, required = true)
})
+ @Log(title = "【合作商列表】删除合作商", businessType = BusinessType.DELETE)
public AjaxResult delPartner(@RequestParam("id") List<Integer> id){
return partnerService.delPartner(id);
}
@@ -94,6 +108,7 @@
@ResponseBody
@PostMapping("/resetPassword")
@ApiOperation(value = "合作商重置密码", tags = {"管理后台-合作商管理"})
+ @Log(title = "【合作商列表】重置合作商密码", businessType = BusinessType.UPDATE)
public AjaxResult resetPassword(@RequestBody ResetPassword resetPassword){
return partnerService.resetPassword(resetPassword);
}
@@ -128,10 +143,33 @@
@ResponseBody
@PostMapping("/setPermissionConfiguration/{siteId}")
@ApiOperation(value = "设置合作商权限", tags = {"管理后台-站点管理"})
+ @Log(title = "【合作商列表】设置合作商权限", businessType = BusinessType.OTHER)
public AjaxResult setPermissionConfiguration(@RequestBody SetPermissionConfiguration req){
partnerService.setPermissionConfiguration(req);
return AjaxResult.success();
}
+ /**
+ * 根据id获取合作商信息
+ * @param id
+ * @return
+ */
+ @PostMapping("/getPartnerById/{id}")
+ public R<Partner> getPartnerById(@PathVariable("id") Integer id){
+ Partner partner = partnerService.getPartner(id);
+ return R.ok(partner);
+ }
+
+ /**
+ * 获取合作商授权的站点数据
+ * @param partnerId
+ * @param siteMenu
+ * @return
+ */
+ @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));
+ return R.ok(integers);
+ }
}
--
Gitblit v1.7.1