From 8436adbda66025f53ff901a75af41b4528a005b2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 06 Jun 2022 14:36:56 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminArticleController.java | 12 ++++
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeArticleInfoVo.java | 5 +
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminColumnVo.java | 2
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 20 +++---
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java | 2
src/main/java/com/xcong/farmer/cms/modules/system/service/IArticleService.java | 4 +
src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java | 2
src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java | 5 +
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java | 5 +
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminArticleVo.java | 7 +
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddColumnDto.java | 2
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java | 5 +
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/RoleServiceImpl.java | 14 +++-
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java | 47 +++++++++++++--
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeColumnInfoVo.java | 2
15 files changed, 104 insertions(+), 30 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 eee04ed..7f21c6a 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
@@ -54,6 +54,18 @@
return iArticleService.updateArticle(adminUpdateArticleDto);
}
+ @ApiOperation(value = "发布文章", notes = "发布文章")
+ @GetMapping(value = "/updateStatusOn/{id}")
+ public Result updateStatusOn(@PathVariable(value = "id") Long id) {
+ return iArticleService.updateStatusOn(id);
+ }
+
+ @ApiOperation(value = "取消发布文章", notes = "取消发布文章")
+ @GetMapping(value = "/updateStatusOff/{id}")
+ public Result updateStatusOff(@PathVariable(value = "id") Long id) {
+ return iArticleService.updateStatusOff(id);
+ }
+
@ApiOperation(value = "删除文章", notes = "删除文章")
@PostMapping(value = "/delObjs")
public Result delObjs(@RequestBody @Valid AdminDeleteDto adminDeleteDto) {
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java
index 4ddf8a2..ad44b92 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java
@@ -16,8 +16,11 @@
@ApiModelProperty(value = "标题")
private String childTitle;
+ @ApiModelProperty(value = "作者")
+ private String author;
+
@ApiModelProperty(value = "描述")
- private String describe;
+ private String remark;
@ApiModelProperty(value = "所属栏目ID")
private Long columnId;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddColumnDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddColumnDto.java
index 0773cde..8a73c9d 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddColumnDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddColumnDto.java
@@ -15,7 +15,7 @@
private String columnCode;
@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/AdminUpdateArticleDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java
index 1a7f5f2..6c1ae55 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java
@@ -20,8 +20,11 @@
@ApiModelProperty(value = "标题")
private String childTitle;
+ @ApiModelProperty(value = "作者")
+ private String author;
+
@ApiModelProperty(value = "描述")
- private String describe;
+ private String remark;
@ApiModelProperty(value = "所属栏目ID")
private Long columnId;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java
index 4a3e09a..24aab84 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java
@@ -17,7 +17,7 @@
private String columnCode;
@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/ArticleEntity.java b/src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java
index 2ed6a95..cf303de 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xcong.farmer.cms.common.system.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@@ -37,8 +38,10 @@
private String title;
//副标题
private String childTitle;
+ //作者
+ private String author;
//描述
- private String describe;
+ private String remark;
//所属栏目ID
private Long columnId;
//访问量
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java b/src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java
index 0fed85b..8604dde 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java
@@ -20,7 +20,7 @@
//栏目编码
private String columnCode;
//描述
- private String describe;
+ private String remark;
//排序
private Integer orderNum;
//图片
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 4f8dcb9..8f353ef 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
@@ -21,4 +21,8 @@
Result updateArticle(AdminUpdateArticleDto adminUpdateArticleDto);
Result delObjs(AdminDeleteDto adminDeleteDto);
+
+ Result updateStatusOn(Long id);
+
+ Result updateStatusOff(Long id);
}
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 f0ef2c5..475b739 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
@@ -67,9 +67,13 @@
if(StrUtil.isNotEmpty(childTitle)){
articleEntity.setChildTitle(childTitle);
}
- String describe = adminAddArticleDto.getDescribe();
- if(StrUtil.isNotEmpty(describe)){
- articleEntity.setDescribe(describe);
+ String author = adminAddArticleDto.getAuthor();
+ if(StrUtil.isNotEmpty(author)){
+ articleEntity.setAuthor(author);
+ }
+ String remark = adminAddArticleDto.getRemark();
+ if(StrUtil.isNotEmpty(remark)){
+ articleEntity.setRemark(remark);
}
long columnId = adminAddArticleDto.getColumnId() == null ? 0L : adminAddArticleDto.getColumnId();
if(columnId == 0L){
@@ -135,6 +139,7 @@
if(ObjectUtil.isEmpty(articleEntity)){
return Result.fail("文章不存在");
}
+ articleEntity.getReleaseStatus();
String title = adminUpdateArticleDto.getTitle();
if(StrUtil.isEmpty(title)){
return Result.fail("请输入文章标题");
@@ -144,9 +149,14 @@
if(StrUtil.isNotEmpty(childTitle)){
articleEntity.setChildTitle(childTitle);
}
- String describe = adminUpdateArticleDto.getDescribe();
- if(StrUtil.isNotEmpty(describe)){
- articleEntity.setDescribe(describe);
+ String author = adminUpdateArticleDto.getAuthor();
+ if(StrUtil.isNotEmpty(author)){
+ articleEntity.setAuthor(author);
+ }
+
+ String remark = adminUpdateArticleDto.getRemark();
+ if(StrUtil.isNotEmpty(remark)){
+ articleEntity.setRemark(remark);
}
long columnId = adminUpdateArticleDto.getColumnId() == null ? 0L : adminUpdateArticleDto.getColumnId();
if(columnId == 0L){
@@ -172,6 +182,9 @@
articleEntity.setReleaseTime(releaseTime);
}
Integer releaseStatus = adminUpdateArticleDto.getReleaseStatus();
+ if(!ArticleEntity.RELEASE_STATUS_YES.equals(releaseStatus)){
+ return Result.fail("请先取消文章的发布状态");
+ }
articleEntity.setReleaseStatus(releaseStatus);
String articleDetails = adminUpdateArticleDto.getArticleDetails();
if(StrUtil.isNotEmpty(articleDetails)){
@@ -196,4 +209,26 @@
}
return Result.ok("删除成功");
}
+
+ @Override
+ public Result updateStatusOff(Long id) {
+ ArticleEntity articleEntity = this.baseMapper.selectById(id);
+ if(ObjectUtil.isEmpty(articleEntity)){
+ return Result.fail("文章不存在");
+ }
+ articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_NO);
+ this.baseMapper.updateById(articleEntity);
+ return Result.ok("操作成功");
+ }
+
+ @Override
+ public Result updateStatusOn(Long id) {
+ ArticleEntity articleEntity = this.baseMapper.selectById(id);
+ if(ObjectUtil.isEmpty(articleEntity)){
+ return Result.fail("文章不存在");
+ }
+ articleEntity.setReleaseStatus(ArticleEntity.RELEASE_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 602c31f..934ac05 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
@@ -50,7 +50,7 @@
child.setId(columnEntityChild.getId());
child.setColumnName(columnEntityChild.getColumnName());
child.setColumnCode(columnEntityChild.getColumnCode());
- child.setDescribe(columnEntityChild.getDescribe());
+ child.setRemark(columnEntityChild.getRemark());
child.setPic(columnEntityChild.getPic());
child.setOrderNum(columnEntityChild.getOrderNum());
adminColumnVoChilds.add(child);
@@ -82,9 +82,9 @@
return Result.fail("栏目编码不能重复");
}
columnEntity.setColumnCode(columnCode);
- String describe = adminAddColumnDto.getDescribe();
- if(StrUtil.isNotEmpty(describe)){
- columnEntity.setDescribe(describe);
+ String remark = adminAddColumnDto.getRemark();
+ if(StrUtil.isNotEmpty(remark)){
+ columnEntity.setRemark(remark);
}
String pic = adminAddColumnDto.getPic();
if(StrUtil.isNotEmpty(pic)){
@@ -131,7 +131,7 @@
adminSeeColumnInfoVo.setId(columnEntity.getId());
adminSeeColumnInfoVo.setColumnName(columnEntity.getColumnName());
adminSeeColumnInfoVo.setColumnCode(columnEntity.getColumnCode());
- adminSeeColumnInfoVo.setDescribe(columnEntity.getDescribe());
+ adminSeeColumnInfoVo.setRemark(columnEntity.getRemark());
adminSeeColumnInfoVo.setParentId(columnEntity.getParentId());
adminSeeColumnInfoVo.setOrderNum(columnEntity.getOrderNum());
adminSeeColumnInfoVo.setPic(columnEntity.getPic());
@@ -161,13 +161,13 @@
QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("column_code",columnCode);
List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
- if(CollUtil.isNotEmpty(columnEntities)){
+ if(CollUtil.isNotEmpty(columnEntities) && columnEntities.size() > 1){
return Result.fail("栏目编码不能重复");
}
columnEntity.setColumnCode(columnCode);
- String describe = adminUpdateColumnDto.getDescribe();
- if(StrUtil.isNotEmpty(describe)){
- columnEntity.setDescribe(describe);
+ String remark = adminUpdateColumnDto.getRemark();
+ if(StrUtil.isNotEmpty(remark)){
+ columnEntity.setRemark(remark);
}
String pic = adminUpdateColumnDto.getPic();
if(StrUtil.isNotEmpty(pic)){
@@ -203,7 +203,7 @@
child.setId(columnEntityChild.getId());
child.setColumnName(columnEntityChild.getColumnName());
child.setColumnCode(columnEntityChild.getColumnCode());
- child.setDescribe(columnEntityChild.getDescribe());
+ child.setRemark(columnEntityChild.getRemark());
child.setPic(columnEntityChild.getPic());
child.setOrderNum(columnEntityChild.getOrderNum());
adminColumnVoChilds.add(child);
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 7029418..8411b92 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
@@ -116,9 +116,17 @@
if(CollUtil.isNotEmpty(roleMenuEntities)){
List<Long> menuIds = new ArrayList<>();
for(RoleMenuEntity roleMenuEntity : roleMenuEntities){
- MenuEntity menuEntity = menuMapper.selectMenuEntityByIdAndParentId(roleMenuEntity.getMenuId(),MenuEntity.PARENTID_DEFAULT);
- if(ObjectUtil.isNotEmpty(menuEntity)){
- menuIds.add(menuEntity.getId());
+// //这个子菜单
+// MenuEntity menuEntity = menuMapper.selectMenuEntityByIdAndParentId(roleMenuEntity.getMenuId(),MenuEntity.PARENTID_DEFAULT);
+// if(ObjectUtil.isNotEmpty(menuEntity)){
+// menuIds.add(menuEntity.getId());
+// }
+ //查询该角色拥有的菜单栏是否拥有子菜单
+ QueryWrapper<MenuEntity> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("parent_id",roleMenuEntity.getMenuId());
+ List<MenuEntity> menuEntities = menuMapper.selectList(objectQueryWrapper);
+ if(CollUtil.isEmpty(menuEntities)){
+ menuIds.add(roleMenuEntity.getMenuId());
}
}
adminSeeRoleInfoVo.setMenuIds(menuIds);
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminArticleVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminArticleVo.java
index 65888e3..8c5c0ac 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminArticleVo.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminArticleVo.java
@@ -18,14 +18,17 @@
@ApiModelProperty(value = "标题")
private String childTitle;
+ @ApiModelProperty(value = "作者")
+ private String author;
+
@ApiModelProperty(value = "描述")
- private String describe;
+ private String remark;
@ApiModelProperty(value = "所属栏目ID")
private Long columnId;
@ApiModelProperty(value = "所属栏目名称")
- private Long columnName;
+ private String columnName;
@ApiModelProperty(value = "访问量")
private Integer visits;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminColumnVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminColumnVo.java
index 781ca0a..a2bdd44 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminColumnVo.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminColumnVo.java
@@ -18,7 +18,7 @@
private String columnCode;
@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/AdminSeeArticleInfoVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeArticleInfoVo.java
index 8d4a54f..58099e5 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeArticleInfoVo.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeArticleInfoVo.java
@@ -18,8 +18,11 @@
@ApiModelProperty(value = "标题")
private String childTitle;
+ @ApiModelProperty(value = "作者")
+ private String author;
+
@ApiModelProperty(value = "描述")
- private String describe;
+ private String remark;
@ApiModelProperty(value = "所属栏目ID")
private Long columnId;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeColumnInfoVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeColumnInfoVo.java
index f39e370..57df2a8 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeColumnInfoVo.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeColumnInfoVo.java
@@ -17,7 +17,7 @@
private String columnCode;
@ApiModelProperty(value = "描述")
- private String describe;
+ private String remark;
@ApiModelProperty(value = "排序")
private Integer orderNum;
--
Gitblit v1.9.1