diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleCateController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleCateController.java index b4e033f7..42cb61de 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleCateController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleCateController.java @@ -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(); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleTextController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleTextController.java index d05d3dea..a3152e2b 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleTextController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleTextController.java @@ -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(); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/common/AlbumController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/CommonAlbumController.java similarity index 99% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/common/AlbumController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/common/CommonAlbumController.java index f1eb2102..5f69dc61 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/common/AlbumController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/CommonAlbumController.java @@ -21,7 +21,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/common/album") -public class AlbumController { +public class CommonAlbumController { @Resource IAlbumService iAlbumService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/common/IndexController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/CommonIndexController.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/common/IndexController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/common/CommonIndexController.java index 384523c6..ebefd3f9 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/common/IndexController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/CommonIndexController.java @@ -16,7 +16,7 @@ import java.util.Map; @Slf4j @RestController @RequestMapping("api/common/index") -public class IndexController { +public class CommonIndexController { @Resource IIndexService iIndexService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/common/UploadController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/CommonUploadController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/common/UploadController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/common/CommonUploadController.java index 9ccaa5c0..94af57d4 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/common/UploadController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/CommonUploadController.java @@ -23,7 +23,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/common/upload") -public class UploadController { +public class CommonUploadController { @Resource IAlbumService iAlbumService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/MonitorCacheController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/MonitorCacheController.java index 73cb857a..8ced93fe 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/MonitorCacheController.java @@ -19,7 +19,7 @@ import java.util.*; */ @RestController @RequestMapping("api/monitor") -public class CacheController { +public class MonitorCacheController { @Resource private RedisTemplate redisTemplate; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/MonitorServerController.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/MonitorServerController.java index a890c4f8..c1f22871 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/MonitorServerController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("api/monitor") -public class ServerController { +public class MonitorServerController { /** * 服务器信息 * diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingBasicsController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingBasicsController.java index fb721140..138c6526 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingBasicsController.java @@ -13,7 +13,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/setting/basics") -public class BasicsController { +public class SettingBasicsController { @Resource ISettingBasicsService iBasicsService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingDictDataController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingDictDataController.java new file mode 100644 index 00000000..e0f03f4b --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingDictDataController.java @@ -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(); + } + +} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingDictTypeController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingDictTypeController.java new file mode 100644 index 00000000..3f30ca5f --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingDictTypeController.java @@ -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(); + } + +} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/StorageController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingStorageController.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/setting/StorageController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingStorageController.java index 39754ca2..f3889cd1 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/StorageController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingStorageController.java @@ -11,7 +11,7 @@ import java.util.Map; @RestController @RequestMapping("api/setting/storage") -public class StorageController { +public class SettingStorageController { @Resource ISettingStorageService iStorageService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/AdminController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java similarity index 99% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/AdminController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java index ff2ffef4..59e71783 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/AdminController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java @@ -21,7 +21,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/system/admin") -public class AdminController { +public class SystemAdminController { @Resource ISystemAdminService iSystemAdminService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/DeptController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/DeptController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java index a2d2edd8..766c4dee 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/DeptController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java @@ -18,7 +18,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/system/dept") -public class DeptController { +public class SystemDeptController { @Resource ISystemDeptService iSystemDeptService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/LogController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/LogController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java index a3f84679..55ad07cb 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/LogController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java @@ -20,7 +20,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/system/log") -public class LogController { +public class SystemLogController { @Resource ISystemLogServer iSystemLogServer; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/LoginController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/LoginController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java index af3d4d29..2f7172b8 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/LoginController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java @@ -20,7 +20,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/system") -public class LoginController { +public class SystemLoginController { @Resource ISystemLoginService iSystemLoginService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/MenuController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/MenuController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java index 6f6c7067..5040d5f2 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/MenuController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java @@ -18,7 +18,7 @@ import javax.annotation.Resource; */ @RestController @RequestMapping("api/system/menu") -public class MenuController { +public class SystemMenuController { @Resource ISystemMenuService iSystemMenuService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/PostController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemPostController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/PostController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemPostController.java index bd704370..f124010d 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/PostController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemPostController.java @@ -16,7 +16,7 @@ import java.util.Map; @RestController @RequestMapping("api/system/post") -public class PostController { +public class SystemPostController { @Resource ISystemPostService iSystemPostService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/RoleController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/RoleController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java index 6c71bd4f..175d8d1a 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/RoleController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java @@ -18,7 +18,7 @@ import javax.annotation.Resource; */ @RestController @RequestMapping("api/system/role") -public class RoleController { +public class SystemRoleController { @Resource ISystemRoleService iSystemRoleService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleCateService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleCateService.java index 74550711..9f4d0a24 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleCateService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleCateService.java @@ -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); /** * 分类删除 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleTextService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleTextService.java index 908ab6b1..cdf8ff83 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleTextService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleTextService.java @@ -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); /** * 文章删除 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleCateServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleCateServiceImpl.java index 91a566c0..068e401e 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleCateServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleCateServiceImpl.java @@ -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() .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); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleTextServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleTextServiceImpl.java index 61e77d89..90c0966c 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleTextServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleTextServiceImpl.java @@ -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
() - .eq("id", articleParam.getId()) + .eq("id", articleTextParam.getId()) .eq("is_delete", 0)); Assert.notNull(model, "文章不存在!"); Assert.notNull(articleCategoryMapper.selectOne( new QueryWrapper() - .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); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java new file mode 100644 index 00000000..6a7a6ff4 --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java @@ -0,0 +1,7 @@ +package com.hxkj.admin.service.setting; + +/** + * 字典数据服务接口类 + */ +public interface ISettingDictDataService { +} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictTypeService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictTypeService.java new file mode 100644 index 00000000..c0c38d34 --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictTypeService.java @@ -0,0 +1,7 @@ +package com.hxkj.admin.service.setting; + +/** + * 字典类型服务接口类 + */ +public interface ISettingDictTypeService { +} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java new file mode 100644 index 00000000..00691ffb --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java @@ -0,0 +1,10 @@ +package com.hxkj.admin.service.setting.impl; + +import org.springframework.stereotype.Service; + +/** + * 字典数据服务实现类 + */ +@Service +public class SettingDictDataServiceImpl { +} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java new file mode 100644 index 00000000..499bc2a1 --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java @@ -0,0 +1,10 @@ +package com.hxkj.admin.service.setting.impl; + +import org.springframework.stereotype.Service; + +/** + * 字典类型服务实现类 + */ +@Service +public class SettingDictTypeServiceImpl { +} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemPostService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemPostService.java index 032e126a..87b6eaa1 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemPostService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemPostService.java @@ -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; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleCateParam.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleCateParam.java index 5965b8a7..39a504a5 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleCateParam.java @@ -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}) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleTextParam.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleTextParam.java index f5693ef4..ff0c44a2 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleTextParam.java @@ -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; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/setting/SettingDictDataParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/setting/SettingDictDataParam.java new file mode 100644 index 00000000..74367e99 --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/setting/SettingDictDataParam.java @@ -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; + +} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/setting/SettingDictTypeParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/setting/SettingDictTypeParam.java new file mode 100644 index 00000000..83411c15 --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/setting/SettingDictTypeParam.java @@ -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; + + +} diff --git a/server/like-common/src/main/java/com/hxkj/common/entity/setting/DictData.java b/server/like-common/src/main/java/com/hxkj/common/entity/setting/DictData.java new file mode 100644 index 00000000..7f4ad899 --- /dev/null +++ b/server/like-common/src/main/java/com/hxkj/common/entity/setting/DictData.java @@ -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; // 删除时间 + +} diff --git a/server/like-common/src/main/java/com/hxkj/common/entity/setting/DictType.java b/server/like-common/src/main/java/com/hxkj/common/entity/setting/DictType.java new file mode 100644 index 00000000..84d52209 --- /dev/null +++ b/server/like-common/src/main/java/com/hxkj/common/entity/setting/DictType.java @@ -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; // 删除时间 + +} diff --git a/server/like-common/src/main/java/com/hxkj/common/mapper/setting/DictDataMapper.java b/server/like-common/src/main/java/com/hxkj/common/mapper/setting/DictDataMapper.java new file mode 100644 index 00000000..0238a0a6 --- /dev/null +++ b/server/like-common/src/main/java/com/hxkj/common/mapper/setting/DictDataMapper.java @@ -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 { +} diff --git a/server/like-common/src/main/java/com/hxkj/common/mapper/setting/DictTypeMapper.java b/server/like-common/src/main/java/com/hxkj/common/mapper/setting/DictTypeMapper.java new file mode 100644 index 00000000..6aa26aaa --- /dev/null +++ b/server/like-common/src/main/java/com/hxkj/common/mapper/setting/DictTypeMapper.java @@ -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 { +}