调整文件参数类名称

This commit is contained in:
TinyAnts 2022-08-10 09:22:28 +08:00
parent 71c78f2837
commit ff6b19e625
8 changed files with 71 additions and 71 deletions

View File

@ -2,7 +2,7 @@ package com.hxkj.admin.controller.article;
import com.hxkj.admin.config.aop.Log; import com.hxkj.admin.config.aop.Log;
import com.hxkj.admin.service.article.IArticleArchivesService; import com.hxkj.admin.service.article.IArticleArchivesService;
import com.hxkj.admin.validate.article.ArticleArchivesParam; import com.hxkj.admin.validate.article.ArticleParam;
import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.ArticleDetailVo; import com.hxkj.admin.vo.common.article.ArticleDetailVo;
import com.hxkj.admin.vo.common.article.ArticleListVo; import com.hxkj.admin.vo.common.article.ArticleListVo;
@ -57,15 +57,15 @@ public class ArticleController {
* 文章新增 * 文章新增
* *
* @author fzr * @author fzr
* @param articleArchivesParam 文章参数 * @param articleParam 文章参数
* @return Object * @return Object
*/ */
@Log(title = "文章新增") @Log(title = "文章新增")
@PostMapping("/add") @PostMapping("/add")
public Object add( public Object add(
@Validated(value = ArticleArchivesParam.create.class) @Validated(value = ArticleParam.create.class)
@RequestBody ArticleArchivesParam articleArchivesParam) { @RequestBody ArticleParam articleParam) {
iArticleArchivesService.add(articleArchivesParam); iArticleArchivesService.add(articleParam);
return AjaxResult.success(); return AjaxResult.success();
} }
@ -73,14 +73,14 @@ public class ArticleController {
* 文章编辑 * 文章编辑
* *
* @author fzr * @author fzr
* @param articleArchivesParam 文章参数 * @param articleParam 文章参数
* @return Object * @return Object
*/ */
@Log(title = "文章编辑") @Log(title = "文章编辑")
@PostMapping("/edit") @PostMapping("/edit")
public Object edit(@Validated(value = ArticleArchivesParam.update.class) public Object edit(@Validated(value = ArticleParam.update.class)
@RequestBody ArticleArchivesParam articleArchivesParam) { @RequestBody ArticleParam articleParam) {
iArticleArchivesService.edit(articleArchivesParam); iArticleArchivesService.edit(articleParam);
return AjaxResult.success(); return AjaxResult.success();
} }
@ -88,14 +88,14 @@ public class ArticleController {
* 文章删除 * 文章删除
* *
* @author fzr * @author fzr
* @param articleArchivesParam 文章参数 * @param articleParam 文章参数
* @return Object * @return Object
*/ */
@Log(title = "文章删除") @Log(title = "文章删除")
@PostMapping("/del") @PostMapping("/del")
public Object del(@Validated(value = ArticleArchivesParam.delete.class) public Object del(@Validated(value = ArticleParam.delete.class)
@RequestBody ArticleArchivesParam articleArchivesParam) { @RequestBody ArticleParam articleParam) {
iArticleArchivesService.del(articleArchivesParam.getId()); iArticleArchivesService.del(articleParam.getId());
return AjaxResult.success(); return AjaxResult.success();
} }

View File

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

View File

@ -1,6 +1,6 @@
package com.hxkj.admin.service.article; package com.hxkj.admin.service.article;
import com.hxkj.admin.validate.article.ArticleArchivesParam; import com.hxkj.admin.validate.article.ArticleParam;
import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.ArticleDetailVo; import com.hxkj.admin.vo.common.article.ArticleDetailVo;
import com.hxkj.admin.vo.common.article.ArticleListVo; import com.hxkj.admin.vo.common.article.ArticleListVo;
@ -35,17 +35,17 @@ public interface IArticleArchivesService {
* 文章新增 * 文章新增
* *
* @author fzr * @author fzr
* @param articleArchivesParam 文章参数 * @param articleParam 文章参数
*/ */
void add(ArticleArchivesParam articleArchivesParam); void add(ArticleParam articleParam);
/** /**
* 文章编辑 * 文章编辑
* *
* @author fzr * @author fzr
* @param articleArchivesParam 文章参数 * @param articleParam 文章参数
*/ */
void edit(ArticleArchivesParam articleArchivesParam); void edit(ArticleParam articleParam);
/** /**
* 文章删除 * 文章删除

View File

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

View File

@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.query.MPJQueryWrapper; import com.github.yulichang.query.MPJQueryWrapper;
import com.hxkj.admin.service.article.IArticleArchivesService; import com.hxkj.admin.service.article.IArticleArchivesService;
import com.hxkj.admin.validate.article.ArticleArchivesParam; import com.hxkj.admin.validate.article.ArticleParam;
import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.ArticleDetailVo; import com.hxkj.admin.vo.common.article.ArticleDetailVo;
import com.hxkj.admin.vo.common.article.ArticleListVo; import com.hxkj.admin.vo.common.article.ArticleListVo;
@ -111,18 +111,18 @@ public class ArticleArchivesServiceImpl implements IArticleArchivesService {
* 文章新增 * 文章新增
* *
* @author fzr * @author fzr
* @param articleArchivesParam 文章参数 * @param articleParam 文章参数
*/ */
@Override @Override
public void add(ArticleArchivesParam articleArchivesParam) { public void add(ArticleParam articleParam) {
Article model = new Article(); Article model = new Article();
model.setCid(articleArchivesParam.getCid()); model.setCid(articleParam.getCid());
model.setTitle(articleArchivesParam.getTitle()); model.setTitle(articleParam.getTitle());
model.setImage(UrlUtil.toRelativeUrl(articleArchivesParam.getImage())); model.setImage(UrlUtil.toRelativeUrl(articleParam.getImage()));
model.setIntro(articleArchivesParam.getIntro()); model.setIntro(articleParam.getIntro());
model.setContent(articleArchivesParam.getContent()); model.setContent(articleParam.getContent());
model.setSort(articleArchivesParam.getSort()); model.setSort(articleParam.getSort());
model.setIsShow(articleArchivesParam.getIsShow()); model.setIsShow(articleParam.getIsShow());
model.setVisit(0); model.setVisit(0);
model.setCreateTime(TimeUtil.timestamp()); model.setCreateTime(TimeUtil.timestamp());
model.setUpdateTime(TimeUtil.timestamp()); model.setUpdateTime(TimeUtil.timestamp());
@ -133,29 +133,29 @@ public class ArticleArchivesServiceImpl implements IArticleArchivesService {
* 文章编辑 * 文章编辑
* *
* @author fzr * @author fzr
* @param articleArchivesParam 文章参数 * @param articleParam 文章参数
*/ */
@Override @Override
public void edit(ArticleArchivesParam articleArchivesParam) { public void edit(ArticleParam articleParam) {
Article model = articleMapper.selectOne( Article model = articleMapper.selectOne(
new QueryWrapper<Article>() new QueryWrapper<Article>()
.eq("id", articleArchivesParam.getId()) .eq("id", articleParam.getId())
.eq("is_delete", 0)); .eq("is_delete", 0));
Assert.notNull(model, "文章不存在!"); Assert.notNull(model, "文章不存在!");
Assert.notNull(articleCategoryMapper.selectOne( Assert.notNull(articleCategoryMapper.selectOne(
new QueryWrapper<ArticleCategory>() new QueryWrapper<ArticleCategory>()
.eq("id", articleArchivesParam.getCid()) .eq("id", articleParam.getCid())
.eq("is_delete", 0)), "分类不存在"); .eq("is_delete", 0)), "分类不存在");
model.setCid(articleArchivesParam.getCid()); model.setCid(articleParam.getCid());
model.setTitle(articleArchivesParam.getTitle()); model.setTitle(articleParam.getTitle());
model.setImage(UrlUtil.toRelativeUrl(articleArchivesParam.getImage())); model.setImage(UrlUtil.toRelativeUrl(articleParam.getImage()));
model.setIntro(articleArchivesParam.getIntro()); model.setIntro(articleParam.getIntro());
model.setContent(articleArchivesParam.getContent()); model.setContent(articleParam.getContent());
model.setIsShow(articleArchivesParam.getIsShow()); model.setIsShow(articleParam.getIsShow());
model.setSort(articleArchivesParam.getSort()); model.setSort(articleParam.getSort());
model.setUpdateTime(TimeUtil.timestamp()); model.setUpdateTime(TimeUtil.timestamp());
articleMapper.updateById(model); articleMapper.updateById(model);
} }

View File

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

View File

@ -18,7 +18,7 @@ import java.io.Serializable;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@Accessors(chain = true) @Accessors(chain = true)
public class ArticleCategoryParam implements Serializable { public class ArticleCateParam implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -26,7 +26,7 @@ public class ArticleCategoryParam implements Serializable {
public interface update{} public interface update{}
public interface delete{} public interface delete{}
@IDMust(message = "id参数必传且需大于0", groups = {ArticleArchivesParam.create.class, ArticleArchivesParam.delete.class}) @IDMust(message = "id参数必传且需大于0", groups = {ArticleParam.create.class, ArticleParam.delete.class})
private Integer id; private Integer id;
@NotEmpty(message = "分类名称不能为空", groups = {create.class, update.class}) @NotEmpty(message = "分类名称不能为空", groups = {create.class, update.class})

View File

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