From f385332c4e6e67fa9d49ff92df8c742ce4fe1a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Thu, 19 Sep 2024 00:25:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Apark=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CmsNavigationController.java | 51 ++++++++++--------- .../common/core/config/MybatisPlusConfig.java | 3 +- .../controller/UserGradeController.java | 6 --- .../system/mapper/xml/OrganizationMapper.xml | 3 ++ .../system/param/OrganizationParam.java | 4 ++ 5 files changed, 35 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsNavigationController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsNavigationController.java index ed1444a..2151094 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/CmsNavigationController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/CmsNavigationController.java @@ -1,6 +1,7 @@ package com.gxwebsoft.cms.controller; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.gxwebsoft.cms.entity.CmsDesign; import com.gxwebsoft.cms.mapper.CmsNavigationMapper; @@ -37,8 +38,6 @@ public class CmsNavigationController extends BaseController { @Resource private CmsNavigationService cmsNavigationService; @Resource - private CmsNavigationMapper cmsNavigationMapper; - @Resource private CmsDesignService cmsDesignService; @ApiOperation("分页查询网站导航记录表") @@ -130,28 +129,30 @@ public class CmsNavigationController extends BaseController { return success(CommonUtil.toTreeData(navigations, 0, CmsNavigation::getParentId, CmsNavigation::getNavigationId, CmsNavigation::setChildren)); } -// @ApiOperation("根据path获取导航") -// @GetMapping("/getCmsNavigationByPath") -// public ApiResult getCmsNavigationByPath(CmsNavigationParam param) { -// final List navigations = cmsNavigationService.listRel(param); -// final CmsNavigation one = cmsNavigationService.getOne(new LambdaUpdateWrapper().eq(CmsNavigation::getPath, param.getPath()).last("limit 1")); -// System.out.println("one = " + one); -// // 页面元素 -// final CmsDesign design = cmsDesignService.getOne(new LambdaUpdateWrapper().eq(CmsDesign::getCategoryId,one.getNavigationId()).last("limit 1")); -// System.out.println("design = " + design); -// // 上级导航 -// if (!navigation.getParentId().equals(0)) { -// final CmsNavigation parent = cmsNavigationService.getById(navigation.getParentId()); -// navigation.setParentPath(parent.getPath()); -// navigation.setParentName(parent.getTitle()); -// } -// // 页面信息 -// navigation.setDesign(design); -// // 页面布局 -// if (ObjectUtil.isNotEmpty(design)) { -// navigation.setLayout(design.getLayout()); -// } -// return success(navigation); -// } + @ApiOperation("根据path获取导航") + @GetMapping("/getNavigationByPath") + public ApiResult getNavigationByPath(CmsNavigationParam param) { + final CmsNavigation one = cmsNavigationService.getOne(new LambdaUpdateWrapper().eq(CmsNavigation::getPath, param.getPath()).last("limit 1")); + + System.out.println("one = " + one); + final CmsNavigation navigation = cmsNavigationService.getOne(new LambdaQueryWrapper().eq(CmsNavigation::getPath, param.getPath()).last("limit 1")); + System.out.println("navigation = " + navigation); + // 页面元素 + final CmsDesign design = cmsDesignService.getOne(new LambdaUpdateWrapper().eq(CmsDesign::getCategoryId,one.getNavigationId()).last("limit 1")); + System.out.println("design = " + design); + // 上级导航 + if (!navigation.getParentId().equals(0)) { + final CmsNavigation parent = cmsNavigationService.getById(navigation.getParentId()); + navigation.setParentPath(parent.getPath()); + navigation.setParentName(parent.getTitle()); + } + // 页面信息 + navigation.setDesign(design); + // 页面布局 + if (ObjectUtil.isNotEmpty(design)) { + navigation.setLayout(design.getLayout()); + } + return success(navigation); + } } diff --git a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java index 317c402..dab9091 100644 --- a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java +++ b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java @@ -77,7 +77,8 @@ public class MybatisPlusConfig { "cms_website", "cms_domain", "cms_website_field", - "cms_navigation" + "cms_navigation", + "cms_design" ).contains(tableName); } }; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserGradeController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserGradeController.java index 1561bf1..358eea9 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/UserGradeController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/UserGradeController.java @@ -29,8 +29,6 @@ public class UserGradeController extends BaseController { @Resource private UserGradeService userGradeService; - @PreAuthorize("hasAuthority('sys:userGrade:list')") - @OperationLog @ApiOperation("分页查询用户会员等级表") @GetMapping("/page") public ApiResult> page(UserGradeParam param) { @@ -38,8 +36,6 @@ public class UserGradeController extends BaseController { return success(userGradeService.pageRel(param)); } - @PreAuthorize("hasAuthority('sys:userGrade:list')") - @OperationLog @ApiOperation("查询全部用户会员等级表") @GetMapping() public ApiResult> list(UserGradeParam param) { @@ -47,8 +43,6 @@ public class UserGradeController extends BaseController { return success(userGradeService.listRel(param)); } - @PreAuthorize("hasAuthority('sys:userGrade:list')") - @OperationLog @ApiOperation("根据id查询用户会员等级表") @GetMapping("/{id}") public ApiResult get(@PathVariable("id") Integer id) { diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml index ac85a15..3366867 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml @@ -56,6 +56,9 @@ AND a.zip_code = #{param.zipCode} + + AND a.park = #{param.park} + AND a.leader_id = #{param.leaderId} diff --git a/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java b/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java index 97a7c62..1849d88 100644 --- a/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java +++ b/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java @@ -59,6 +59,10 @@ public class OrganizationParam extends BaseParam { @QueryField(type = QueryType.EQ) private String zipCode; + @ApiModelProperty(value = "所属园区") + @QueryField(type = QueryType.EQ) + private String park; + @ApiModelProperty(value = "负责人id") @QueryField(type = QueryType.EQ) private Integer leaderId;