From b6aaff68f84c7f356b6c98851bc5915181d9696e Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Mon, 18 Jul 2022 15:50:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BB=A3=E7=A0=81=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ateController.java => CateController.java} | 10 ++-- ...extController.java => TextController.java} | 2 +- ...umController.java => AlbumController.java} | 2 +- ...exController.java => IndexController.java} | 2 +- ...dController.java => UploadController.java} | 2 +- ...heController.java => CacheController.java} | 2 +- ...rController.java => ServerController.java} | 2 +- ...sController.java => BasicsController.java} | 6 +-- .../setting/DictDataController.java | 50 +++++++++++++++++++ ...ontroller.java => DictTypeController.java} | 17 ++++--- .../setting/SettingDictDataController.java | 38 -------------- ...Controller.java => StorageController.java} | 6 +-- ...inController.java => AdminController.java} | 2 +- ...eptController.java => DeptController.java} | 2 +- ...mLogController.java => LogController.java} | 2 +- ...inController.java => LoginController.java} | 2 +- ...enuController.java => MenuController.java} | 2 +- ...ostController.java => PostController.java} | 2 +- ...oleController.java => RoleController.java} | 2 +- .../service/article/IArticleCateService.java | 8 +-- .../article/impl/ArticleCateServiceImpl.java | 18 +++---- ...BasicsService.java => IBasicsService.java} | 2 +- .../service/setting/IDictDataService.java | 24 +++++++++ ...TypeService.java => IDictTypeService.java} | 2 +- .../setting/ISettingDictDataService.java | 7 --- ...orageService.java => IStorageService.java} | 2 +- ...erviceImpl.java => BasicsServiceImpl.java} | 4 +- ...viceImpl.java => DictDataServiceImpl.java} | 2 +- ...viceImpl.java => DictTypeServiceImpl.java} | 2 +- ...rviceImpl.java => StorageServiceImpl.java} | 4 +- .../setting/SettingDictDataParam.java | 32 ++++++++++++ .../setting/SettingDictTypeParam.java | 25 ++++++++++ .../{CategoryVo.java => ArticleCateVo.java} | 2 +- .../com/hxkj/admin/vo/setting/DictDataVo.java | 15 ++++++ .../com/hxkj/admin/vo/setting/DictTypeVo.java | 15 ++++++ 35 files changed, 218 insertions(+), 99 deletions(-) rename server/like-admin/src/main/java/com/hxkj/admin/controller/article/{ArticleCateController.java => CateController.java} (90%) rename server/like-admin/src/main/java/com/hxkj/admin/controller/article/{ArticleTextController.java => TextController.java} (98%) rename server/like-admin/src/main/java/com/hxkj/admin/controller/common/{CommonAlbumController.java => AlbumController.java} (99%) rename server/like-admin/src/main/java/com/hxkj/admin/controller/common/{CommonIndexController.java => IndexController.java} (96%) rename server/like-admin/src/main/java/com/hxkj/admin/controller/common/{CommonUploadController.java => UploadController.java} (98%) rename server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/{MonitorCacheController.java => CacheController.java} (98%) rename server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/{MonitorServerController.java => ServerController.java} (94%) rename server/like-admin/src/main/java/com/hxkj/admin/controller/setting/{SettingBasicsController.java => BasicsController.java} (92%) create mode 100644 server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java rename server/like-admin/src/main/java/com/hxkj/admin/controller/setting/{SettingDictTypeController.java => DictTypeController.java} (54%) delete mode 100644 server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingDictDataController.java rename server/like-admin/src/main/java/com/hxkj/admin/controller/setting/{SettingStorageController.java => StorageController.java} (92%) rename server/like-admin/src/main/java/com/hxkj/admin/controller/system/{SystemAdminController.java => AdminController.java} (99%) rename server/like-admin/src/main/java/com/hxkj/admin/controller/system/{SystemDeptController.java => DeptController.java} (98%) rename server/like-admin/src/main/java/com/hxkj/admin/controller/system/{SystemLogController.java => LogController.java} (97%) rename server/like-admin/src/main/java/com/hxkj/admin/controller/system/{SystemLoginController.java => LoginController.java} (98%) rename server/like-admin/src/main/java/com/hxkj/admin/controller/system/{SystemMenuController.java => MenuController.java} (98%) rename server/like-admin/src/main/java/com/hxkj/admin/controller/system/{SystemPostController.java => PostController.java} (98%) rename server/like-admin/src/main/java/com/hxkj/admin/controller/system/{SystemRoleController.java => RoleController.java} (98%) rename server/like-admin/src/main/java/com/hxkj/admin/service/setting/{ISettingBasicsService.java => IBasicsService.java} (94%) create mode 100644 server/like-admin/src/main/java/com/hxkj/admin/service/setting/IDictDataService.java rename server/like-admin/src/main/java/com/hxkj/admin/service/setting/{ISettingDictTypeService.java => IDictTypeService.java} (65%) delete mode 100644 server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java rename server/like-admin/src/main/java/com/hxkj/admin/service/setting/{ISettingStorageService.java => IStorageService.java} (94%) rename server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/{SettingBasicsServiceImpl.java => BasicsServiceImpl.java} (95%) rename server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/{SettingDictDataServiceImpl.java => DictDataServiceImpl.java} (77%) rename server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/{SettingDictTypeServiceImpl.java => DictTypeServiceImpl.java} (77%) rename server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/{SettingStorageServiceImpl.java => StorageServiceImpl.java} (97%) rename server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/{CategoryVo.java => ArticleCateVo.java} (84%) create mode 100644 server/like-admin/src/main/java/com/hxkj/admin/vo/setting/DictDataVo.java create mode 100644 server/like-admin/src/main/java/com/hxkj/admin/vo/setting/DictTypeVo.java 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/CateController.java similarity index 90% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleCateController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/article/CateController.java index 42cb61de..40dcb5ee 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/CateController.java @@ -4,7 +4,7 @@ import com.hxkj.admin.config.aop.Log; import com.hxkj.admin.service.article.IArticleCateService; 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.admin.vo.common.article.ArticleCateVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; @@ -20,7 +20,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/article/cate") -public class ArticleCateController { +public class CateController { @Resource IArticleCateService iArticleCateService; @@ -33,7 +33,7 @@ public class ArticleCateController { */ @GetMapping("/all") public Object all() { - List list = iArticleCateService.all(); + List list = iArticleCateService.all(); return AjaxResult.success(list); } @@ -48,7 +48,7 @@ public class ArticleCateController { @GetMapping("/list") public Object list(@Validated PageParam pageParam, @RequestParam Map params) { - PageResult list = iArticleCateService.list(pageParam, params); + PageResult list = iArticleCateService.list(pageParam, params); return AjaxResult.success(list); } @@ -61,7 +61,7 @@ public class ArticleCateController { */ @GetMapping("/detail") public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { - CategoryVo vo = iArticleCateService.detail(id); + ArticleCateVo vo = iArticleCateService.detail(id); return AjaxResult.success(vo); } 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/TextController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleTextController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/article/TextController.java index a3152e2b..7b18077a 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/TextController.java @@ -20,7 +20,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/article") -public class ArticleTextController { +public class TextController { @Resource IArticleTextService iArticleTextService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/common/CommonAlbumController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/AlbumController.java similarity index 99% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/common/CommonAlbumController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/common/AlbumController.java index 5f69dc61..f1eb2102 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/common/CommonAlbumController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/AlbumController.java @@ -21,7 +21,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/common/album") -public class CommonAlbumController { +public class AlbumController { @Resource IAlbumService iAlbumService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/common/CommonIndexController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/IndexController.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/common/CommonIndexController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/common/IndexController.java index ebefd3f9..384523c6 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/common/CommonIndexController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/IndexController.java @@ -16,7 +16,7 @@ import java.util.Map; @Slf4j @RestController @RequestMapping("api/common/index") -public class CommonIndexController { +public class IndexController { @Resource IIndexService iIndexService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/common/CommonUploadController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/UploadController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/common/CommonUploadController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/common/UploadController.java index 94af57d4..9ccaa5c0 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/common/CommonUploadController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/UploadController.java @@ -23,7 +23,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/common/upload") -public class CommonUploadController { +public class UploadController { @Resource IAlbumService iAlbumService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/MonitorCacheController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/MonitorCacheController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java index 8ced93fe..73cb857a 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/MonitorCacheController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java @@ -19,7 +19,7 @@ import java.util.*; */ @RestController @RequestMapping("api/monitor") -public class MonitorCacheController { +public class CacheController { @Resource private RedisTemplate redisTemplate; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/MonitorServerController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/MonitorServerController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java index c1f22871..a890c4f8 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/MonitorServerController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("api/monitor") -public class MonitorServerController { +public class ServerController { /** * 服务器信息 * diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingBasicsController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingBasicsController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java index 138c6526..09df8c87 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingBasicsController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java @@ -1,7 +1,7 @@ package com.hxkj.admin.controller.setting; import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.setting.ISettingBasicsService; +import com.hxkj.admin.service.setting.IBasicsService; import com.hxkj.common.core.AjaxResult; import org.springframework.web.bind.annotation.*; @@ -13,10 +13,10 @@ import java.util.Map; */ @RestController @RequestMapping("api/setting/basics") -public class SettingBasicsController { +public class BasicsController { @Resource - ISettingBasicsService iBasicsService; + IBasicsService iBasicsService; /** * “获取”网站信息 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java new file mode 100644 index 00000000..5235e7e4 --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java @@ -0,0 +1,50 @@ +package com.hxkj.admin.controller.setting; + +import com.hxkj.admin.service.setting.IDictDataService; +import com.hxkj.admin.validate.common.PageParam; +import com.hxkj.admin.validate.setting.SettingDictDataParam; +import com.hxkj.common.core.AjaxResult; +import com.hxkj.common.validator.annotation.IDMust; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Map; + +@RestController +@RequestMapping("api/setting/dict/data") +public class DictDataController { + + @Resource + IDictDataService iSettingDictDataService; + + @GetMapping("/list") + public Object list(@Validated PageParam pageParam, + @RequestParam Map params) { + return AjaxResult.success(); + } + + @GetMapping("/detail") + public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { + return AjaxResult.success(); + } + + @PostMapping("/add") + public Object add(@Validated(value = SettingDictDataParam.create.class) + @RequestBody SettingDictDataParam settingDictDataParam) { + return AjaxResult.success(); + } + + @PostMapping("/edit") + public Object edit(@Validated(value = SettingDictDataParam.update.class) + @RequestBody SettingDictDataParam settingDictDataParam) { + return AjaxResult.success(); + } + + @PostMapping("/del") + public Object del(@Validated(value = SettingDictDataParam.delete.class) + @RequestBody SettingDictDataParam settingDictDataParam) { + 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/DictTypeController.java similarity index 54% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingDictTypeController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictTypeController.java index 3f30ca5f..94b1f442 100644 --- 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/DictTypeController.java @@ -1,22 +1,25 @@ package com.hxkj.admin.controller.setting; +import com.hxkj.admin.validate.common.PageParam; 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; +import com.hxkj.common.validator.annotation.IDMust; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; @RestController @RequestMapping("api/setting/dict/type") -public class SettingDictTypeController { +public class DictTypeController { @GetMapping("/list") - public Object list() { + public Object list(@Validated PageParam pageParam, + @RequestParam Map params) { return AjaxResult.success(); } @GetMapping("/detail") - public Object detail() { + public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { return AjaxResult.success(); } 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 deleted file mode 100644 index e0f03f4b..00000000 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingDictDataController.java +++ /dev/null @@ -1,38 +0,0 @@ -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/SettingStorageController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/StorageController.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingStorageController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/setting/StorageController.java index f3889cd1..2fdfe97b 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/SettingStorageController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/StorageController.java @@ -1,7 +1,7 @@ package com.hxkj.admin.controller.setting; import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.hxkj.admin.service.setting.ISettingStorageService; +import com.hxkj.admin.service.setting.IStorageService; import com.hxkj.common.core.AjaxResult; import org.springframework.web.bind.annotation.*; @@ -11,10 +11,10 @@ import java.util.Map; @RestController @RequestMapping("api/setting/storage") -public class SettingStorageController { +public class StorageController { @Resource - ISettingStorageService iStorageService; + IStorageService iStorageService; /** * 存储列表 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/AdminController.java similarity index 99% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/AdminController.java index 59e71783..ff2ffef4 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/AdminController.java @@ -21,7 +21,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/system/admin") -public class SystemAdminController { +public class AdminController { @Resource ISystemAdminService iSystemAdminService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/DeptController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/DeptController.java index 766c4dee..a2d2edd8 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/DeptController.java @@ -18,7 +18,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/system/dept") -public class SystemDeptController { +public class DeptController { @Resource ISystemDeptService iSystemDeptService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/LogController.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/LogController.java index 55ad07cb..a3f84679 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/LogController.java @@ -20,7 +20,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/system/log") -public class SystemLogController { +public class LogController { @Resource ISystemLogServer iSystemLogServer; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/LoginController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/LoginController.java index 2f7172b8..af3d4d29 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/LoginController.java @@ -20,7 +20,7 @@ import java.util.Map; */ @RestController @RequestMapping("api/system") -public class SystemLoginController { +public class LoginController { @Resource ISystemLoginService iSystemLoginService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/MenuController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/MenuController.java index 5040d5f2..6f6c7067 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/MenuController.java @@ -18,7 +18,7 @@ import javax.annotation.Resource; */ @RestController @RequestMapping("api/system/menu") -public class SystemMenuController { +public class MenuController { @Resource ISystemMenuService iSystemMenuService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemPostController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/PostController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemPostController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/PostController.java index f124010d..bd704370 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemPostController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/PostController.java @@ -16,7 +16,7 @@ import java.util.Map; @RestController @RequestMapping("api/system/post") -public class SystemPostController { +public class PostController { @Resource ISystemPostService iSystemPostService; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/RoleController.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/RoleController.java index 175d8d1a..6c71bd4f 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/RoleController.java @@ -18,7 +18,7 @@ import javax.annotation.Resource; */ @RestController @RequestMapping("api/system/role") -public class SystemRoleController { +public class RoleController { @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 9f4d0a24..24e9ee67 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 @@ -2,7 +2,7 @@ package com.hxkj.admin.service.article; 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.admin.vo.common.article.ArticleCateVo; import com.hxkj.common.core.PageResult; import java.util.List; @@ -19,7 +19,7 @@ public interface IArticleCateService { * @author fzr * @return List */ - List all(); + List all(); /** * 分类列表 @@ -29,7 +29,7 @@ public interface IArticleCateService { * @param params 搜索参数 * @return PageResult */ - PageResult list(PageParam pageParam, Map params); + PageResult list(PageParam pageParam, Map params); /** * 分类详情 @@ -37,7 +37,7 @@ public interface IArticleCateService { * @author fzr * @param id 分类ID */ - CategoryVo detail(Integer id); + ArticleCateVo detail(Integer id); /** * 分类新增 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 068e401e..e3cc3d33 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 @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hxkj.admin.service.article.IArticleCateService; 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.admin.vo.common.article.ArticleCateVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.article.ArticleCategory; import com.hxkj.common.mapper.article.ArticleCategoryMapper; @@ -36,16 +36,16 @@ public class ArticleCateServiceImpl implements IArticleCateService { * @return List */ @Override - public List all() { + public List all() { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select("id", "name", "sort", "is_show", "create_time", "update_time") .eq("is_delete", 0); List lists = articleCategoryMapper.selectList(queryWrapper); - List vos = new ArrayList<>(); + List vos = new ArrayList<>(); for (ArticleCategory category : lists) { - CategoryVo vo = new CategoryVo(); + ArticleCateVo vo = new ArticleCateVo(); BeanUtils.copyProperties(category, vo); vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime())); @@ -64,7 +64,7 @@ public class ArticleCateServiceImpl implements IArticleCateService { * @return PageResult */ @Override - public PageResult list(PageParam pageParam, Map params) { + public PageResult list(PageParam pageParam, Map params) { Integer pageNo = pageParam.getPageNo(); Integer pageSize = pageParam.getPageSize(); @@ -79,9 +79,9 @@ public class ArticleCateServiceImpl implements IArticleCateService { IPage iPage = articleCategoryMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper); - List list = new ArrayList<>(); + List list = new ArrayList<>(); for (ArticleCategory category : iPage.getRecords()) { - CategoryVo vo = new CategoryVo(); + ArticleCateVo vo = new ArticleCateVo(); BeanUtils.copyProperties(category, vo); vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime())); @@ -100,7 +100,7 @@ public class ArticleCateServiceImpl implements IArticleCateService { * @return CategoryVo */ @Override - public CategoryVo detail(Integer id) { + public ArticleCateVo detail(Integer id) { ArticleCategory model = articleCategoryMapper.selectOne( new QueryWrapper() .select(ArticleCategory.class, info-> @@ -111,7 +111,7 @@ public class ArticleCateServiceImpl implements IArticleCateService { Assert.notNull(model, "分类不存在"); - CategoryVo vo = new CategoryVo(); + ArticleCateVo vo = new ArticleCateVo(); BeanUtils.copyProperties(model, vo); vo.setCreateTime(TimeUtil.timestampToDate(model.getCreateTime())); vo.setUpdateTime(TimeUtil.timestampToDate(model.getUpdateTime())); diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingBasicsService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IBasicsService.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingBasicsService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/setting/IBasicsService.java index 5d84c4cb..e2c37e73 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingBasicsService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IBasicsService.java @@ -5,7 +5,7 @@ import java.util.Map; /** * 基础配置服务接口类 */ -public interface ISettingBasicsService { +public interface IBasicsService { /** * 获取网站信息 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IDictDataService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IDictDataService.java new file mode 100644 index 00000000..4a7ae0f9 --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IDictDataService.java @@ -0,0 +1,24 @@ +package com.hxkj.admin.service.setting; + +import com.hxkj.admin.validate.common.PageParam; +import com.hxkj.admin.validate.setting.SettingDictDataParam; +import com.hxkj.common.core.PageResult; + +import java.util.Map; + +/** + * 字典数据服务接口类 + */ +public interface IDictDataService { + + PageResult list(PageParam pageParam, Map params); + + Object detail(Integer id); + + void add(SettingDictDataParam settingDictDataParam); + + void edit(SettingDictDataParam settingDictDataParam); + + void del(Integer id); + +} 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/IDictTypeService.java similarity index 65% rename from server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictTypeService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/setting/IDictTypeService.java index c0c38d34..091fa77f 100644 --- 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/IDictTypeService.java @@ -3,5 +3,5 @@ package com.hxkj.admin.service.setting; /** * 字典类型服务接口类 */ -public interface ISettingDictTypeService { +public interface IDictTypeService { } 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 deleted file mode 100644 index 6a7a6ff4..00000000 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hxkj.admin.service.setting; - -/** - * 字典数据服务接口类 - */ -public interface ISettingDictDataService { -} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingStorageService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IStorageService.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingStorageService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/setting/IStorageService.java index 7fe61714..d1843ae7 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingStorageService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IStorageService.java @@ -6,7 +6,7 @@ import java.util.Map; /** * 存储配置接口类 */ -public interface ISettingStorageService { +public interface IStorageService { /** * 存储列表 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingBasicsServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/BasicsServiceImpl.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingBasicsServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/BasicsServiceImpl.java index f71395e7..c0550ce3 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingBasicsServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/BasicsServiceImpl.java @@ -1,6 +1,6 @@ package com.hxkj.admin.service.setting.impl; -import com.hxkj.admin.service.setting.ISettingBasicsService; +import com.hxkj.admin.service.setting.IBasicsService; import com.hxkj.common.utils.ConfigUtil; import com.hxkj.common.utils.UrlUtil; import org.springframework.stereotype.Service; @@ -12,7 +12,7 @@ import java.util.Map; * 基础配置服务实现类 */ @Service -public class SettingBasicsServiceImpl implements ISettingBasicsService { +public class BasicsServiceImpl implements IBasicsService { /** * 获取网站信息 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/DictDataServiceImpl.java similarity index 77% rename from server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/DictDataServiceImpl.java index 00691ffb..eb3ba5e6 100644 --- 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/DictDataServiceImpl.java @@ -6,5 +6,5 @@ import org.springframework.stereotype.Service; * 字典数据服务实现类 */ @Service -public class SettingDictDataServiceImpl { +public class DictDataServiceImpl { } 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/DictTypeServiceImpl.java similarity index 77% rename from server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/DictTypeServiceImpl.java index 499bc2a1..206a8ea3 100644 --- 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/DictTypeServiceImpl.java @@ -6,5 +6,5 @@ import org.springframework.stereotype.Service; * 字典类型服务实现类 */ @Service -public class SettingDictTypeServiceImpl { +public class DictTypeServiceImpl { } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingStorageServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/StorageServiceImpl.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingStorageServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/StorageServiceImpl.java index 3e32dac4..daf547ec 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingStorageServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/StorageServiceImpl.java @@ -2,7 +2,7 @@ package com.hxkj.admin.service.setting.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.hxkj.admin.service.setting.ISettingStorageService; +import com.hxkj.admin.service.setting.IStorageService; import com.hxkj.common.utils.ConfigUtil; import org.springframework.stereotype.Service; @@ -12,7 +12,7 @@ import java.util.*; * 存储配置实现类 */ @Service -public class SettingStorageServiceImpl implements ISettingStorageService { +public class StorageServiceImpl implements IStorageService { /** * 存储列表 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 index 74367e99..cda82a89 100644 --- 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 @@ -1,9 +1,14 @@ package com.hxkj.admin.validate.setting; +import com.hxkj.common.validator.annotation.IDMust; +import com.hxkj.common.validator.annotation.IntegerContains; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -16,4 +21,31 @@ public class SettingDictDataParam implements Serializable { private static final long serialVersionUID = 1L; + public interface create{} + public interface update{} + public interface delete{} + + @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class}) + private Integer id; + + @IDMust(message = "typeId参数必传且需大于0", groups = {create.class, update.class}) + private Integer typeId; + + @NotNull(message = "key参数缺失", groups = {create.class, update.class}) + private String key; + + @NotNull(message = "value参数缺失", groups = {create.class, update.class}) + @Length(max = 100, message = "键名不能超出100个字符", groups = {create.class, update.class}) + private String value; + + @Length(max = 200, message = "数值不能超出200个字符", groups = {create.class, update.class}) + private String remark; + + @DecimalMin(value = "0", message = "排序号值不能少于0", groups = {create.class, update.class}) + private Integer sort; + + @NotNull(message = "status参数缺失", groups = {create.class, update.class}) + @IntegerContains(values = {0, 1}, message = "status参数不在合法值内", groups = {create.class, update.class}) + private Integer status; + } 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 index 83411c15..6c33f95d 100644 --- 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 @@ -1,9 +1,13 @@ package com.hxkj.admin.validate.setting; +import com.hxkj.common.validator.annotation.IDMust; +import com.hxkj.common.validator.annotation.IntegerContains; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -16,5 +20,26 @@ public class SettingDictTypeParam implements Serializable { private static final long serialVersionUID = 1L; + public interface create{} + public interface update{} + public interface delete{} + + @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class}) + private Integer id; + + @NotNull(message = "dictName参数缺失", groups = {create.class, update.class}) + @Length(max = 200, message = "名称不能超出200个字符", groups = {create.class, update.class}) + private String dictName; + + @NotNull(message = "dictType参数缺失", groups = {create.class, update.class}) + @Length(max = 200, message = "类型不能超出200个字符", groups = {create.class, update.class}) + private String dictType; + + @Length(max = 200, message = "备注不能超出200个字符", groups = {create.class, update.class}) + private String dictRemark; + + @NotNull(message = "dictStatus参数缺失") + @IntegerContains(values = {0, 1}, message = "dictStatus参数不在合法值内", groups = {create.class, update.class}) + private String dictStatus; } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/CategoryVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleCateVo.java similarity index 84% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/CategoryVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleCateVo.java index cec480a2..ab0317f2 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/CategoryVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleCateVo.java @@ -8,7 +8,7 @@ import java.io.Serializable; * 文章分类Vo */ @Data -public class CategoryVo implements Serializable { +public class ArticleCateVo implements Serializable { private Integer id; private String name; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/setting/DictDataVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/setting/DictDataVo.java new file mode 100644 index 00000000..5da10515 --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/setting/DictDataVo.java @@ -0,0 +1,15 @@ +package com.hxkj.admin.vo.setting; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 字典数据Vo + */ +@Data +public class DictDataVo implements Serializable { + + private static final long serialVersionUID = 1L; + +} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/setting/DictTypeVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/setting/DictTypeVo.java new file mode 100644 index 00000000..95acbcf6 --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/setting/DictTypeVo.java @@ -0,0 +1,15 @@ +package com.hxkj.admin.vo.setting; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 字典类型Vo + */ +@Data +public class DictTypeVo implements Serializable { + + private static final long serialVersionUID = 1L; + +}