统一代码风格

This commit is contained in:
TinyAnts 2022-07-18 15:05:31 +08:00
parent fdae717b4e
commit e6a9cf9a8b
35 changed files with 308 additions and 78 deletions

View File

@ -2,7 +2,7 @@ package com.hxkj.admin.controller.article;
import com.hxkj.admin.config.aop.Log;
import com.hxkj.admin.service.article.IArticleCateService;
import com.hxkj.admin.validate.article.CategoryParam;
import com.hxkj.admin.validate.article.ArticleCateParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.CategoryVo;
import com.hxkj.common.core.AjaxResult;
@ -74,8 +74,8 @@ public class ArticleCateController {
*/
@Log(title = "文章分类新增")
@PostMapping("/add")
public Object add(@Validated(value = CategoryParam.create.class)
@RequestBody CategoryParam articleCateParam) {
public Object add(@Validated(value = ArticleCateParam.create.class)
@RequestBody ArticleCateParam articleCateParam) {
iArticleCateService.add(articleCateParam);
return AjaxResult.success();
}
@ -89,8 +89,8 @@ public class ArticleCateController {
*/
@Log(title = "文章分类编辑")
@PostMapping("/edit")
public Object edit(@Validated(value = CategoryParam.update.class)
@RequestBody CategoryParam articleCateParam) {
public Object edit(@Validated(value = ArticleCateParam.update.class)
@RequestBody ArticleCateParam articleCateParam) {
iArticleCateService.edit(articleCateParam);
return AjaxResult.success();
}
@ -104,8 +104,8 @@ public class ArticleCateController {
*/
@Log(title = "文章分类删除")
@PostMapping("/cateDel")
public Object del(@Validated(value = CategoryParam.delete.class)
@RequestBody CategoryParam articleCateParam) {
public Object del(@Validated(value = ArticleCateParam.delete.class)
@RequestBody ArticleCateParam articleCateParam) {
iArticleCateService.del(articleCateParam.getId());
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.service.article.IArticleTextService;
import com.hxkj.admin.validate.article.ArticleParam;
import com.hxkj.admin.validate.article.ArticleTextParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.ArticleDetailVo;
import com.hxkj.admin.vo.common.article.ArticleListVo;
@ -57,15 +57,15 @@ public class ArticleTextController {
* 文章新增
*
* @author fzr
* @param articleParam 文章参数
* @param articleTextParam 文章参数
* @return Object
*/
@Log(title = "文章新增")
@PostMapping("/add")
public Object add(
@Validated(value = ArticleParam.create.class)
@RequestBody ArticleParam articleParam) {
iArticleTextService.add(articleParam);
@Validated(value = ArticleTextParam.create.class)
@RequestBody ArticleTextParam articleTextParam) {
iArticleTextService.add(articleTextParam);
return AjaxResult.success();
}
@ -73,14 +73,14 @@ public class ArticleTextController {
* 文章编辑
*
* @author fzr
* @param articleParam 文章参数
* @param articleTextParam 文章参数
* @return Object
*/
@Log(title = "文章编辑")
@PostMapping("/edit")
public Object edit(@Validated(value = ArticleParam.update.class)
@RequestBody ArticleParam articleParam) {
iArticleTextService.edit(articleParam);
public Object edit(@Validated(value = ArticleTextParam.update.class)
@RequestBody ArticleTextParam articleTextParam) {
iArticleTextService.edit(articleTextParam);
return AjaxResult.success();
}
@ -88,14 +88,14 @@ public class ArticleTextController {
* 文章删除
*
* @author fzr
* @param articleParam 文章参数
* @param articleTextParam 文章参数
* @return Object
*/
@Log(title = "文章删除")
@PostMapping("/del")
public Object del(@Validated(value = ArticleParam.delete.class)
@RequestBody ArticleParam articleParam) {
iArticleTextService.del(articleParam.getId());
public Object del(@Validated(value = ArticleTextParam.delete.class)
@RequestBody ArticleTextParam articleTextParam) {
iArticleTextService.del(articleTextParam.getId());
return AjaxResult.success();
}

View File

@ -21,7 +21,7 @@ import java.util.Map;
*/
@RestController
@RequestMapping("api/common/album")
public class AlbumController {
public class CommonAlbumController {
@Resource
IAlbumService iAlbumService;

View File

@ -16,7 +16,7 @@ import java.util.Map;
@Slf4j
@RestController
@RequestMapping("api/common/index")
public class IndexController {
public class CommonIndexController {
@Resource
IIndexService iIndexService;

View File

@ -23,7 +23,7 @@ import java.util.Map;
*/
@RestController
@RequestMapping("api/common/upload")
public class UploadController {
public class CommonUploadController {
@Resource
IAlbumService iAlbumService;

View File

@ -19,7 +19,7 @@ import java.util.*;
*/
@RestController
@RequestMapping("api/monitor")
public class CacheController {
public class MonitorCacheController {
@Resource
private RedisTemplate<String, String> redisTemplate;

View File

@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
*/
@RestController
@RequestMapping("api/monitor")
public class ServerController {
public class MonitorServerController {
/**
* 服务器信息
*

View File

@ -13,7 +13,7 @@ import java.util.Map;
*/
@RestController
@RequestMapping("api/setting/basics")
public class BasicsController {
public class SettingBasicsController {
@Resource
ISettingBasicsService iBasicsService;

View File

@ -0,0 +1,38 @@
package com.hxkj.admin.controller.setting;
import com.hxkj.common.core.AjaxResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("api/setting/dict/data")
public class SettingDictDataController {
@GetMapping("/list")
public Object list() {
return AjaxResult.success();
}
@GetMapping("/detail")
public Object detail() {
return AjaxResult.success();
}
@PostMapping("/add")
public Object add() {
return AjaxResult.success();
}
@PostMapping("/edit")
public Object edit() {
return AjaxResult.success();
}
@PostMapping("/del")
public Object del() {
return AjaxResult.success();
}
}

View File

@ -0,0 +1,38 @@
package com.hxkj.admin.controller.setting;
import com.hxkj.common.core.AjaxResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("api/setting/dict/type")
public class SettingDictTypeController {
@GetMapping("/list")
public Object list() {
return AjaxResult.success();
}
@GetMapping("/detail")
public Object detail() {
return AjaxResult.success();
}
@PostMapping("/add")
public Object add() {
return AjaxResult.success();
}
@PostMapping("/edit")
public Object edit() {
return AjaxResult.success();
}
@PostMapping("/del")
public Object del() {
return AjaxResult.success();
}
}

View File

@ -11,7 +11,7 @@ import java.util.Map;
@RestController
@RequestMapping("api/setting/storage")
public class StorageController {
public class SettingStorageController {
@Resource
ISettingStorageService iStorageService;

View File

@ -21,7 +21,7 @@ import java.util.Map;
*/
@RestController
@RequestMapping("api/system/admin")
public class AdminController {
public class SystemAdminController {
@Resource
ISystemAdminService iSystemAdminService;

View File

@ -18,7 +18,7 @@ import java.util.Map;
*/
@RestController
@RequestMapping("api/system/dept")
public class DeptController {
public class SystemDeptController {
@Resource
ISystemDeptService iSystemDeptService;

View File

@ -20,7 +20,7 @@ import java.util.Map;
*/
@RestController
@RequestMapping("api/system/log")
public class LogController {
public class SystemLogController {
@Resource
ISystemLogServer iSystemLogServer;

View File

@ -20,7 +20,7 @@ import java.util.Map;
*/
@RestController
@RequestMapping("api/system")
public class LoginController {
public class SystemLoginController {
@Resource
ISystemLoginService iSystemLoginService;

View File

@ -18,7 +18,7 @@ import javax.annotation.Resource;
*/
@RestController
@RequestMapping("api/system/menu")
public class MenuController {
public class SystemMenuController {
@Resource
ISystemMenuService iSystemMenuService;

View File

@ -16,7 +16,7 @@ import java.util.Map;
@RestController
@RequestMapping("api/system/post")
public class PostController {
public class SystemPostController {
@Resource
ISystemPostService iSystemPostService;

View File

@ -18,7 +18,7 @@ import javax.annotation.Resource;
*/
@RestController
@RequestMapping("api/system/role")
public class RoleController {
public class SystemRoleController {
@Resource
ISystemRoleService iSystemRoleService;

View File

@ -1,6 +1,6 @@
package com.hxkj.admin.service.article;
import com.hxkj.admin.validate.article.CategoryParam;
import com.hxkj.admin.validate.article.ArticleCateParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.CategoryVo;
import com.hxkj.common.core.PageResult;
@ -45,7 +45,7 @@ public interface IArticleCateService {
* @author fzr
* @param articleCateParam 分类参数
*/
void add(CategoryParam articleCateParam);
void add(ArticleCateParam articleCateParam);
/**
* 分类编辑
@ -53,7 +53,7 @@ public interface IArticleCateService {
* @author fzr
* @param articleCateParam 分类参数
*/
void edit(CategoryParam articleCateParam);
void edit(ArticleCateParam articleCateParam);
/**
* 分类删除

View File

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

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

View File

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

View File

@ -0,0 +1,7 @@
package com.hxkj.admin.service.setting;
/**
* 字典数据服务接口类
*/
public interface ISettingDictDataService {
}

View File

@ -0,0 +1,7 @@
package com.hxkj.admin.service.setting;
/**
* 字典类型服务接口类
*/
public interface ISettingDictTypeService {
}

View File

@ -0,0 +1,10 @@
package com.hxkj.admin.service.setting.impl;
import org.springframework.stereotype.Service;
/**
* 字典数据服务实现类
*/
@Service
public class SettingDictDataServiceImpl {
}

View File

@ -0,0 +1,10 @@
package com.hxkj.admin.service.setting.impl;
import org.springframework.stereotype.Service;
/**
* 字典类型服务实现类
*/
@Service
public class SettingDictTypeServiceImpl {
}

View File

@ -14,7 +14,6 @@ import com.hxkj.common.entity.system.SystemPost;
import com.hxkj.common.mapper.system.SystemAdminMapper;
import com.hxkj.common.mapper.system.SystemPostMapper;
import com.hxkj.common.utils.TimeUtil;
import com.hxkj.common.utils.UrlUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

View File

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

View File

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

View File

@ -0,0 +1,19 @@
package com.hxkj.admin.validate.setting;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* 字典数据参数
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SettingDictDataParam implements Serializable {
private static final long serialVersionUID = 1L;
}

View File

@ -0,0 +1,20 @@
package com.hxkj.admin.validate.setting;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* 字典类型参数
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SettingDictTypeParam implements Serializable {
private static final long serialVersionUID = 1L;
}

View File

@ -0,0 +1,30 @@
package com.hxkj.common.entity.setting;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
/**
* 字典数据实体
*/
@Data
public class DictData implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value="id", type= IdType.AUTO)
private Integer id; // 主键
private Integer typeId; // 类型
private String key; // 键名
private String value; // 数值
private String remark; // 备注
private Integer sort; // 排序
private Integer status; // 状态: 0=停用, 1-正常
private Integer isDelete; // 是否删除: 0=, 1=
private Long createTime; // 创建时间
private Long updateTime; // 更新时间
private Long deleteTime; // 删除时间
}

View File

@ -0,0 +1,28 @@
package com.hxkj.common.entity.setting;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
/**
* 字典类型实体
*/
@Data
public class DictType implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value="id", type= IdType.AUTO)
private Integer id; // 字典主键
private String dictName; // 字典名称
private String dictType; // 字典类型
private String dictRemark; // 字典备注
private Integer dictStatus; // 字典状态: 0=停用, 1=正常
private Integer isDelete; // 是否删除: 0=, 1=
private Long createTime; // 创建时间
private Long updateTime; // 更新时间
private Long deleteTime; // 删除时间
}

View File

@ -0,0 +1,12 @@
package com.hxkj.common.mapper.setting;
import com.hxkj.common.core.basics.IBaseMapper;
import com.hxkj.common.entity.setting.DictData;
import org.apache.ibatis.annotations.Mapper;
/**
* 字典数据Mapper
*/
@Mapper
public interface DictDataMapper extends IBaseMapper<DictData> {
}

View File

@ -0,0 +1,12 @@
package com.hxkj.common.mapper.setting;
import com.hxkj.common.core.basics.IBaseMapper;
import com.hxkj.common.entity.setting.DictType;
import org.apache.ibatis.annotations.Mapper;
/**
* 字典类型Mapper
*/
@Mapper
public interface DictTypeMapper extends IBaseMapper<DictType> {
}