From 67f416634f95c81e618123b826e18a57ae08220d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 17:55:30 +0800
Subject: [PATCH] 11.6
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java
index 95e79f5..d228b05 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java
@@ -3,9 +3,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.admin.entity.Franchisee;
import com.ruoyi.admin.entity.Site;
+import com.ruoyi.admin.service.FranchiseeService;
import com.ruoyi.admin.service.SiteService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.order.api.entity.OrderResultVO;
+import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -27,7 +33,7 @@
*/
@RestController
@RequestMapping("/site")
-@Api( tags = {"后台-系统设置-站点管理"})
+@Api(tags = {"后台-系统设置-站点管理"})
public class SiteController {
@Resource
@@ -39,6 +45,7 @@
* @param pageNum 页码
* @param pageSize 每页显示条数
*/
+ @RequiresPermissions("system_site")
@ApiOperation(value = "站点分页查询列表", tags = {"后台-系统设置-站点管理"})
@GetMapping(value = "/page")
@ApiImplicitParams({
@@ -47,7 +54,39 @@
})
public R<IPage<Site>> queryPageList(@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
- return R.ok(siteService.lambdaQuery().orderByDesc(Site::getCreateTime).page(Page.of(pageNum, pageSize)));
+ return R.ok(siteService.lambdaQuery().orderByDesc(Site::getCreateTime)
+ .eq(Site::getIsDelete, 0).orderByDesc(Site::getSort)
+ .page(Page.of(pageNum, pageSize)));
+ }
+
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private FranchiseeService franchiseeService;
+ /**
+ * 站点列表
+ */
+ @ApiOperation(value = "站点列表", tags = {"后台-系统设置-站点管理"})
+ @GetMapping(value = "/list")
+ public R<List<Site>> list(String siteName) {
+
+ LoginUser loginUser = tokenService.getLoginUser();
+ Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
+ String[] siteIds = new String[0];
+
+ if (franchiseeId!=null) {
+ Franchisee byId = franchiseeService.getById(franchiseeId);
+ siteIds = byId.getSiteIds().split(",");
+ if (loginUser.getIsFranchisee() && siteIds.length == 0) {
+ return R.ok();
+ }
+ }
+
+
+
+ return R.ok(siteService.lambdaQuery().orderByDesc(Site::getSort).in(siteIds.length>0, Site::getId, siteIds).like(siteName!=null&&siteName!="", Site::getSiteName, siteName)
+ .eq(Site::getIsDelete, 0)
+ .list());
}
/**
@@ -55,6 +94,7 @@
*
* @param id 站点id
*/
+ @RequiresPermissions("site_detail")
@ApiOperation(value = "站点详情", tags = {"后台-系统设置-站点管理"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@@ -69,6 +109,7 @@
*
* @param site 站点信息
*/
+ @RequiresPermissions("site_save")
@ApiOperation(value = "新增站点", tags = {"后台-系统设置-站点管理"})
@PostMapping(value = "/save")
public R<String> save(@RequestBody Site site) {
@@ -80,6 +121,7 @@
*
* @param site 站点信息
*/
+ @RequiresPermissions("site_update")
@ApiOperation(value = "修改站点", tags = {"后台-系统设置-站点管理"})
@PostMapping(value = "/update")
public R<String> update(@RequestBody Site site) {
@@ -91,6 +133,7 @@
*
* @param ids 站点多条id拼接
*/
+ @RequiresPermissions("site_delete")
@ApiOperation(value = "批量删除站点", tags = {"后台-系统设置-站点管理"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
--
Gitblit v1.7.1