mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化代码

This commit is contained in:
TinyAnts 2022-08-10 09:43:35 +08:00
parent ff6b19e625
commit b317402b5a
16 changed files with 51 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleController.java
View File

@ -4,8 +4,8 @@ import com.hxkj.admin.config.aop.Log;
import com.hxkj.admin.service.article.IArticleArchivesService;
import com.hxkj.admin.validate.article.ArticleParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.ArticleDetailVo;
import com.hxkj.admin.vo.common.article.ArticleListVo;
import com.hxkj.admin.vo.article.ArticleDetailVo;
import com.hxkj.admin.vo.article.ArticleListVo;
import com.hxkj.common.core.AjaxResult;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.validator.annotation.IDMust;

28
server/like-admin/src/main/java/com/hxkj/admin/controller/article/CategoryController.java
View File

@ -2,9 +2,9 @@ package com.hxkj.admin.controller.article;
import com.hxkj.admin.config.aop.Log;
import com.hxkj.admin.service.article.IArticleCategoryService;
import com.hxkj.admin.validate.article.ArticleCateParam;
import com.hxkj.admin.validate.article.CategoryParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.ArticleCateVo;
import com.hxkj.admin.vo.article.ArticleCateVo;
import com.hxkj.common.core.AjaxResult;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.validator.annotation.IDMust;
@ -69,14 +69,14 @@ public class CategoryController {
* 分类新增
*
* @author fzr
* @param articleCateParam 分类参数
* @param categoryParam 分类参数
* @return Object
*/
@Log(title = "文章分类新增")
@PostMapping("/add")
public Object add(@Validated(value = ArticleCateParam.create.class)
@RequestBody ArticleCateParam articleCateParam) {
iArticleCategoryService.add(articleCateParam);
public Object add(@Validated(value = CategoryParam.create.class)
@RequestBody CategoryParam categoryParam) {
iArticleCategoryService.add(categoryParam);
return AjaxResult.success();
}
@ -84,14 +84,14 @@ public class CategoryController {
* 分类编辑
*
* @author fzr
* @param articleCateParam 分类编辑
* @param categoryParam 分类编辑
* @return Object
*/
@Log(title = "文章分类编辑")
@PostMapping("/edit")
public Object edit(@Validated(value = ArticleCateParam.update.class)
@RequestBody ArticleCateParam articleCateParam) {
iArticleCategoryService.edit(articleCateParam);
public Object edit(@Validated(value = CategoryParam.update.class)
@RequestBody CategoryParam categoryParam) {
iArticleCategoryService.edit(categoryParam);
return AjaxResult.success();
}
@ -99,14 +99,14 @@ public class CategoryController {
* 分类删除
*
* @author fzr
* @param articleCateParam 分类删除
* @param categoryParam 分类删除
* @return Object
*/
@Log(title = "文章分类删除")
@PostMapping("/cateDel")
public Object del(@Validated(value = ArticleCateParam.delete.class)
@RequestBody ArticleCateParam articleCateParam) {
iArticleCategoryService.del(articleCateParam.getId());
public Object del(@Validated(value = CategoryParam.delete.class)
@RequestBody CategoryParam categoryParam) {
iArticleCategoryService.del(categoryParam.getId());
return AjaxResult.success();
}

2
server/like-admin/src/main/java/com/hxkj/admin/controller/common/AlbumController.java
View File

@ -5,7 +5,7 @@ import com.hxkj.admin.config.aop.Log;
import com.hxkj.admin.service.common.IAlbumService;
import com.hxkj.admin.validate.common.AlbumParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.album.AlbumVo;
import com.hxkj.admin.vo.album.AlbumVo;
import com.hxkj.common.core.AjaxResult;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.utils.ArrayUtil;

4
server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleArchivesService.java
View File

@ -2,8 +2,8 @@ package com.hxkj.admin.service.article;
import com.hxkj.admin.validate.article.ArticleParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.ArticleDetailVo;
import com.hxkj.admin.vo.common.article.ArticleListVo;
import com.hxkj.admin.vo.article.ArticleDetailVo;
import com.hxkj.admin.vo.article.ArticleListVo;
import com.hxkj.common.core.PageResult;
import java.util.Map;

12
server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleCategoryService.java
View File

@ -1,8 +1,8 @@
package com.hxkj.admin.service.article;
import com.hxkj.admin.validate.article.ArticleCateParam;
import com.hxkj.admin.validate.article.CategoryParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.ArticleCateVo;
import com.hxkj.admin.vo.article.ArticleCateVo;
import com.hxkj.common.core.PageResult;
import java.util.List;
@ -43,17 +43,17 @@ public interface IArticleCategoryService {
* 分类新增
*
* @author fzr
* @param articleCateParam 分类参数
* @param categoryParam 分类参数
*/
void add(ArticleCateParam articleCateParam);
void add(CategoryParam categoryParam);
/**
* 分类编辑
*
* @author fzr
* @param articleCateParam 分类参数
* @param categoryParam 分类参数
*/
void edit(ArticleCateParam articleCateParam);
void edit(CategoryParam categoryParam);
/**
* 分类删除

4
server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleArchivesServiceImpl.java
View File

@ -7,8 +7,8 @@ import com.github.yulichang.query.MPJQueryWrapper;
import com.hxkj.admin.service.article.IArticleArchivesService;
import com.hxkj.admin.validate.article.ArticleParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.ArticleDetailVo;
import com.hxkj.admin.vo.common.article.ArticleListVo;
import com.hxkj.admin.vo.article.ArticleDetailVo;
import com.hxkj.admin.vo.article.ArticleListVo;
import com.hxkj.common.config.GlobalConfig;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.entity.article.Article;

24
server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleCategoryServiceImpl.java
View File

@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hxkj.admin.service.article.IArticleCategoryService;
import com.hxkj.admin.validate.article.ArticleCateParam;
import com.hxkj.admin.validate.article.CategoryParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.ArticleCateVo;
import com.hxkj.admin.vo.article.ArticleCateVo;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.entity.article.ArticleCategory;
import com.hxkj.common.mapper.article.ArticleCategoryMapper;
@ -123,14 +123,14 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService {
* 分类新增
*
* @author fzr
* @param articleCateParam 分类参数
* @param categoryParam 分类参数
*/
@Override
public void add(ArticleCateParam articleCateParam) {
public void add(CategoryParam categoryParam) {
ArticleCategory model = new ArticleCategory();
model.setId(articleCateParam.getId());
model.setName(articleCateParam.getName());
model.setSort(articleCateParam.getSort());
model.setId(categoryParam.getId());
model.setName(categoryParam.getName());
model.setSort(categoryParam.getSort());
model.setCreateTime(TimeUtil.timestamp());
model.setUpdateTime(TimeUtil.timestamp());
articleCategoryMapper.insert(model);
@ -140,22 +140,22 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService {
* 文章编辑
*
* @author fzr
* @param articleCateParam 分类参数
* @param categoryParam 分类参数
*/
@Override
public void edit(ArticleCateParam articleCateParam) {
public void edit(CategoryParam categoryParam) {
ArticleCategory model = articleCategoryMapper.selectOne(
new QueryWrapper<ArticleCategory>()
.select(ArticleCategory.class, info->
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
.eq("id", articleCateParam.getId())
.eq("id", categoryParam.getId())
.eq("is_delete", 0));
Assert.notNull(model, "分类不存在");
model.setName(articleCateParam.getName());
model.setSort(articleCateParam.getSort());
model.setName(categoryParam.getName());
model.setSort(categoryParam.getSort());
model.setUpdateTime(TimeUtil.timestamp());
articleCategoryMapper.updateById(model);
}

2
server/like-admin/src/main/java/com/hxkj/admin/service/common/IAlbumService.java
View File

@ -3,7 +3,7 @@ package com.hxkj.admin.service.common;
import com.alibaba.fastjson.JSONArray;
import com.hxkj.admin.validate.common.AlbumParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.album.AlbumVo;
import com.hxkj.admin.vo.album.AlbumVo;
import com.hxkj.common.core.PageResult;
import java.util.List;

4
server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/AlbumServiceImpl.java
View File

@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hxkj.admin.service.common.IAlbumService;
import com.hxkj.admin.validate.common.AlbumParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.album.AlbumCateVo;
import com.hxkj.admin.vo.common.album.AlbumVo;
import com.hxkj.admin.vo.album.AlbumCateVo;
import com.hxkj.admin.vo.album.AlbumVo;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.entity.album.Album;
import com.hxkj.common.entity.album.AlbumCate;

2
server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleCateParam.java → server/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java
View File

@ -18,7 +18,7 @@ import java.io.Serializable;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class ArticleCateParam implements Serializable {
public class CategoryParam implements Serializable {
private static final long serialVersionUID = 1L;

3
server/like-admin/src/main/java/com/hxkj/admin/validate/common/AlbumParam.java
View File

@ -12,6 +12,9 @@ import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* 相册参数
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)

2
server/like-admin/src/main/java/com/hxkj/admin/vo/common/album/AlbumCateVo.java → server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java
View File

@ -1,4 +1,4 @@
package com.hxkj.admin.vo.common.album;
package com.hxkj.admin.vo.album;
import lombok.Data;

2
server/like-admin/src/main/java/com/hxkj/admin/vo/common/album/AlbumVo.java → server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java
View File

@ -1,4 +1,4 @@
package com.hxkj.admin.vo.common.album;
package com.hxkj.admin.vo.album;
import lombok.Data;

2
server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleCateVo.java → server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleCateVo.java
View File

@ -1,4 +1,4 @@
package com.hxkj.admin.vo.common.article;
package com.hxkj.admin.vo.article;
import lombok.Data;

2
server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleDetailVo.java → server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java
View File

@ -1,4 +1,4 @@
package com.hxkj.admin.vo.common.article;
package com.hxkj.admin.vo.article;
import lombok.Data;

2
server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleListVo.java → server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java
View File

@ -1,4 +1,4 @@
package com.hxkj.admin.vo.common.article;
package com.hxkj.admin.vo.article;
import lombok.Data;