From 936dbe1f11369f9e03ef817a114390e6e13219c4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 01 Jun 2022 16:52:29 +0800
Subject: [PATCH] 20220527
---
src/main/java/com/xcong/farmer/cms/modules/system/service/IMenuService.java | 5
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminDeleteDto.java | 13 ++
src/main/java/com/xcong/farmer/cms/modules/system/service/INavigationBarService.java | 3
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java | 37 +++++-
src/main/java/com/xcong/farmer/cms/modules/system/mapper/MenuMapper.java | 6 +
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminNavigationBarVo.java | 2
src/main/java/com/xcong/farmer/cms/modules/system/service/IColumnService.java | 3
src/main/resources/application.properties | 2
src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminNavigationBarController.java | 6 +
src/main/java/com/xcong/farmer/cms/modules/system/service/IUserService.java | 3
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/RoleServiceImpl.java | 41 +++++-
src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminColumnController.java | 6 +
src/main/java/com/xcong/farmer/cms/modules/system/service/IRoleService.java | 3
src/main/java/com/xcong/farmer/cms/modules/system/entity/NavigationBarEntity.java | 2
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/NavigationBarServiceImpl.java | 68 +++++++---
src/main/resources/mapper/NavigationBarMapper.xml | 9 +
src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminArticleController.java | 6 +
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeBarInfoVo.java | 2
src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminRoleController.java | 6 +
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateBarDto.java | 2
src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminUserController.java | 7 +
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 20 +++
src/main/java/com/xcong/farmer/cms/modules/system/service/IArticleService.java | 3
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MenuServiceImpl.java | 52 ++++++++
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeRoleInfoVo.java | 2
src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminMenuController.java | 13 ++
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddBarDto.java | 2
src/main/resources/mapper/MenuMapper.xml | 14 ++
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java | 20 +++
src/main/java/com/xcong/farmer/cms/modules/system/mapper/NavigationBarMapper.java | 2
30 files changed, 317 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminArticleController.java b/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminArticleController.java
index 427e3bb..eee04ed 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminArticleController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminArticleController.java
@@ -53,4 +53,10 @@
public Result updateArticle(@RequestBody @Valid AdminUpdateArticleDto adminUpdateArticleDto) {
return iArticleService.updateArticle(adminUpdateArticleDto);
}
+
+ @ApiOperation(value = "删除文章", notes = "删除文章")
+ @PostMapping(value = "/delObjs")
+ public Result delObjs(@RequestBody @Valid AdminDeleteDto adminDeleteDto) {
+ return iArticleService.delObjs(adminDeleteDto);
+ }
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminColumnController.java b/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminColumnController.java
index e1e58f4..90a073b 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminColumnController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminColumnController.java
@@ -63,4 +63,10 @@
return iColumnService.updateColumn(adminUpdateColumnDto);
}
+ @ApiOperation(value = "删除栏目", notes = "删除栏目")
+ @PostMapping(value = "/delObjs")
+ public Result delObjs(@RequestBody @Valid AdminDeleteDto adminDeleteDto) {
+ return iColumnService.delObjs(adminDeleteDto);
+ }
+
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminMenuController.java b/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminMenuController.java
index 0311888..070ed5e 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminMenuController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminMenuController.java
@@ -33,6 +33,13 @@
return iMenuService.getMenuInPage(adminMenuDto);
}
+ @ApiOperation(value = "系统菜单列表", notes = "系统菜单列表")
+ @ApiResponses({@ApiResponse(code = 200, message = "ok", response = AdminMenuVo.class)})
+ @GetMapping(value = "/menuInList")
+ public Result getMenuInList() {
+ return iMenuService.getMenuInList();
+ }
+
@ApiOperation(value = "添加系统菜单", notes = "添加系统菜单")
@PostMapping(value = "/addMenu")
public Result addMenu(@RequestBody @Valid AdminAddMenuDto adminAddMenuDto) {
@@ -56,4 +63,10 @@
public Result updateMenu(@RequestBody @Valid AdminUpdateMenuDto adminUpdateMenuDto) {
return iMenuService.updateMenu(adminUpdateMenuDto);
}
+
+ @ApiOperation(value = "删除系统菜单", notes = "删除系统菜单")
+ @PostMapping(value = "/delObjs")
+ public Result delObjs(@RequestBody @Valid AdminDeleteDto adminDeleteDto) {
+ return iMenuService.delObjs(adminDeleteDto);
+ }
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminNavigationBarController.java b/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminNavigationBarController.java
index dc1c9c4..f1eeb0a 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminNavigationBarController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminNavigationBarController.java
@@ -62,5 +62,11 @@
return iNavigationBarService.updateBar(adminUpdateMenuDto);
}
+ @ApiOperation(value = "删除导航栏", notes = "删除导航栏")
+ @PostMapping(value = "/delObjs")
+ public Result delObjs(@RequestBody @Valid AdminDeleteDto adminDeleteDto) {
+ return iNavigationBarService.delObjs(adminDeleteDto);
+ }
+
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminRoleController.java b/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminRoleController.java
index bf6952d..62de727 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminRoleController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminRoleController.java
@@ -56,4 +56,10 @@
public Result updateRole(@RequestBody @Valid AdminUpdateRoleDto adminUpdateRoleDto) {
return iRoleService.updateRole(adminUpdateRoleDto);
}
+
+ @ApiOperation(value = "删除系统角色", notes = "更新系统角色")
+ @PostMapping(value = "/delObjs")
+ public Result delObjs(@RequestBody @Valid AdminDeleteDto adminDeleteDto) {
+ return iRoleService.delObjs(adminDeleteDto);
+ }
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminUserController.java b/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminUserController.java
index 83e1d8b..c4b342b 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminUserController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminUserController.java
@@ -2,6 +2,7 @@
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.AdminAddUserDto;
+import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateUserDto;
import com.xcong.farmer.cms.modules.system.dto.AdminUserDto;
import com.xcong.farmer.cms.modules.system.service.IUserService;
@@ -84,4 +85,10 @@
return iUserService.userMenu();
}
+ @ApiOperation(value = "删除系统用户", notes = "删除系统用户")
+ @PostMapping(value = "/delObjs")
+ public Result delObjs(@RequestBody @Valid AdminDeleteDto adminDeleteDto) {
+ return iUserService.delObjs(adminDeleteDto);
+ }
+
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddBarDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddBarDto.java
index 8ad6a58..b2240d1 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddBarDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddBarDto.java
@@ -15,7 +15,7 @@
private String linkUrl;
//描述
@ApiModelProperty(value = "描述")
- private String describe;
+ private String remark;
//排序
@ApiModelProperty(value = "排序")
private Integer orderNum;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminDeleteDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminDeleteDto.java
new file mode 100644
index 0000000..19bbb41
--- /dev/null
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminDeleteDto.java
@@ -0,0 +1,13 @@
+package com.xcong.farmer.cms.modules.system.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "AdminDeleteDto", description = "参数接收类")
+public class AdminDeleteDto {
+
+ @ApiModelProperty(value = "IDS", example = "1,2,3")
+ private String ids;
+}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateBarDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateBarDto.java
index f17b25e..9a1e2eb 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateBarDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateBarDto.java
@@ -16,7 +16,7 @@
private String linkUrl;
//描述
@ApiModelProperty(value = "描述")
- private String describe;
+ private String remark;
//排序
@ApiModelProperty(value = "排序")
private Integer orderNum;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/entity/NavigationBarEntity.java b/src/main/java/com/xcong/farmer/cms/modules/system/entity/NavigationBarEntity.java
index 6a18509..7872f53 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/entity/NavigationBarEntity.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/entity/NavigationBarEntity.java
@@ -20,7 +20,7 @@
//链接地址
private String linkUrl;
//描述
- private String describe;
+ private String remark;
//排序
private Integer orderNum;
//图片
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/mapper/MenuMapper.java b/src/main/java/com/xcong/farmer/cms/modules/system/mapper/MenuMapper.java
index b73e7ba..8c4c131 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/mapper/MenuMapper.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/mapper/MenuMapper.java
@@ -8,9 +8,15 @@
import com.xcong.farmer.cms.modules.system.vo.AdminUserMenuVo;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
public interface MenuMapper extends BaseMapper<MenuEntity> {
IPage<AdminMenuVo> selectAdminMenuVoInPage(Page<AdminMenuVo> page, @Param("record")MenuEntity menuEntity);
AdminUserMenuVo selectAdminRoleMenuVoById(@Param("id")Long parentId);
+
+ List<AdminMenuVo> selectAdminMenuVoInListByParentId(@Param("parentId")Long parentIdDefault);
+
+ MenuEntity selectMenuEntityByIdAndParentId(@Param("menuId")Long menuId, @Param("parentId")Long parentidDefault);
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/mapper/NavigationBarMapper.java b/src/main/java/com/xcong/farmer/cms/modules/system/mapper/NavigationBarMapper.java
index 9116878..a63e11b 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/mapper/NavigationBarMapper.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/mapper/NavigationBarMapper.java
@@ -14,4 +14,6 @@
IPage<AdminNavigationBarVo> selectAdminNavigationBarVoInPage(Page<AdminNavigationBarVo> page, @Param("record")NavigationBarEntity navigationBarEntity);
List<AdminNavigationBarVo> selectAdminNavigationBarVoByParentId(@Param("parentId")Long parentidDefault);
+
+ List<NavigationBarEntity> selectListByParentId(@Param("parentId")Long id);
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/IArticleService.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/IArticleService.java
index 4c7838e..4f8dcb9 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/IArticleService.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/IArticleService.java
@@ -4,6 +4,7 @@
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.AdminAddArticleDto;
import com.xcong.farmer.cms.modules.system.dto.AdminArticleDto;
+import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateArticleDto;
import com.xcong.farmer.cms.modules.system.entity.ArticleEntity;
@@ -18,4 +19,6 @@
Result seeArticleInfo(Long id);
Result updateArticle(AdminUpdateArticleDto adminUpdateArticleDto);
+
+ Result delObjs(AdminDeleteDto adminDeleteDto);
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/IColumnService.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/IColumnService.java
index 1dc6fe5..9eb13e0 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/IColumnService.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/IColumnService.java
@@ -4,6 +4,7 @@
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.AdminAddColumnDto;
import com.xcong.farmer.cms.modules.system.dto.AdminColumnDto;
+import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateColumnDto;
import com.xcong.farmer.cms.modules.system.entity.ColumnEntity;
@@ -20,4 +21,6 @@
Result updateColumn(AdminUpdateColumnDto adminUpdateColumnDto);
Result getColumnInList();
+
+ Result delObjs(AdminDeleteDto adminDeleteDto);
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/IMenuService.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/IMenuService.java
index d1ba9fd..ee9974e 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/IMenuService.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/IMenuService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.AdminAddMenuDto;
+import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
import com.xcong.farmer.cms.modules.system.dto.AdminMenuDto;
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateMenuDto;
import com.xcong.farmer.cms.modules.system.entity.MenuEntity;
@@ -18,4 +19,8 @@
Result seeMenuInfo(Long id);
Result updateMenu(AdminUpdateMenuDto adminUpdateMenuDto);
+
+ Result delObjs(AdminDeleteDto adminDeleteDto);
+
+ Result getMenuInList();
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/INavigationBarService.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/INavigationBarService.java
index 4c43fdb..04069c2 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/INavigationBarService.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/INavigationBarService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.AdminAddBarDto;
+import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
import com.xcong.farmer.cms.modules.system.dto.AdminNavigationBarDto;
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateBarDto;
import com.xcong.farmer.cms.modules.system.entity.NavigationBarEntity;
@@ -20,4 +21,6 @@
Result updateBar(AdminUpdateBarDto adminUpdateMenuDto);
Result getBarInList();
+
+ Result delObjs(AdminDeleteDto adminDeleteDto);
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/IRoleService.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/IRoleService.java
index f6e2a9f..dfe33c7 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/IRoleService.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/IRoleService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.AdminAddRoleDto;
+import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
import com.xcong.farmer.cms.modules.system.dto.AdminRoleDto;
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateRoleDto;
import com.xcong.farmer.cms.modules.system.entity.RoleEntity;
@@ -18,4 +19,6 @@
Result seeRoleInfo(Long id);
Result updateRole(AdminUpdateRoleDto adminUpdateRoleDto);
+
+ Result delObjs(AdminDeleteDto adminDeleteDto);
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/IUserService.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/IUserService.java
index 24c4fe3..42816ec 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/IUserService.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/IUserService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.AdminAddUserDto;
+import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateUserDto;
import com.xcong.farmer.cms.modules.system.dto.AdminUserDto;
import com.xcong.farmer.cms.modules.system.entity.UserEntity;
@@ -26,4 +27,6 @@
Result resetPassword(Long id);
Result userMenu();
+
+ Result delObjs(AdminDeleteDto adminDeleteDto);
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
index 406db92..f0ef2c5 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
@@ -1,14 +1,18 @@
package com.xcong.farmer.cms.modules.system.service.Impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.AdminAddArticleDto;
import com.xcong.farmer.cms.modules.system.dto.AdminArticleDto;
+import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateArticleDto;
import com.xcong.farmer.cms.modules.system.entity.ArticleEntity;
import com.xcong.farmer.cms.modules.system.entity.ColumnEntity;
+import com.xcong.farmer.cms.modules.system.entity.UserRoleEntity;
import com.xcong.farmer.cms.modules.system.mapper.ArticleMapper;
import com.xcong.farmer.cms.modules.system.mapper.ColumnMapper;
import com.xcong.farmer.cms.modules.system.service.IArticleService;
@@ -176,4 +180,20 @@
this.baseMapper.updateById(articleEntity);
return Result.ok("更新成功");
}
+
+ @Override
+ public Result delObjs(AdminDeleteDto adminDeleteDto) {
+ String ids = adminDeleteDto.getIds();
+ if(StrUtil.isNotEmpty(ids)){
+ String[] articleIds = ids.split(StringPool.COMMA);
+ for(String articleIdStr : articleIds){
+ Long articleId = Long.valueOf(articleIdStr);
+
+ ArticleEntity articleEntity = this.baseMapper.selectById(articleId);
+ articleEntity.setDelStatus(ArticleEntity.DELETE_STATUS_YES);
+ this.baseMapper.updateById(articleEntity);
+ }
+ }
+ return Result.ok("删除成功");
+ }
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java
index d0e66ee..602c31f 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java
@@ -3,13 +3,16 @@
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.AdminAddColumnDto;
import com.xcong.farmer.cms.modules.system.dto.AdminColumnDto;
+import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateColumnDto;
import com.xcong.farmer.cms.modules.system.entity.ColumnEntity;
+import com.xcong.farmer.cms.modules.system.entity.NavigationBarEntity;
import com.xcong.farmer.cms.modules.system.mapper.ColumnMapper;
import com.xcong.farmer.cms.modules.system.service.IColumnService;
import com.xcong.farmer.cms.modules.system.vo.AdminColumnVo;
@@ -211,4 +214,21 @@
}
return Result.ok(records);
}
+
+ @Override
+ public Result delObjs(AdminDeleteDto adminDeleteDto) {
+ String ids = adminDeleteDto.getIds();
+ if(StrUtil.isNotEmpty(ids)){
+ String[] columnIds = ids.split(StringPool.COMMA);
+ for(String columnIdStr : columnIds){
+ Long columnId = Long.valueOf(columnIdStr);
+ QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("parent_id",columnId);
+ this.baseMapper.delete(objectQueryWrapper);
+
+ this.baseMapper.deleteById(columnId);
+ }
+ }
+ return Result.ok("删除成功");
+ }
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MenuServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MenuServiceImpl.java
index 6bc0efb..6507b54 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MenuServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MenuServiceImpl.java
@@ -3,13 +3,17 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.AdminAddMenuDto;
+import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
import com.xcong.farmer.cms.modules.system.dto.AdminMenuDto;
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateMenuDto;
import com.xcong.farmer.cms.modules.system.entity.MenuEntity;
+import com.xcong.farmer.cms.modules.system.entity.RoleMenuEntity;
+import com.xcong.farmer.cms.modules.system.entity.UserRoleEntity;
import com.xcong.farmer.cms.modules.system.mapper.MenuMapper;
import com.xcong.farmer.cms.modules.system.mapper.RoleMenuMapper;
import com.xcong.farmer.cms.modules.system.service.IMenuService;
@@ -167,4 +171,52 @@
this.baseMapper.updateById(menuEntity);
return Result.ok("更新成功");
}
+
+ @Override
+ @Transactional
+ public Result delObjs(AdminDeleteDto adminDeleteDto) {
+ String ids = adminDeleteDto.getIds();
+ if(StrUtil.isNotEmpty(ids)){
+ String[] menuIds = ids.split(StringPool.COMMA);
+ for(String menuIdStr : menuIds){
+ Long menuId = Long.valueOf(menuIdStr);
+ QueryWrapper<MenuEntity> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("parent_id",menuId);
+ this.baseMapper.delete(objectQueryWrapper);
+
+ this.baseMapper.deleteById(menuId);
+
+ roleMenuMapper.deleteByMenuId(menuId);
+ }
+ }
+ return Result.ok("删除成功");
+ }
+
+ @Override
+ public Result getMenuInList() {
+ List<AdminMenuVo> records = this.baseMapper.selectAdminMenuVoInListByParentId(MenuEntity.PARENTID_DEFAULT);
+ if(CollUtil.isNotEmpty(records)){
+ for(AdminMenuVo adminMenuVo : records){
+ Long id = adminMenuVo.getId();
+ QueryWrapper<MenuEntity> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("parent_id",id);
+ List<MenuEntity> menuEntities = this.baseMapper.selectList(objectQueryWrapper);
+ List<AdminMenuVo> adminMenuVoChilds = new ArrayList<>();
+ if(CollUtil.isNotEmpty(menuEntities)){
+ for(MenuEntity menuEntityChild : menuEntities){
+ AdminMenuVo child = new AdminMenuVo();
+ child.setId(menuEntityChild.getId());
+ child.setMenuName(menuEntityChild.getMenuName());
+ child.setMenuType(menuEntityChild.getMenuType());
+ child.setRouteUrl(menuEntityChild.getRouteUrl());
+ child.setOrderNum(menuEntityChild.getOrderNum());
+ child.setCreateTime(menuEntityChild.getCreateTime());
+ adminMenuVoChilds.add(child);
+ }
+ }
+ adminMenuVo.setChild(adminMenuVoChilds);
+ }
+ }
+ return Result.ok(records);
+ }
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/NavigationBarServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/NavigationBarServiceImpl.java
index a0f0c40..f72cd93 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/NavigationBarServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/NavigationBarServiceImpl.java
@@ -3,14 +3,17 @@
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.AdminAddBarDto;
+import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
import com.xcong.farmer.cms.modules.system.dto.AdminNavigationBarDto;
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateBarDto;
import com.xcong.farmer.cms.modules.system.entity.NavigationBarEntity;
import com.xcong.farmer.cms.modules.system.mapper.NavigationBarMapper;
+import com.xcong.farmer.cms.modules.system.mapper.UserRoleMapper;
import com.xcong.farmer.cms.modules.system.service.INavigationBarService;
import com.xcong.farmer.cms.modules.system.vo.AdminNavigationBarVo;
import com.xcong.farmer.cms.modules.system.vo.AdminSeeBarInfoVo;
@@ -24,24 +27,29 @@
import cn.hutool.core.util.ObjectUtil;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+
@Service
@Slf4j
public class NavigationBarServiceImpl extends ServiceImpl<NavigationBarMapper, NavigationBarEntity> implements INavigationBarService {
+
+ @Resource
+ private NavigationBarMapper navigationBarMapper;
@Override
public Result getBarInPage(AdminNavigationBarDto adminNavigationBarDto) {
Page<AdminNavigationBarVo> page = new Page<>(adminNavigationBarDto.getPageNum(), adminNavigationBarDto.getPageSize());
NavigationBarEntity navigationBarEntity = new NavigationBarEntity();
navigationBarEntity.setParentId(NavigationBarEntity.PARENTID_DEFAULT);
- IPage<AdminNavigationBarVo> list = this.baseMapper.selectAdminNavigationBarVoInPage(page,navigationBarEntity);
+ IPage<AdminNavigationBarVo> list = navigationBarMapper.selectAdminNavigationBarVoInPage(page,navigationBarEntity);
List<AdminNavigationBarVo> records = list.getRecords();
if(CollUtil.isNotEmpty(records)){
for(AdminNavigationBarVo adminNavigationBarVo : records){
Long id = adminNavigationBarVo.getId();
QueryWrapper<NavigationBarEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("parent_id",id);
- List<NavigationBarEntity> navigationBarEntities = this.baseMapper.selectList(objectQueryWrapper);
+ List<NavigationBarEntity> navigationBarEntities = navigationBarMapper.selectList(objectQueryWrapper);
List<AdminNavigationBarVo> adminNavigationBarVoChilds = new ArrayList<>();
if(CollUtil.isNotEmpty(navigationBarEntities)){
for(NavigationBarEntity navigationBarEntityChild : navigationBarEntities){
@@ -49,7 +57,7 @@
child.setId(navigationBarEntityChild.getId());
child.setBarName(navigationBarEntityChild.getBarName());
child.setLinkUrl(navigationBarEntityChild.getLinkUrl());
- child.setDescribe(navigationBarEntityChild.getDescribe());
+ child.setRemark(navigationBarEntityChild.getRemark());
child.setPic(navigationBarEntityChild.getPic());
child.setOrderNum(navigationBarEntityChild.getOrderNum());
adminNavigationBarVoChilds.add(child);
@@ -88,34 +96,34 @@
if(StrUtil.isNotEmpty(pic)){
navigationBarEntity.setPic(pic);
}
- String describe = adminAddBarDto.getDescribe();
- if(StrUtil.isNotEmpty(describe)){
- navigationBarEntity.setDescribe(describe);
+ String remark = adminAddBarDto.getRemark();
+ if(StrUtil.isNotEmpty(remark)){
+ navigationBarEntity.setRemark(remark);
}
- this.baseMapper.insert(navigationBarEntity);
+ navigationBarMapper.insert(navigationBarEntity);
return Result.ok("添加成功");
}
@Override
@Transactional
public Result deleteBar(Long id) {
- NavigationBarEntity navigationBarEntity = this.baseMapper.selectById(id);
+ NavigationBarEntity navigationBarEntity = navigationBarMapper.selectById(id);
if(ObjectUtil.isEmpty(navigationBarEntity)){
return Result.fail("导航栏不存在");
}
QueryWrapper<NavigationBarEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("parent_id",id);
- List<NavigationBarEntity> navigationBarEntities = this.baseMapper.selectList(objectQueryWrapper);
+ List<NavigationBarEntity> navigationBarEntities = navigationBarMapper.selectList(objectQueryWrapper);
if(CollUtil.isNotEmpty(navigationBarEntities)){
return Result.fail("请先清空它的二级导航栏");
}
- this.baseMapper.deleteById(id);
+ navigationBarMapper.deleteById(id);
return Result.ok("删除成功");
}
@Override
public Result seeBarInfo(Long id) {
- NavigationBarEntity navigationBarEntity = this.baseMapper.selectById(id);
+ NavigationBarEntity navigationBarEntity = navigationBarMapper.selectById(id);
if(ObjectUtil.isEmpty(navigationBarEntity)){
return Result.fail("导航栏不存在");
}
@@ -123,7 +131,7 @@
adminSeeBarInfoVo.setId(navigationBarEntity.getId());
adminSeeBarInfoVo.setBarName(navigationBarEntity.getBarName());
adminSeeBarInfoVo.setLinkUrl(navigationBarEntity.getLinkUrl());
- adminSeeBarInfoVo.setDescribe(navigationBarEntity.getDescribe());
+ adminSeeBarInfoVo.setRemark(navigationBarEntity.getRemark());
adminSeeBarInfoVo.setOrderNum(navigationBarEntity.getOrderNum());
adminSeeBarInfoVo.setPic(navigationBarEntity.getPic());
adminSeeBarInfoVo.setParentId(navigationBarEntity.getParentId());
@@ -137,7 +145,7 @@
if(ObjectUtil.isEmpty(id)){
return Result.fail("导航栏不存在");
}
- NavigationBarEntity navigationBarEntity = this.baseMapper.selectById(id);
+ NavigationBarEntity navigationBarEntity = navigationBarMapper.selectById(id);
if(ObjectUtil.isEmpty(navigationBarEntity)){
return Result.fail("导航栏不存在");
}
@@ -164,23 +172,21 @@
if(StrUtil.isNotEmpty(pic)){
navigationBarEntity.setPic(pic);
}
- String describe = adminUpdateMenuDto.getDescribe();
- if(StrUtil.isNotEmpty(describe)){
- navigationBarEntity.setDescribe(describe);
+ String remark = adminUpdateMenuDto.getRemark();
+ if(StrUtil.isNotEmpty(remark)){
+ navigationBarEntity.setRemark(remark);
}
- this.baseMapper.updateById(navigationBarEntity);
+ navigationBarMapper.updateById(navigationBarEntity);
return Result.ok("更新成功");
}
@Override
public Result getBarInList() {
- List<AdminNavigationBarVo> records = this.baseMapper.selectAdminNavigationBarVoByParentId(NavigationBarEntity.PARENTID_DEFAULT);
+ List<AdminNavigationBarVo> records = navigationBarMapper.selectAdminNavigationBarVoByParentId(NavigationBarEntity.PARENTID_DEFAULT);
if(CollUtil.isNotEmpty(records)){
for(AdminNavigationBarVo adminNavigationBarVo : records){
Long id = adminNavigationBarVo.getId();
- QueryWrapper<NavigationBarEntity> objectQueryWrapper = new QueryWrapper<>();
- objectQueryWrapper.eq("parent_id",id);
- List<NavigationBarEntity> navigationBarEntities = this.baseMapper.selectList(objectQueryWrapper);
+ List<NavigationBarEntity> navigationBarEntities = navigationBarMapper.selectListByParentId(id);
List<AdminNavigationBarVo> adminNavigationBarVoChilds = new ArrayList<>();
if(CollUtil.isNotEmpty(navigationBarEntities)){
for(NavigationBarEntity navigationBarEntityChild : navigationBarEntities){
@@ -188,7 +194,7 @@
child.setId(navigationBarEntityChild.getId());
child.setBarName(navigationBarEntityChild.getBarName());
child.setLinkUrl(navigationBarEntityChild.getLinkUrl());
- child.setDescribe(navigationBarEntityChild.getDescribe());
+ child.setRemark(navigationBarEntityChild.getRemark());
child.setPic(navigationBarEntityChild.getPic());
child.setOrderNum(navigationBarEntityChild.getOrderNum());
adminNavigationBarVoChilds.add(child);
@@ -199,4 +205,22 @@
}
return Result.ok(records);
}
+
+ @Override
+ @Transactional
+ public Result delObjs(AdminDeleteDto adminDeleteDto) {
+ String ids = adminDeleteDto.getIds();
+ if(StrUtil.isNotEmpty(ids)){
+ String[] barIds = ids.split(StringPool.COMMA);
+ for(String barIdStr : barIds){
+ Long barId = Long.valueOf(barIdStr);
+ QueryWrapper<NavigationBarEntity> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("parent_id",barId);
+ navigationBarMapper.delete(objectQueryWrapper);
+
+ navigationBarMapper.deleteById(barId);
+ }
+ }
+ return Result.ok("删除成功");
+ }
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/RoleServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/RoleServiceImpl.java
index 1699bef..7029418 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/RoleServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/RoleServiceImpl.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.AdminAddRoleDto;
+import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
import com.xcong.farmer.cms.modules.system.dto.AdminRoleDto;
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateRoleDto;
import com.xcong.farmer.cms.modules.system.entity.*;
@@ -94,6 +95,10 @@
return Result.fail("当前角色下还有用户，请重新分配角色");
}
this.baseMapper.deleteById(id);
+
+ QueryWrapper<RoleMenuEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("role_id",id);
+ roleMenuMapper.delete(queryWrapper);
return Result.ok("删除成功");
}
@@ -109,15 +114,14 @@
adminSeeRoleInfoVo.setRemark(roleEntity.getRemark());
List<RoleMenuEntity> roleMenuEntities = roleMenuMapper.selectListByRoleId(id);
if(CollUtil.isNotEmpty(roleMenuEntities)){
- List<AdminMenuInfoVo> adminMenuInfoVos = new ArrayList<>();
+ List<Long> menuIds = new ArrayList<>();
for(RoleMenuEntity roleMenuEntity : roleMenuEntities){
- MenuEntity menuEntity = menuMapper.selectById(roleMenuEntity.getMenuId());
- AdminMenuInfoVo adminMenuInfoVo = new AdminMenuInfoVo();
- adminMenuInfoVo.setId(menuEntity.getId());
- adminMenuInfoVo.setMenuName(menuEntity.getMenuName());
- adminMenuInfoVos.add(adminMenuInfoVo);
+ MenuEntity menuEntity = menuMapper.selectMenuEntityByIdAndParentId(roleMenuEntity.getMenuId(),MenuEntity.PARENTID_DEFAULT);
+ if(ObjectUtil.isNotEmpty(menuEntity)){
+ menuIds.add(menuEntity.getId());
+ }
}
- adminSeeRoleInfoVo.setMenuInfoVos(adminMenuInfoVos);
+ adminSeeRoleInfoVo.setMenuIds(menuIds);
}
return Result.ok(adminSeeRoleInfoVo);
}
@@ -150,6 +154,29 @@
return Result.ok("更新成功");
}
+ @Override
+ @Transactional
+ public Result delObjs(AdminDeleteDto adminDeleteDto) {
+ String ids = adminDeleteDto.getIds();
+ if(StrUtil.isNotEmpty(ids)){
+ String[] roleIds = ids.split(StringPool.COMMA);
+ for(String roleIdStr : roleIds){
+ Long roleId = Long.valueOf(roleIdStr);
+
+ QueryWrapper<UserRoleEntity> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("role_id",roleId);
+ userRoleMapper.delete(objectQueryWrapper);
+
+ QueryWrapper<RoleMenuEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("role_id",roleId);
+ roleMenuMapper.delete(queryWrapper);
+
+ this.baseMapper.deleteById(roleId);
+ }
+ }
+ return Result.ok("删除成功");
+ }
+
private void saveRoleMenus(String menuIds,Long roleId) {
if (StrUtil.isNotEmpty(menuIds)) {
String[] menuIdList = menuIds.split(StringPool.COMMA);
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
index dd3877c..7d13ef2 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.AdminAddUserDto;
+import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateUserDto;
import com.xcong.farmer.cms.modules.system.dto.AdminUserDto;
import com.xcong.farmer.cms.modules.system.entity.*;
@@ -270,13 +271,15 @@
AdminUserMenuVo adminUserMenuVo = menuMapper.selectAdminRoleMenuVoById(childId);
Long parentId = adminUserMenuVo.getParentId();
AdminUserMenuVo adminUserMenuVoParent = menuMap.get(parentId);
- List<AdminUserMenuVo> child = adminUserMenuVoParent.getChild();
- if(CollUtil.isEmpty(child)){
- List<AdminUserMenuVo> list = new ArrayList<>();
- list.add(adminUserMenuVo);
- adminUserMenuVoParent.setChild(list);
- }else{
- child.add(adminUserMenuVo);
+ if(ObjectUtil.isNotEmpty(adminUserMenuVoParent)){
+ List<AdminUserMenuVo> child = adminUserMenuVoParent.getChild();
+ if(CollUtil.isEmpty(child)){
+ List<AdminUserMenuVo> list = new ArrayList<>();
+ list.add(adminUserMenuVo);
+ adminUserMenuVoParent.setChild(list);
+ }else{
+ child.add(adminUserMenuVo);
+ }
}
}
}
@@ -291,6 +294,26 @@
return Result.ok(adminUserMenuVos);
}
+ @Override
+ @Transactional
+ public Result delObjs(AdminDeleteDto adminDeleteDto) {
+ String ids = adminDeleteDto.getIds();
+ if(StrUtil.isNotEmpty(ids)){
+ String[] userIds = ids.split(StringPool.COMMA);
+ for(String userIdStr : userIds){
+ Long userId = Long.valueOf(userIdStr);
+
+ QueryWrapper<UserRoleEntity> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("user_id",userId);
+ userRoleMapper.delete(objectQueryWrapper);
+
+ this.baseMapper.deleteById(userId);
+ }
+
+ }
+ return Result.ok("删除成功");
+ }
+
private void saveUserRole(String roleIds,Long userId) {
if (StrUtil.isNotEmpty(roleIds)) {
String[] roleIdList = roleIds.split(StringPool.COMMA);
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminNavigationBarVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminNavigationBarVo.java
index fb04b5b..1c98446 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminNavigationBarVo.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminNavigationBarVo.java
@@ -19,7 +19,7 @@
private String linkUrl;
//描述
@ApiModelProperty(value = "描述")
- private String describe;
+ private String remark;
//排序
@ApiModelProperty(value = "排序")
private Integer orderNum;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeBarInfoVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeBarInfoVo.java
index b6c8fd4..121b746 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeBarInfoVo.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeBarInfoVo.java
@@ -17,7 +17,7 @@
private String linkUrl;
//描述
@ApiModelProperty(value = "描述")
- private String describe;
+ private String remark;
//排序
@ApiModelProperty(value = "排序")
private Integer orderNum;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeRoleInfoVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeRoleInfoVo.java
index edee956..adddf1d 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeRoleInfoVo.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeRoleInfoVo.java
@@ -20,6 +20,6 @@
private String remark;
@ApiModelProperty(value = "菜单按钮")
- private List<AdminMenuInfoVo> menuInfoVos;
+ private List<Long> menuIds;
}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 5f5d326..7d62cc0 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,4 +1,4 @@
# �����ϴ�ͼƬ��·���ͷ���ͼƬͼƬ��·��
upload.file.location=file:D:/Tools/
upload.file.path =/image/**
-static.resource.url =http://localhost:8878/image/
+static.resource.url =http://192.168.0.11:8878/image/
diff --git a/src/main/resources/mapper/MenuMapper.xml b/src/main/resources/mapper/MenuMapper.xml
index e1127a9..28ead9c 100644
--- a/src/main/resources/mapper/MenuMapper.xml
+++ b/src/main/resources/mapper/MenuMapper.xml
@@ -24,4 +24,18 @@
t_menu a where a.id = #{id}
</select>
+ <select id="selectAdminMenuVoInListByParentId" resultType="com.xcong.farmer.cms.modules.system.vo.AdminMenuVo">
+ SELECT
+ a.*
+ FROM
+ t_menu a where a.parent_id = #{parentId}
+ </select>
+
+ <select id="selectMenuEntityByIdAndParentId" resultType="com.xcong.farmer.cms.modules.system.entity.MenuEntity">
+ SELECT
+ a.*
+ FROM
+ t_menu a where a.parent_id != #{parentId} and a.id = #{menuId}
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/NavigationBarMapper.xml b/src/main/resources/mapper/NavigationBarMapper.xml
index 5dfa1cc..9d564e7 100644
--- a/src/main/resources/mapper/NavigationBarMapper.xml
+++ b/src/main/resources/mapper/NavigationBarMapper.xml
@@ -26,4 +26,13 @@
order by a.create_time desc
</select>
+ <select id="selectListByParentId" resultType="com.xcong.farmer.cms.modules.system.entity.NavigationBarEntity">
+ SELECT
+ a.*
+ FROM
+ t_navigation_bar a
+ where a.parent_id = #{parentId}
+ order by a.create_time desc
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1