From 2f226b5b2d80be1eba34d3c641b7cc08be0c322c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 09 八月 2024 10:32:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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 4fac393..5139fdd 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,5 +1,7 @@
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.PartnerListDTO;
import com.ruoyi.chargingPile.api.model.Partner;
import com.ruoyi.chargingPile.api.query.GetPartnerList;
@@ -13,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* @author zhibing.pu
@@ -30,7 +33,7 @@
@ResponseBody
@GetMapping("/getPartnerList")
- @ApiOperation(value = "获取合作商列表", tags = {"管理后台-合作商列表"})
+ @ApiOperation(value = "获取合作商列表", tags = {"管理后台-合作商管理"})
public AjaxResult<PageInfo<PartnerListDTO>> getPartnerList(@RequestBody GetPartnerList partnerList){
PageInfo<PartnerListDTO> list = partnerService.getPartnerList(partnerList);
return AjaxResult.success(list);
@@ -39,7 +42,7 @@
@ResponseBody
@PostMapping("/addPartner")
- @ApiOperation(value = "添加合作商", tags = {"管理后台-合作商列表"})
+ @ApiOperation(value = "添加合作商", tags = {"管理后台-合作商管理"})
public AjaxResult addPartner(@RequestBody Partner partner){
return partnerService.addPartner(partner);
}
@@ -48,11 +51,11 @@
@ResponseBody
@GetMapping("/getPartner/{id}")
- @ApiOperation(value = "添加合作商", tags = {"管理后台-合作商列表"})
+ @ApiOperation(value = "获取合作商详情", tags = {"管理后台-合作商管理", "管理后台-充电桩信息"})
@ApiImplicitParams({
@ApiImplicitParam(value = "合作商id", name = "id", dataTypeClass = Integer.class, required = true)
})
- public AjaxResult<Partner> getPartner(@PathVariable @RequestParam Integer id){
+ public AjaxResult<Partner> getPartner(@PathVariable Integer id){
Partner partner = partnerService.getPartner(id);
return AjaxResult.success(partner);
}
@@ -61,7 +64,7 @@
@ResponseBody
@PostMapping("/editPartner")
- @ApiOperation(value = "编辑合作商", tags = {"管理后台-合作商列表"})
+ @ApiOperation(value = "编辑合作商", tags = {"管理后台-合作商管理"})
public AjaxResult editPartner(@RequestBody Partner partner){
return partnerService.editPartner(partner);
}
@@ -70,20 +73,28 @@
@ResponseBody
@DeleteMapping("/delPartner/{id}")
- @ApiOperation(value = "编辑合作商", tags = {"管理后台-合作商列表"})
+ @ApiOperation(value = "删除合作商", tags = {"管理后台-合作商管理"})
@ApiImplicitParams({
@ApiImplicitParam(value = "合作商id", name = "id", dataTypeClass = Integer.class, required = true)
})
- public AjaxResult delPartner(@PathVariable @RequestParam Integer id){
- partnerService.delPartner(id);
- return AjaxResult.success();
+ public AjaxResult delPartner(@PathVariable("id") Integer id){
+ return partnerService.delPartner(id);
}
@ResponseBody
@PostMapping("/resetPassword")
- @ApiOperation(value = "合作商重置密码", tags = {"管理后台-合作商列表"})
+ @ApiOperation(value = "合作商重置密码", tags = {"管理后台-合作商管理"})
public AjaxResult resetPassword(@RequestBody ResetPassword resetPassword){
return partnerService.resetPassword(resetPassword);
}
+
+
+ @ResponseBody
+ @PostMapping("/getPartner")
+ @ApiOperation(value = "获取所有合作商", tags = {"管理后台-站点管理"})
+ public AjaxResult<List<Partner>> getPartner(){
+ List<Partner> list = partnerService.list(new LambdaQueryWrapper<Partner>().eq(Partner::getDelFlag, 0));
+ return AjaxResult.success(list);
+ }
}
--
Gitblit v1.7.1