From 0a2eb0f2d9d8a670bd14c3ff882cdd30854b3b27 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 21 Jun 2022 15:11:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=98=E5=82=A8=E9=85=8D=E7=BD=AE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxkj/admin/LikeAdminInterceptor.java | 4 +- .../com/hxkj/admin/config/AdminConfig.java | 4 +- .../{ => common}/AlbumController.java | 12 +- .../{ => common}/ArticleController.java | 14 +- .../{ => common}/IndexController.java | 6 +- .../{ => common}/UploadController.java | 6 +- .../controller/setting/BasicsController.java | 4 +- .../controller/setting/StorageController.java | 73 +++++ .../system/SystemAdminController.java | 4 +- .../system/SystemDeptController.java | 2 +- .../system/SystemLogController.java | 4 +- .../system/SystemLoginController.java | 2 +- .../system/SystemMenuController.java | 2 +- .../system/SystemPostController.java | 4 +- .../system/SystemRoleController.java | 4 +- .../admin/service/ISystemAdminService.java | 97 ------ .../service/{ => common}/IAlbumService.java | 8 +- .../service/{ => common}/IArticleService.java | 10 +- .../service/{ => common}/IIndexService.java | 2 +- .../{ => common}/impl/AlbumServiceImpl.java | 20 +- .../{ => common}/impl/ArticleServiceImpl.java | 20 +- .../{ => common}/impl/IndexServiceImpl.java | 8 +- .../service/impl/SystemDeptServiceImpl.java | 218 ------------- .../service/{ => setting}/IBasicsService.java | 2 +- .../service/setting/IStorageService.java | 45 +++ .../{ => setting}/impl/BasicsServiceImpl.java | 4 +- .../setting/impl/StorageServiceImpl.java | 142 ++++++++ .../service/system/ISystemAdminService.java | 308 ++++++++++++++++++ .../{ => system}/ISystemDeptService.java | 2 +- .../{ => system}/ISystemLogServer.java | 4 +- .../{ => system}/ISystemLoginService.java | 2 +- .../{ => system}/ISystemMenuService.java | 2 +- .../{ => system}/ISystemPostService.java | 4 +- .../{ => system}/ISystemRoleMenuService.java | 2 +- .../{ => system}/ISystemRoleService.java | 4 +- .../impl/SystemAdminServiceImpl.java | 10 +- .../impl/SystemLogServerImpl.java | 6 +- .../impl/SystemLoginServiceImpl.java | 6 +- .../impl/SystemMenuServiceImpl.java | 6 +- .../{ => system}/impl/SystemPostService.java | 6 +- .../impl/SystemRoleMenuServiceImpl.java | 4 +- .../impl/SystemRoleServiceImpl.java | 8 +- .../admin/validate/article/ArticleParam.java | 1 - .../validate/{ => common}/AlbumParam.java | 2 +- .../validate/{ => common}/PageParam.java | 2 +- .../vo/{ => common}/album/AlbumCateVo.java | 2 +- .../admin/vo/{ => common}/album/AlbumVo.java | 2 +- .../{ => common}/article/ArticleDetailVo.java | 2 +- .../{ => common}/article/ArticleListVo.java | 2 +- .../vo/{ => common}/article/CategoryVo.java | 2 +- .../resources/application-example-pro.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../hxkj/common/entity/{ => album}/Album.java | 2 +- .../common/entity/{ => album}/AlbumCate.java | 2 +- .../common/entity/{ => article}/Article.java | 2 +- .../entity/{ => article}/ArticleCategory.java | 2 +- .../mapper/{ => album}/AlbumCateMapper.java | 4 +- .../mapper/{ => album}/AlbumMapper.java | 4 +- .../{ => article}/ArticleCategoryMapper.java | 4 +- .../mapper/{ => article}/ArticleMapper.java | 4 +- 60 files changed, 695 insertions(+), 443 deletions(-) rename server/like-admin/src/main/java/com/hxkj/admin/controller/{ => common}/AlbumController.java (93%) rename server/like-admin/src/main/java/com/hxkj/admin/controller/{ => common}/ArticleController.java (94%) rename server/like-admin/src/main/java/com/hxkj/admin/controller/{ => common}/IndexController.java (87%) rename server/like-admin/src/main/java/com/hxkj/admin/controller/{ => common}/UploadController.java (96%) create mode 100644 server/like-admin/src/main/java/com/hxkj/admin/controller/setting/StorageController.java delete mode 100644 server/like-admin/src/main/java/com/hxkj/admin/service/ISystemAdminService.java rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => common}/IAlbumService.java (89%) rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => common}/IArticleService.java (89%) rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => common}/IIndexService.java (88%) rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => common}/impl/AlbumServiceImpl.java (94%) rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => common}/impl/ArticleServiceImpl.java (95%) rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => common}/impl/IndexServiceImpl.java (93%) delete mode 100644 server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => setting}/IBasicsService.java (94%) create mode 100644 server/like-admin/src/main/java/com/hxkj/admin/service/setting/IStorageService.java rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => setting}/impl/BasicsServiceImpl.java (96%) create mode 100644 server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/StorageServiceImpl.java create mode 100644 server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAdminService.java rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => system}/ISystemDeptService.java (96%) rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => system}/ISystemLogServer.java (89%) rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => system}/ISystemLoginService.java (92%) rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => system}/ISystemMenuService.java (96%) rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => system}/ISystemPostService.java (93%) rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => system}/ISystemRoleMenuService.java (96%) rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => system}/ISystemRoleService.java (92%) rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => system}/impl/SystemAdminServiceImpl.java (98%) rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => system}/impl/SystemLogServerImpl.java (96%) rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => system}/impl/SystemLoginServiceImpl.java (96%) rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => system}/impl/SystemMenuServiceImpl.java (97%) rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => system}/impl/SystemPostService.java (98%) rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => system}/impl/SystemRoleMenuServiceImpl.java (97%) rename server/like-admin/src/main/java/com/hxkj/admin/service/{ => system}/impl/SystemRoleServiceImpl.java (96%) rename server/like-admin/src/main/java/com/hxkj/admin/validate/{ => common}/AlbumParam.java (97%) rename server/like-admin/src/main/java/com/hxkj/admin/validate/{ => common}/PageParam.java (94%) rename server/like-admin/src/main/java/com/hxkj/admin/vo/{ => common}/album/AlbumCateVo.java (89%) rename server/like-admin/src/main/java/com/hxkj/admin/vo/{ => common}/album/AlbumVo.java (90%) rename server/like-admin/src/main/java/com/hxkj/admin/vo/{ => common}/article/ArticleDetailVo.java (92%) rename server/like-admin/src/main/java/com/hxkj/admin/vo/{ => common}/article/ArticleListVo.java (90%) rename server/like-admin/src/main/java/com/hxkj/admin/vo/{ => common}/article/CategoryVo.java (87%) rename server/like-common/src/main/java/com/hxkj/common/entity/{ => album}/Album.java (94%) rename server/like-common/src/main/java/com/hxkj/common/entity/{ => album}/AlbumCate.java (93%) rename server/like-common/src/main/java/com/hxkj/common/entity/{ => article}/Article.java (94%) rename server/like-common/src/main/java/com/hxkj/common/entity/{ => article}/ArticleCategory.java (93%) rename server/like-common/src/main/java/com/hxkj/common/mapper/{ => album}/AlbumCateMapper.java (69%) rename server/like-common/src/main/java/com/hxkj/common/mapper/{ => album}/AlbumMapper.java (69%) rename server/like-common/src/main/java/com/hxkj/common/mapper/{ => article}/ArticleCategoryMapper.java (68%) rename server/like-common/src/main/java/com/hxkj/common/mapper/{ => article}/ArticleMapper.java (68%) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java b/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java index 12ccbfd3..f5414651 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java @@ -3,8 +3,8 @@ package com.hxkj.admin; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.hxkj.admin.config.AdminConfig; -import com.hxkj.admin.service.ISystemAdminService; -import com.hxkj.admin.service.ISystemRoleMenuService; +import com.hxkj.admin.service.system.ISystemAdminService; +import com.hxkj.admin.service.system.ISystemRoleMenuService; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.enums.HttpEnum; import com.hxkj.common.utils.RedisUtil; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java b/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java index a3d19d33..fdffa425 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java @@ -16,8 +16,8 @@ public class AdminConfig { // 免登录验证 public static String[] notLoginUri = new String[]{ - "system:login", // 登录接口 - "index:config" // 配置接口 + "system:login", // 登录接口 + "common:index:config" // 配置接口 }; // 免权限验证 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/AlbumController.java similarity index 93% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/common/AlbumController.java index 826742d0..f1eb2102 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/AlbumController.java @@ -1,11 +1,11 @@ -package com.hxkj.admin.controller; +package com.hxkj.admin.controller.common; import com.alibaba.fastjson.JSONArray; import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.IAlbumService; -import com.hxkj.admin.validate.AlbumParam; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.vo.album.AlbumVo; +import com.hxkj.admin.service.common.IAlbumService; +import com.hxkj.admin.validate.common.AlbumParam; +import com.hxkj.admin.validate.common.PageParam; +import com.hxkj.admin.vo.common.album.AlbumVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.utils.ArrayUtil; @@ -20,7 +20,7 @@ import java.util.Map; * 相册管理 */ @RestController -@RequestMapping("api/album") +@RequestMapping("api/common/album") public class AlbumController { @Resource diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/ArticleController.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/common/ArticleController.java index 4c703705..13747b83 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/ArticleController.java @@ -1,13 +1,13 @@ -package com.hxkj.admin.controller; +package com.hxkj.admin.controller.common; import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.IArticleService; +import com.hxkj.admin.service.common.IArticleService; import com.hxkj.admin.validate.article.CategoryParam; import com.hxkj.admin.validate.article.ArticleParam; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.vo.article.ArticleDetailVo; -import com.hxkj.admin.vo.article.ArticleListVo; -import com.hxkj.admin.vo.article.CategoryVo; +import com.hxkj.admin.validate.common.PageParam; +import com.hxkj.admin.vo.common.article.ArticleDetailVo; +import com.hxkj.admin.vo.common.article.ArticleListVo; +import com.hxkj.admin.vo.common.article.CategoryVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; @RestController -@RequestMapping("api/article") +@RequestMapping("api/common/article") public class ArticleController { @Resource diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/IndexController.java similarity index 87% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/common/IndexController.java index 21f8a5e4..384523c6 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/IndexController.java @@ -1,6 +1,6 @@ -package com.hxkj.admin.controller; +package com.hxkj.admin.controller.common; -import com.hxkj.admin.service.IIndexService; +import com.hxkj.admin.service.common.IIndexService; import com.hxkj.common.core.AjaxResult; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; @@ -15,7 +15,7 @@ import java.util.Map; */ @Slf4j @RestController -@RequestMapping("api/index") +@RequestMapping("api/common/index") public class IndexController { @Resource diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/UploadController.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/common/UploadController.java index 152ab16b..9ccaa5c0 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/UploadController.java @@ -1,8 +1,8 @@ -package com.hxkj.admin.controller; +package com.hxkj.admin.controller.common; import com.hxkj.admin.LikeAdminThreadLocal; import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.IAlbumService; +import com.hxkj.admin.service.common.IAlbumService; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.enums.AlbumEnum; import com.hxkj.common.exception.OperateException; @@ -22,7 +22,7 @@ import java.util.Map; * 上传管理 */ @RestController -@RequestMapping("api/upload") +@RequestMapping("api/common/upload") public class UploadController { @Resource 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/BasicsController.java index 3ae2cfff..09df8c87 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/BasicsController.java @@ -1,7 +1,7 @@ package com.hxkj.admin.controller.setting; import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.IBasicsService; +import com.hxkj.admin.service.setting.IBasicsService; import com.hxkj.common.core.AjaxResult; import org.springframework.web.bind.annotation.*; @@ -12,7 +12,7 @@ import java.util.Map; * 基础设置管理 */ @RestController -@RequestMapping("api/setting") +@RequestMapping("api/setting/basics") public class BasicsController { @Resource 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/StorageController.java new file mode 100644 index 00000000..2fdfe97b --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/StorageController.java @@ -0,0 +1,73 @@ +package com.hxkj.admin.controller.setting; + +import com.baomidou.mybatisplus.core.toolkit.Assert; +import com.hxkj.admin.service.setting.IStorageService; +import com.hxkj.common.core.AjaxResult; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("api/setting/storage") +public class StorageController { + + @Resource + IStorageService iStorageService; + + /** + * 存储列表 + * + * @author fzr + * @return Object + */ + @GetMapping("/list") + public Object list() { + List> list = iStorageService.list(); + return AjaxResult.success(list); + } + + /** + * 存储详情 + * + * @param alias 引擎别名 + * @return Object + */ + @GetMapping("/detail") + public Object detail(String alias) { + Map map = iStorageService.detail(alias); + return AjaxResult.success(map); + } + + /** + * 存储编辑 + * + * @author fzr + * @param params 参数 + * @return Object + */ + @PostMapping("/edit") + public Object edit(@RequestBody Map params) { + iStorageService.edit(params); + return AjaxResult.success(); + } + + /** + * 存储切换 + * + * @author fzr + * @param params 参数 + * @return Object + */ + @PostMapping("/change") + public Object change(@RequestBody Map params) { + Assert.notNull(params.get("alias"), "alias参数缺失"); + Assert.notNull(params.get("status"), "status参数缺失"); + String alias = params.get("alias"); + Integer status = Integer.parseInt(params.get("status")); + iStorageService.change(alias, status); + return AjaxResult.success(); + } + +} 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/SystemAdminController.java index ca125b9f..59e71783 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/SystemAdminController.java @@ -2,8 +2,8 @@ package com.hxkj.admin.controller.system; import com.hxkj.admin.LikeAdminThreadLocal; import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.ISystemAdminService; -import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.service.system.ISystemAdminService; +import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.validate.system.SystemAdminParam; import com.hxkj.admin.vo.system.SystemAdminVo; import com.hxkj.admin.vo.system.SystemSelfVo; 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/SystemDeptController.java index 85e9162a..766c4dee 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/SystemDeptController.java @@ -1,7 +1,7 @@ package com.hxkj.admin.controller.system; import com.alibaba.fastjson.JSONArray; -import com.hxkj.admin.service.ISystemDeptService; +import com.hxkj.admin.service.system.ISystemDeptService; import com.hxkj.admin.validate.system.SystemDeptParam; import com.hxkj.admin.vo.system.SystemDeptVo; import com.hxkj.common.core.AjaxResult; 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/SystemLogController.java index 549de132..55ad07cb 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/SystemLogController.java @@ -1,7 +1,7 @@ package com.hxkj.admin.controller.system; -import com.hxkj.admin.service.ISystemLogServer; -import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.service.system.ISystemLogServer; +import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.vo.system.LogLoginVo; import com.hxkj.admin.vo.system.LogOperateVo; import com.hxkj.common.core.AjaxResult; 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/SystemLoginController.java index 817b41b3..2f7172b8 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/SystemLoginController.java @@ -1,6 +1,6 @@ package com.hxkj.admin.controller.system; -import com.hxkj.admin.service.ISystemLoginService; +import com.hxkj.admin.service.system.ISystemLoginService; import com.hxkj.admin.validate.system.SystemLoginParam; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.exception.LoginException; 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/SystemMenuController.java index 4539e97d..5040d5f2 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/SystemMenuController.java @@ -3,7 +3,7 @@ package com.hxkj.admin.controller.system; import com.alibaba.fastjson.JSONArray; import com.hxkj.admin.LikeAdminThreadLocal; import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.ISystemMenuService; +import com.hxkj.admin.service.system.ISystemMenuService; import com.hxkj.admin.validate.system.SystemMenuParam; import com.hxkj.admin.vo.system.SystemMenuVo; import com.hxkj.common.core.AjaxResult; 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/SystemPostController.java index a3a6ec17..f124010d 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/SystemPostController.java @@ -1,7 +1,7 @@ package com.hxkj.admin.controller.system; -import com.hxkj.admin.service.ISystemPostService; -import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.service.system.ISystemPostService; +import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.validate.system.SystemPostParam; import com.hxkj.admin.vo.system.SystemPostVo; import com.hxkj.common.core.AjaxResult; 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/SystemRoleController.java index fcff8669..175d8d1a 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/SystemRoleController.java @@ -1,8 +1,8 @@ package com.hxkj.admin.controller.system; import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.ISystemRoleService; -import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.service.system.ISystemRoleService; +import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.validate.system.SystemRoleParam; import com.hxkj.admin.vo.system.SystemRoleVo; import com.hxkj.common.core.AjaxResult; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemAdminService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemAdminService.java deleted file mode 100644 index 8047ae2f..00000000 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemAdminService.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.hxkj.admin.service; - -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.validate.system.SystemAdminParam; -import com.hxkj.admin.vo.system.SystemAdminVo; -import com.hxkj.admin.vo.system.SystemSelfVo; -import com.hxkj.common.core.PageResult; -import com.hxkj.common.entity.system.SystemAdmin; - -import java.util.Map; - -/** - * 系统管理员服务接口类 - */ -public interface ISystemAdminService { - - /** - * 根据账号查找管理员 - * - * @author fzr - * @param username 主键ID - * @return SysAdmin - */ - SystemAdmin findByUsername(String username); - - /** - * 管理员列表 - * - * @author fzr - * @param pageParam 分页参数 - * @return PageResult - */ - PageResult list(PageParam pageParam, Map params); - - /** - * 当前管理员 - * - * @author fzr - * @return SystemSelfVo - */ - SystemSelfVo self(Integer adminId); - - /** - * 管理员详情 - * - * @author fzr - * @param id 主键参数 - * @return SysAdmin - */ - SystemAdminVo detail(Integer id); - - /** - * 管理员新增 - * - * @author fzr - * @param systemAdminParam 参数 - */ - void add(SystemAdminParam systemAdminParam); - - /** - * 管理员编辑 - * - * @author fzr - * @param systemAdminParam 参数 - */ - void edit(SystemAdminParam systemAdminParam); - - /** - * 当前管理员更新 - * - * @author fzr - * @param systemAdminParam 参数 - */ - void upInfo(SystemAdminParam systemAdminParam, Integer adminId); - - /** - * 管理员删除 - * - * @author fzr - * @param id 主键参数 - */ - void del(Integer id); - - /** - * 管理员状态切换 - * - * @author fzr - * @param id 主键参数 - */ - void disable(Integer id); - - /** - * 缓存管理员 - */ - void cacheAdminUserByUid(Integer id); - -} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/IAlbumService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/common/IAlbumService.java similarity index 89% rename from server/like-admin/src/main/java/com/hxkj/admin/service/IAlbumService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/common/IAlbumService.java index 09257fb2..33e251fa 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/IAlbumService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/common/IAlbumService.java @@ -1,9 +1,9 @@ -package com.hxkj.admin.service; +package com.hxkj.admin.service.common; import com.alibaba.fastjson.JSONArray; -import com.hxkj.admin.validate.AlbumParam; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.vo.album.AlbumVo; +import com.hxkj.admin.validate.common.AlbumParam; +import com.hxkj.admin.validate.common.PageParam; +import com.hxkj.admin.vo.common.album.AlbumVo; import com.hxkj.common.core.PageResult; import java.util.List; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/IArticleService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/common/IArticleService.java similarity index 89% rename from server/like-admin/src/main/java/com/hxkj/admin/service/IArticleService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/common/IArticleService.java index 7ad505ac..35b9061e 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/IArticleService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/common/IArticleService.java @@ -1,11 +1,11 @@ -package com.hxkj.admin.service; +package com.hxkj.admin.service.common; -import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.validate.article.CategoryParam; import com.hxkj.admin.validate.article.ArticleParam; -import com.hxkj.admin.vo.article.ArticleDetailVo; -import com.hxkj.admin.vo.article.ArticleListVo; -import com.hxkj.admin.vo.article.CategoryVo; +import com.hxkj.admin.vo.common.article.ArticleDetailVo; +import com.hxkj.admin.vo.common.article.ArticleListVo; +import com.hxkj.admin.vo.common.article.CategoryVo; import com.hxkj.common.core.PageResult; import java.util.List; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/common/IIndexService.java similarity index 88% rename from server/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/common/IIndexService.java index eebf56db..492e03e6 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/common/IIndexService.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.service; +package com.hxkj.admin.service.common; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/AlbumServiceImpl.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/AlbumServiceImpl.java index c3acf31f..cf53c104 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/AlbumServiceImpl.java @@ -1,20 +1,20 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.admin.service.common.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hxkj.admin.service.IAlbumService; -import com.hxkj.admin.validate.AlbumParam; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.vo.album.AlbumCateVo; -import com.hxkj.admin.vo.album.AlbumVo; +import com.hxkj.admin.service.common.IAlbumService; +import com.hxkj.admin.validate.common.AlbumParam; +import com.hxkj.admin.validate.common.PageParam; +import com.hxkj.admin.vo.common.album.AlbumCateVo; +import com.hxkj.admin.vo.common.album.AlbumVo; import com.hxkj.common.core.PageResult; -import com.hxkj.common.entity.Album; -import com.hxkj.common.entity.AlbumCate; -import com.hxkj.common.mapper.AlbumCateMapper; -import com.hxkj.common.mapper.AlbumMapper; +import com.hxkj.common.entity.album.Album; +import com.hxkj.common.entity.album.AlbumCate; +import com.hxkj.common.mapper.album.AlbumCateMapper; +import com.hxkj.common.mapper.album.AlbumMapper; import com.hxkj.common.utils.ArrayUtil; import com.hxkj.common.utils.TimeUtil; import com.hxkj.common.utils.ToolsUtil; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/ArticleServiceImpl.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/ArticleServiceImpl.java index f95d9022..846d0323 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/ArticleServiceImpl.java @@ -1,21 +1,21 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.admin.service.common.impl; 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.github.yulichang.query.MPJQueryWrapper; -import com.hxkj.admin.service.IArticleService; -import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.service.common.IArticleService; +import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.validate.article.CategoryParam; import com.hxkj.admin.validate.article.ArticleParam; -import com.hxkj.admin.vo.article.ArticleDetailVo; -import com.hxkj.admin.vo.article.ArticleListVo; -import com.hxkj.admin.vo.article.CategoryVo; +import com.hxkj.admin.vo.common.article.ArticleDetailVo; +import com.hxkj.admin.vo.common.article.ArticleListVo; +import com.hxkj.admin.vo.common.article.CategoryVo; import com.hxkj.common.core.PageResult; -import com.hxkj.common.entity.Article; -import com.hxkj.common.entity.ArticleCategory; -import com.hxkj.common.mapper.ArticleCategoryMapper; -import com.hxkj.common.mapper.ArticleMapper; +import com.hxkj.common.entity.article.Article; +import com.hxkj.common.entity.article.ArticleCategory; +import com.hxkj.common.mapper.article.ArticleCategoryMapper; +import com.hxkj.common.mapper.article.ArticleMapper; import com.hxkj.common.utils.StringUtil; import com.hxkj.common.utils.TimeUtil; import com.hxkj.common.utils.UrlUtil; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/IndexServiceImpl.java similarity index 93% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/IndexServiceImpl.java index af08b64b..e265cfc2 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/IndexServiceImpl.java @@ -1,9 +1,9 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.admin.service.common.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hxkj.admin.service.IIndexService; -import com.hxkj.common.entity.Article; -import com.hxkj.common.mapper.ArticleMapper; +import com.hxkj.admin.service.common.IIndexService; +import com.hxkj.common.entity.article.Article; +import com.hxkj.common.mapper.article.ArticleMapper; import com.hxkj.common.utils.ConfigUtil; import com.hxkj.common.utils.TimeUtil; import com.hxkj.common.utils.UrlUtil; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java deleted file mode 100644 index f4c1ced7..00000000 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java +++ /dev/null @@ -1,218 +0,0 @@ -package com.hxkj.admin.service.impl; - -import com.alibaba.fastjson.JSONArray; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.hxkj.admin.service.ISystemDeptService; -import com.hxkj.admin.validate.system.SystemDeptParam; -import com.hxkj.admin.vo.system.SystemDeptVo; -import com.hxkj.common.entity.system.SystemAdmin; -import com.hxkj.common.entity.system.SystemDept; -import com.hxkj.common.mapper.system.SystemAdminMapper; -import com.hxkj.common.mapper.system.SystemDeptMapper; -import com.hxkj.common.utils.ArrayUtil; -import com.hxkj.common.utils.TimeUtil; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -@Service -public class SystemDeptServiceImpl implements ISystemDeptService { - - @Resource - SystemDeptMapper systemDeptMapper; - - @Resource - SystemAdminMapper systemAdminMapper; - - /** - * 岗位所有 - * - * @author fzr - * @return List - */ - @Override - public List all() { - List systemDeptList = systemDeptMapper.selectList(new QueryWrapper() - .gt("pid", 0) - .eq("is_delete", 0) - .orderByDesc((Arrays.asList("id", "sort")))); - - List adminVoArrayList = new ArrayList<>(); - for (SystemDept systemDept : systemDeptList) { - SystemDeptVo vo = new SystemDeptVo(); - BeanUtils.copyProperties(systemDept, vo); - - vo.setUpdateTime(TimeUtil.timestampToDate(systemDept.getUpdateTime())); - vo.setCreateTime(TimeUtil.timestampToDate(systemDept.getCreateTime())); - adminVoArrayList.add(vo); - } - - return adminVoArrayList; - } - - /** - * 部门列表 - * - * @author fzr - * @param params 搜索参数 - * @return JSONArray - */ - @Override - public JSONArray list(Map params) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("is_delete", 0); - queryWrapper.orderByAsc(Arrays.asList("sort", "id")); - queryWrapper.select(SystemDept.class, info -> - !info.getColumn().equals("is_delete") && - !info.getColumn().equals("delete_time")); - - systemDeptMapper.setSearch(queryWrapper, params, new String[]{ - "like:name:str", - "=:isStop:int" - }); - - List systemDeptList = systemDeptMapper.selectList(queryWrapper); - - List lists = new ArrayList<>(); - for (SystemDept systemDept : systemDeptList) { - SystemDeptVo vo = new SystemDeptVo(); - BeanUtils.copyProperties(systemDept, vo); - - vo.setCreateTime(TimeUtil.timestampToDate(systemDept.getCreateTime())); - vo.setUpdateTime(TimeUtil.timestampToDate(systemDept.getUpdateTime())); - lists.add(vo); - } - - JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(lists)); - return ArrayUtil.listToTree(jsonArray, "id", "pid", "children"); - } - - /** - * 部门详情 - * - * @author fzr - * @param id 主键 - * @return SystemDeptVo - */ - @Override - public SystemDeptVo detail(Integer id) { - SystemDept systemDept = systemDeptMapper.selectOne( - new QueryWrapper() - .select(SystemDept.class, info -> - !info.getColumn().equals("is_delete") && - !info.getColumn().equals("delete_time")) - .eq("id", id) - .eq("is_delete", 0) - .last("limit 1")); - - Assert.notNull(systemDept, "部门已不存在!"); - - SystemDeptVo vo = new SystemDeptVo(); - BeanUtils.copyProperties(systemDept, vo); - vo.setCreateTime(TimeUtil.timestampToDate(systemDept.getCreateTime())); - vo.setUpdateTime(TimeUtil.timestampToDate(systemDept.getUpdateTime())); - - return vo; - } - - /** - * 部门新增 - * - * @author fzr - * @param systemDeptParam 参数 - */ - @Override - public void add(SystemDeptParam systemDeptParam) { - if (systemDeptParam.getPid() == 0) { - SystemDept systemDept = systemDeptMapper.selectOne( - new QueryWrapper() - .select("id,pid,name") - .eq("pid", 0) - .eq("is_delete", 0) - .last("limit 1")); - - Assert.isNull(systemDept, "顶级部门只允许有一个"); - } - - SystemDept model = new SystemDept(); - model.setPid(systemDeptParam.getPid()); - model.setName(systemDeptParam.getName()); - model.setDuty(systemDeptParam.getDuty()); - model.setMobile(systemDeptParam.getMobile()); - model.setSort(systemDeptParam.getSort()); - model.setIsStop(systemDeptParam.getIsStop()); - model.setIsDelete(0); - model.setCreateTime(System.currentTimeMillis() / 1000); - model.setUpdateTime(System.currentTimeMillis() / 1000); - systemDeptMapper.insert(model); - } - - /** - * 部门编辑 - * - * @author fzr - * @param systemDeptParam 参数 - */ - @Override - public void edit(SystemDeptParam systemDeptParam) { - SystemDept model = systemDeptMapper.selectOne( - new QueryWrapper() - .select(SystemDept.class, info -> - !info.getColumn().equals("is_delete") && - !info.getColumn().equals("delete_time")) - .eq("id", systemDeptParam.getId()) - .eq("is_delete", 0) - .last("limit 1")); - - Assert.notNull(model, "部门不存在"); - Assert.isFalse((model.getPid() == 0 && systemDeptParam.getPid() > 0), "顶级部门不能修改上级"); - Assert.isFalse(systemDeptParam.getId().equals(systemDeptParam.getPid()), "上级部门不能是自己"); - - model.setPid(systemDeptParam.getPid()); - model.setName(systemDeptParam.getName()); - model.setDuty(systemDeptParam.getDuty()); - model.setMobile(systemDeptParam.getMobile()); - model.setSort(systemDeptParam.getSort()); - model.setIsStop(systemDeptParam.getIsStop()); - model.setUpdateTime(System.currentTimeMillis() / 1000); - systemDeptMapper.updateById(model); - } - - /** - * 部门删除 - * - * @author fzr - * @param id 主键 - */ - @Override - public void del(Integer id) { - SystemDept model = systemDeptMapper.selectOne( - new QueryWrapper() - .select("id,pid,name") - .eq("id", id) - .eq("is_delete", 0) - .last("limit 1")); - - Assert.notNull(model, "部门不存在"); - Assert.isFalse((model.getPid() == 0), "顶级部门不能删除"); - - SystemAdmin systemAdmin = systemAdminMapper.selectOne(new QueryWrapper() - .select("id,nickname") - .eq("dept_id", id) - .eq("is_delete", 0) - .last("limit 1")); - - Assert.isNull(systemAdmin, "该部门已被“"+systemAdmin.getNickname()+"”管理员使用,请先移除"); - - model.setIsDelete(1); - model.setDeleteTime(System.currentTimeMillis() / 1000); - systemDeptMapper.updateById(model); - } - -} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/IBasicsService.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/IBasicsService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/setting/IBasicsService.java index 6ca9660d..e2c37e73 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/IBasicsService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IBasicsService.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.service; +package com.hxkj.admin.service.setting; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IStorageService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IStorageService.java new file mode 100644 index 00000000..d1843ae7 --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/IStorageService.java @@ -0,0 +1,45 @@ +package com.hxkj.admin.service.setting; + +import java.util.List; +import java.util.Map; + +/** + * 存储配置接口类 + */ +public interface IStorageService { + + /** + * 存储列表 + * + * @author fzr + * @return List> + */ + List> list(); + + /** + * 存储详情 + * + * @author fzr + * @param alias 引擎别名 + * @return Map + */ + Map detail(String alias); + + /** + * 存储编辑 + * + * @author fzr + * @param params 参数 + */ + void edit(Map params); + + /** + * 存储切换 + * + * @author fzr + * @param alias 引擎别名 + * @param status 状态 + */ + void change(String alias, Integer status); + +} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/BasicsServiceImpl.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/BasicsServiceImpl.java index 1aae9a21..c0550ce3 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.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.impl; +package com.hxkj.admin.service.setting.impl; -import com.hxkj.admin.service.IBasicsService; +import com.hxkj.admin.service.setting.IBasicsService; import com.hxkj.common.utils.ConfigUtil; import com.hxkj.common.utils.UrlUtil; import org.springframework.stereotype.Service; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/StorageServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/StorageServiceImpl.java new file mode 100644 index 00000000..5e40e923 --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/StorageServiceImpl.java @@ -0,0 +1,142 @@ +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.IStorageService; +import com.hxkj.common.utils.ConfigUtil; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * 存储配置实现类 + */ +@Service +public class StorageServiceImpl implements IStorageService { + + /** + * 存储列表 + * + * @author fzr + * @return List> + */ + @Override + public List> list() { + String engine = ConfigUtil.get("storage", "default", "local"); + List> list = new LinkedList<>(); + + Map local = new LinkedHashMap<>(); + local.put("alias", "qiniu"); + local.put("describe", "存储在本地服务器"); + local.put("status", engine.equals("local") ? 1 : 0); + list.add(local); + + Map qiniu = new LinkedHashMap<>(); + qiniu.put("alias", "qiniu"); + qiniu.put("describe", "存储在七牛云，请前往七牛云开通存储服务"); + qiniu.put("status", engine.equals("qiniu") ? 1 : 0); + list.add(qiniu); + + Map aliyun = new LinkedHashMap<>(); + aliyun.put("alias", "aliyun"); + aliyun.put("describe", "存储在阿里云，请前往阿里云开通存储服务"); + aliyun.put("status", engine.equals("aliyun") ? 1 : 0); + list.add(aliyun); + + Map qcloud = new LinkedHashMap<>(); + qcloud.put("alias", "qcloud"); + qcloud.put("describe", "存储在腾讯云，请前往腾讯云开通存储服务"); + qcloud.put("status", engine.equals("qcloud") ? 1 : 0); + list.add(qcloud); + + return list; + } + + /** + * 存储详情 + * + * @author fzr + * @param alias 存储别名 + * @return Map + */ + @Override + public Map detail(String alias) { + String engine = ConfigUtil.get("storage", "default", "local"); + Map config = ConfigUtil.getMap("storage", alias); + + Map map = new LinkedHashMap<>(); + map.put("name", config.getOrDefault("name", "")); + map.put("alias", alias); + map.put("status", engine.equals(alias) ? 1 : 0); + if (!alias.equals("local")) { + map.put("bucket", config.getOrDefault("bucket", "")); + map.put("secretKey", config.getOrDefault("secret_key", "")); + map.put("accessKey", config.getOrDefault("access_key", "")); + map.put("domain", config.getOrDefault("domain", "")); + if (alias.equals("qcloud")) { + map.put("region", config.getOrDefault("region", "")); + } + } + + return map; + } + + /** + * 存储编辑 + * + * @author fzr + * @param params 参数 + */ + @Override + public void edit(Map params) { + Assert.notNull(params.get("alias"), "alias参数缺失"); + Assert.notNull(params.get("status"), "status参数缺失"); + Map map = new LinkedHashMap<>(); + + map.put("name", "本地存储"); + if (!params.get("alias").equals("local")) { + map.put("bucket", params.getOrDefault("bucket", "")); + map.put("secretKey", params.getOrDefault("secretKey", "")); + map.put("accessKey", params.getOrDefault("accessKey", "")); + map.put("domain", params.getOrDefault("domain", "")); + switch (params.get("alias")) { + case "qcloud": + map.put("name", "腾讯云存储"); + map.put("region", params.getOrDefault("region", "")); + break; + case "qiniu": + map.put("name", "七牛云存储"); + break; + case "aliyun": + map.put("name", "阿里云存储"); + break; + } + } + + String engine = ConfigUtil.get("storage", "default", "local"); + ConfigUtil.set("storage", params.get("alias"), JSON.toJSONString(map)); + if (Integer.parseInt(params.get("status")) == 1) { + ConfigUtil.set("storage", "default", params.get("alias")); + } else if (engine.equals(params.get("alias")) && Integer.parseInt(params.get("status")) == 0) { + ConfigUtil.set("storage", "default", params.get("")); + } + } + + /** + * 引擎切换 + * + * @author fzr + * @param alias 引擎别名 + * @param status 状态 + */ + @Override + public void change(String alias, Integer status) { + String engine = ConfigUtil.get("storage", "default", "local"); + if (engine.equals(alias) && status == 0) { + ConfigUtil.set("storage", "default", ""); + } else { + ConfigUtil.set("storage", "default", alias); + } + } + +} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAdminService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAdminService.java new file mode 100644 index 00000000..ebdc0ad4 --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAdminService.java @@ -0,0 +1,308 @@ +package com.hxkj.admin.service.system; + +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Assert; +import com.hxkj.admin.validate.common.PageParam; +import com.hxkj.admin.validate.system.SystemAdminParam; +import com.hxkj.admin.validate.system.SystemDeptParam; +import com.hxkj.admin.vo.system.SystemAdminVo; +import com.hxkj.admin.vo.system.SystemDeptVo; +import com.hxkj.admin.vo.system.SystemSelfVo; +import com.hxkj.common.core.PageResult; +import com.hxkj.common.entity.system.SystemAdmin; +import com.hxkj.common.entity.system.SystemDept; +import com.hxkj.common.mapper.system.SystemAdminMapper; +import com.hxkj.common.mapper.system.SystemDeptMapper; +import com.hxkj.common.utils.ArrayUtil; +import com.hxkj.common.utils.TimeUtil; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 系统管理员服务接口类 + */ +public interface ISystemAdminService { + + /** + * 根据账号查找管理员 + * + * @author fzr + * @param username 主键ID + * @return SysAdmin + */ + SystemAdmin findByUsername(String username); + + /** + * 管理员列表 + * + * @author fzr + * @param pageParam 分页参数 + * @return PageResult + */ + PageResult list(PageParam pageParam, Map params); + + /** + * 当前管理员 + * + * @author fzr + * @return SystemSelfVo + */ + SystemSelfVo self(Integer adminId); + + /** + * 管理员详情 + * + * @author fzr + * @param id 主键参数 + * @return SysAdmin + */ + SystemAdminVo detail(Integer id); + + /** + * 管理员新增 + * + * @author fzr + * @param systemAdminParam 参数 + */ + void add(SystemAdminParam systemAdminParam); + + /** + * 管理员编辑 + * + * @author fzr + * @param systemAdminParam 参数 + */ + void edit(SystemAdminParam systemAdminParam); + + /** + * 当前管理员更新 + * + * @author fzr + * @param systemAdminParam 参数 + */ + void upInfo(SystemAdminParam systemAdminParam, Integer adminId); + + /** + * 管理员删除 + * + * @author fzr + * @param id 主键参数 + */ + void del(Integer id); + + /** + * 管理员状态切换 + * + * @author fzr + * @param id 主键参数 + */ + void disable(Integer id); + + /** + * 缓存管理员 + */ + void cacheAdminUserByUid(Integer id); + + @Service + class SystemDeptServiceImpl implements ISystemDeptService { + + @Resource + SystemDeptMapper systemDeptMapper; + + @Resource + SystemAdminMapper systemAdminMapper; + + /** + * 岗位所有 + * + * @author fzr + * @return List + */ + @Override + public List all() { + List systemDeptList = systemDeptMapper.selectList(new QueryWrapper() + .gt("pid", 0) + .eq("is_delete", 0) + .orderByDesc((Arrays.asList("id", "sort")))); + + List adminVoArrayList = new ArrayList<>(); + for (SystemDept systemDept : systemDeptList) { + SystemDeptVo vo = new SystemDeptVo(); + BeanUtils.copyProperties(systemDept, vo); + + vo.setUpdateTime(TimeUtil.timestampToDate(systemDept.getUpdateTime())); + vo.setCreateTime(TimeUtil.timestampToDate(systemDept.getCreateTime())); + adminVoArrayList.add(vo); + } + + return adminVoArrayList; + } + + /** + * 部门列表 + * + * @author fzr + * @param params 搜索参数 + * @return JSONArray + */ + @Override + public JSONArray list(Map params) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("is_delete", 0); + queryWrapper.orderByAsc(Arrays.asList("sort", "id")); + queryWrapper.select(SystemDept.class, info -> + !info.getColumn().equals("is_delete") && + !info.getColumn().equals("delete_time")); + + systemDeptMapper.setSearch(queryWrapper, params, new String[]{ + "like:name:str", + "=:isStop:int" + }); + + List systemDeptList = systemDeptMapper.selectList(queryWrapper); + + List lists = new ArrayList<>(); + for (SystemDept systemDept : systemDeptList) { + SystemDeptVo vo = new SystemDeptVo(); + BeanUtils.copyProperties(systemDept, vo); + + vo.setCreateTime(TimeUtil.timestampToDate(systemDept.getCreateTime())); + vo.setUpdateTime(TimeUtil.timestampToDate(systemDept.getUpdateTime())); + lists.add(vo); + } + + JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(lists)); + return ArrayUtil.listToTree(jsonArray, "id", "pid", "children"); + } + + /** + * 部门详情 + * + * @author fzr + * @param id 主键 + * @return SystemDeptVo + */ + @Override + public SystemDeptVo detail(Integer id) { + SystemDept systemDept = systemDeptMapper.selectOne( + new QueryWrapper() + .select(SystemDept.class, info -> + !info.getColumn().equals("is_delete") && + !info.getColumn().equals("delete_time")) + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(systemDept, "部门已不存在!"); + + SystemDeptVo vo = new SystemDeptVo(); + BeanUtils.copyProperties(systemDept, vo); + vo.setCreateTime(TimeUtil.timestampToDate(systemDept.getCreateTime())); + vo.setUpdateTime(TimeUtil.timestampToDate(systemDept.getUpdateTime())); + + return vo; + } + + /** + * 部门新增 + * + * @author fzr + * @param systemDeptParam 参数 + */ + @Override + public void add(SystemDeptParam systemDeptParam) { + if (systemDeptParam.getPid() == 0) { + SystemDept systemDept = systemDeptMapper.selectOne( + new QueryWrapper() + .select("id,pid,name") + .eq("pid", 0) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.isNull(systemDept, "顶级部门只允许有一个"); + } + + SystemDept model = new SystemDept(); + model.setPid(systemDeptParam.getPid()); + model.setName(systemDeptParam.getName()); + model.setDuty(systemDeptParam.getDuty()); + model.setMobile(systemDeptParam.getMobile()); + model.setSort(systemDeptParam.getSort()); + model.setIsStop(systemDeptParam.getIsStop()); + model.setIsDelete(0); + model.setCreateTime(System.currentTimeMillis() / 1000); + model.setUpdateTime(System.currentTimeMillis() / 1000); + systemDeptMapper.insert(model); + } + + /** + * 部门编辑 + * + * @author fzr + * @param systemDeptParam 参数 + */ + @Override + public void edit(SystemDeptParam systemDeptParam) { + SystemDept model = systemDeptMapper.selectOne( + new QueryWrapper() + .select(SystemDept.class, info -> + !info.getColumn().equals("is_delete") && + !info.getColumn().equals("delete_time")) + .eq("id", systemDeptParam.getId()) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "部门不存在"); + Assert.isFalse((model.getPid() == 0 && systemDeptParam.getPid() > 0), "顶级部门不能修改上级"); + Assert.isFalse(systemDeptParam.getId().equals(systemDeptParam.getPid()), "上级部门不能是自己"); + + model.setPid(systemDeptParam.getPid()); + model.setName(systemDeptParam.getName()); + model.setDuty(systemDeptParam.getDuty()); + model.setMobile(systemDeptParam.getMobile()); + model.setSort(systemDeptParam.getSort()); + model.setIsStop(systemDeptParam.getIsStop()); + model.setUpdateTime(System.currentTimeMillis() / 1000); + systemDeptMapper.updateById(model); + } + + /** + * 部门删除 + * + * @author fzr + * @param id 主键 + */ + @Override + public void del(Integer id) { + SystemDept model = systemDeptMapper.selectOne( + new QueryWrapper() + .select("id,pid,name") + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "部门不存在"); + Assert.isFalse((model.getPid() == 0), "顶级部门不能删除"); + + SystemAdmin systemAdmin = systemAdminMapper.selectOne(new QueryWrapper() + .select("id,nickname") + .eq("dept_id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.isNull(systemAdmin, "该部门已被“"+systemAdmin.getNickname()+"”管理员使用,请先移除"); + + model.setIsDelete(1); + model.setDeleteTime(System.currentTimeMillis() / 1000); + systemDeptMapper.updateById(model); + } + + } +} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemDeptService.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemDeptService.java index f0291401..51f779db 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemDeptService.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.service; +package com.hxkj.admin.service.system; import com.alibaba.fastjson.JSONArray; import com.hxkj.admin.validate.system.SystemDeptParam; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLogServer.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemLogServer.java similarity index 89% rename from server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLogServer.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemLogServer.java index d7d45409..61219cb3 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLogServer.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemLogServer.java @@ -1,6 +1,6 @@ -package com.hxkj.admin.service; +package com.hxkj.admin.service.system; -import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.vo.system.LogLoginVo; import com.hxkj.admin.vo.system.LogOperateVo; import com.hxkj.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLoginService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemLoginService.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLoginService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemLoginService.java index 5aa1c7b5..da7c6b8c 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLoginService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemLoginService.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.service; +package com.hxkj.admin.service.system; import com.hxkj.admin.validate.system.SystemLoginParam; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemMenuService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemMenuService.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/service/ISystemMenuService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemMenuService.java index 2d8fd7e2..40754ec1 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemMenuService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemMenuService.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.service; +package com.hxkj.admin.service.system; import com.alibaba.fastjson.JSONArray; import com.hxkj.admin.validate.system.SystemMenuParam; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemPostService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemPostService.java similarity index 93% rename from server/like-admin/src/main/java/com/hxkj/admin/service/ISystemPostService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemPostService.java index 4224dc53..eb3f582c 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemPostService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemPostService.java @@ -1,6 +1,6 @@ -package com.hxkj.admin.service; +package com.hxkj.admin.service.system; -import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.validate.system.SystemPostParam; import com.hxkj.admin.vo.system.SystemPostVo; import com.hxkj.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleMenuService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemRoleMenuService.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleMenuService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemRoleMenuService.java index 1fa03f7f..760ae4ba 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleMenuService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemRoleMenuService.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.service; +package com.hxkj.admin.service.system; import java.util.List; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemRoleService.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemRoleService.java index 96451a6a..9b1bcb17 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemRoleService.java @@ -1,6 +1,6 @@ -package com.hxkj.admin.service; +package com.hxkj.admin.service.system; -import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.validate.system.SystemRoleParam; import com.hxkj.admin.vo.system.SystemRoleVo; import com.hxkj.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAdminServiceImpl.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAdminServiceImpl.java index 11071690..167235e7 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAdminServiceImpl.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.admin.service.system.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -8,10 +8,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; import com.hxkj.admin.LikeAdminThreadLocal; import com.hxkj.admin.config.AdminConfig; -import com.hxkj.admin.service.ISystemAdminService; -import com.hxkj.admin.service.ISystemRoleMenuService; -import com.hxkj.admin.service.ISystemRoleService; -import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.service.system.ISystemAdminService; +import com.hxkj.admin.service.system.ISystemRoleMenuService; +import com.hxkj.admin.service.system.ISystemRoleService; +import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.validate.system.SystemAdminParam; import com.hxkj.admin.vo.system.SystemAdminVo; import com.hxkj.admin.vo.system.SystemRoleVo; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemLogServerImpl.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemLogServerImpl.java index e4fc3a3d..380bd47f 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemLogServerImpl.java @@ -1,11 +1,11 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.admin.service.system.impl; 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.github.yulichang.query.MPJQueryWrapper; -import com.hxkj.admin.service.ISystemLogServer; -import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.service.system.ISystemLogServer; +import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.vo.system.LogLoginVo; import com.hxkj.admin.vo.system.LogOperateVo; import com.hxkj.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemLoginServiceImpl.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemLoginServiceImpl.java index bc1fe9d6..7c8a4bd1 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemLoginServiceImpl.java @@ -1,8 +1,8 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.admin.service.system.impl; import com.hxkj.admin.config.AdminConfig; -import com.hxkj.admin.service.ISystemAdminService; -import com.hxkj.admin.service.ISystemLoginService; +import com.hxkj.admin.service.system.ISystemAdminService; +import com.hxkj.admin.service.system.ISystemLoginService; import com.hxkj.admin.validate.system.SystemLoginParam; import com.hxkj.common.entity.system.SystemAdmin; import com.hxkj.common.entity.system.SystemLogLogin; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemMenuServiceImpl.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemMenuServiceImpl.java index 6f766f13..236166a7 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemMenuServiceImpl.java @@ -1,12 +1,12 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.admin.service.system.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.hxkj.admin.LikeAdminThreadLocal; import com.hxkj.admin.config.AdminConfig; -import com.hxkj.admin.service.ISystemMenuService; -import com.hxkj.admin.service.ISystemRoleMenuService; +import com.hxkj.admin.service.system.ISystemMenuService; +import com.hxkj.admin.service.system.ISystemRoleMenuService; import com.hxkj.admin.validate.system.SystemMenuParam; import com.hxkj.admin.vo.system.SystemMenuVo; import com.hxkj.common.entity.system.SystemMenu; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemPostService.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemPostService.java index b9770414..9d8d8110 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemPostService.java @@ -1,11 +1,11 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.admin.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hxkj.admin.service.ISystemPostService; -import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.service.system.ISystemPostService; +import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.validate.system.SystemPostParam; import com.hxkj.admin.vo.system.SystemPostVo; import com.hxkj.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemRoleMenuServiceImpl.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemRoleMenuServiceImpl.java index f91a1200..f6658211 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemRoleMenuServiceImpl.java @@ -1,8 +1,8 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.admin.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.hxkj.admin.config.AdminConfig; -import com.hxkj.admin.service.ISystemRoleMenuService; +import com.hxkj.admin.service.system.ISystemRoleMenuService; import com.hxkj.common.entity.system.SystemMenu; import com.hxkj.common.entity.system.SystemRoleMenu; import com.hxkj.common.mapper.system.SystemMenuMapper; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemRoleServiceImpl.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemRoleServiceImpl.java index 08e981a3..3f743d0e 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemRoleServiceImpl.java @@ -1,13 +1,13 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.admin.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hxkj.admin.config.AdminConfig; -import com.hxkj.admin.service.ISystemRoleMenuService; -import com.hxkj.admin.service.ISystemRoleService; -import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.service.system.ISystemRoleMenuService; +import com.hxkj.admin.service.system.ISystemRoleService; +import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.validate.system.SystemRoleParam; import com.hxkj.admin.vo.system.SystemRoleVo; import com.hxkj.common.core.PageResult; 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/ArticleParam.java index f93858e8..f5693ef4 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/ArticleParam.java @@ -1,6 +1,5 @@ package com.hxkj.admin.validate.article; -import com.hxkj.admin.validate.system.SystemAdminParam; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/AlbumParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/common/AlbumParam.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/validate/AlbumParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/common/AlbumParam.java index 0900576d..1fc31659 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/AlbumParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/common/AlbumParam.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.validate; +package com.hxkj.admin.validate.common; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/PageParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/common/PageParam.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/validate/PageParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/common/PageParam.java index 405a2428..42137200 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/PageParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/common/PageParam.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.validate; +package com.hxkj.admin.validate.common; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/common/album/AlbumCateVo.java similarity index 89% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/common/album/AlbumCateVo.java index 000ca700..fc4f45cd 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/common/album/AlbumCateVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.album; +package com.hxkj.admin.vo.common.album; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/common/album/AlbumVo.java similarity index 90% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/common/album/AlbumVo.java index 53dcb2ed..dc88180f 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/common/album/AlbumVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.album; +package com.hxkj.admin.vo.common.album; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleDetailVo.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleDetailVo.java index 4af833ee..e20cf0b0 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleDetailVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.article; +package com.hxkj.admin.vo.common.article; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleListVo.java similarity index 90% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleListVo.java index 99361ab3..8c49cfbc 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleListVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.article; +package com.hxkj.admin.vo.common.article; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/article/CategoryVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/CategoryVo.java similarity index 87% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/article/CategoryVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/CategoryVo.java index 76731fe8..cec480a2 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/article/CategoryVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/CategoryVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.article; +package com.hxkj.admin.vo.common.article; import lombok.Data; diff --git a/server/like-admin/src/main/resources/application-example-pro.yml b/server/like-admin/src/main/resources/application-example-pro.yml index 27dadffd..c7921758 100644 --- a/server/like-admin/src/main/resources/application-example-pro.yml +++ b/server/like-admin/src/main/resources/application-example-pro.yml @@ -6,7 +6,7 @@ like: spring: # 数据源配置 datasource: - url: jdbc:mysql://localhost:3306/local_frame?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false + url: jdbc:mysql://localhost:3306/local_admin_java?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false type: com.zaxxer.hikari.HikariDataSource # 数据源类型 driver-class-name: com.mysql.jdbc.Driver # MySql的驱动 username: root # 数据库账号 diff --git a/server/like-admin/src/main/resources/application.yml b/server/like-admin/src/main/resources/application.yml index 956422b3..6b987cf4 100644 --- a/server/like-admin/src/main/resources/application.yml +++ b/server/like-admin/src/main/resources/application.yml @@ -12,7 +12,7 @@ spring: active: pro # 数据源配置 datasource: - url: jdbc:mysql://localhost:3306/local_frame?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false + url: jdbc:mysql://localhost:3306/local_admin_java?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false type: com.zaxxer.hikari.HikariDataSource # 数据源类型 driver-class-name: com.mysql.jdbc.Driver # MySql的驱动 username: root # 数据库账号 diff --git a/server/like-common/src/main/java/com/hxkj/common/entity/Album.java b/server/like-common/src/main/java/com/hxkj/common/entity/album/Album.java similarity index 94% rename from server/like-common/src/main/java/com/hxkj/common/entity/Album.java rename to server/like-common/src/main/java/com/hxkj/common/entity/album/Album.java index e26d6d07..c668b056 100644 --- a/server/like-common/src/main/java/com/hxkj/common/entity/Album.java +++ b/server/like-common/src/main/java/com/hxkj/common/entity/album/Album.java @@ -1,4 +1,4 @@ -package com.hxkj.common.entity; +package com.hxkj.common.entity.album; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/server/like-common/src/main/java/com/hxkj/common/entity/AlbumCate.java b/server/like-common/src/main/java/com/hxkj/common/entity/album/AlbumCate.java similarity index 93% rename from server/like-common/src/main/java/com/hxkj/common/entity/AlbumCate.java rename to server/like-common/src/main/java/com/hxkj/common/entity/album/AlbumCate.java index 915ded62..aad30d49 100644 --- a/server/like-common/src/main/java/com/hxkj/common/entity/AlbumCate.java +++ b/server/like-common/src/main/java/com/hxkj/common/entity/album/AlbumCate.java @@ -1,4 +1,4 @@ -package com.hxkj.common.entity; +package com.hxkj.common.entity.album; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/server/like-common/src/main/java/com/hxkj/common/entity/Article.java b/server/like-common/src/main/java/com/hxkj/common/entity/article/Article.java similarity index 94% rename from server/like-common/src/main/java/com/hxkj/common/entity/Article.java rename to server/like-common/src/main/java/com/hxkj/common/entity/article/Article.java index fdf4aa1c..ff317c08 100644 --- a/server/like-common/src/main/java/com/hxkj/common/entity/Article.java +++ b/server/like-common/src/main/java/com/hxkj/common/entity/article/Article.java @@ -1,4 +1,4 @@ -package com.hxkj.common.entity; +package com.hxkj.common.entity.article; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/server/like-common/src/main/java/com/hxkj/common/entity/ArticleCategory.java b/server/like-common/src/main/java/com/hxkj/common/entity/article/ArticleCategory.java similarity index 93% rename from server/like-common/src/main/java/com/hxkj/common/entity/ArticleCategory.java rename to server/like-common/src/main/java/com/hxkj/common/entity/article/ArticleCategory.java index eff3f566..57715d9d 100644 --- a/server/like-common/src/main/java/com/hxkj/common/entity/ArticleCategory.java +++ b/server/like-common/src/main/java/com/hxkj/common/entity/article/ArticleCategory.java @@ -1,4 +1,4 @@ -package com.hxkj.common.entity; +package com.hxkj.common.entity.article; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/server/like-common/src/main/java/com/hxkj/common/mapper/AlbumCateMapper.java b/server/like-common/src/main/java/com/hxkj/common/mapper/album/AlbumCateMapper.java similarity index 69% rename from server/like-common/src/main/java/com/hxkj/common/mapper/AlbumCateMapper.java rename to server/like-common/src/main/java/com/hxkj/common/mapper/album/AlbumCateMapper.java index 0b53c184..653c6ac6 100644 --- a/server/like-common/src/main/java/com/hxkj/common/mapper/AlbumCateMapper.java +++ b/server/like-common/src/main/java/com/hxkj/common/mapper/album/AlbumCateMapper.java @@ -1,7 +1,7 @@ -package com.hxkj.common.mapper; +package com.hxkj.common.mapper.album; import com.hxkj.common.core.basics.IBaseMapper; -import com.hxkj.common.entity.AlbumCate; +import com.hxkj.common.entity.album.AlbumCate; import org.apache.ibatis.annotations.Mapper; /** diff --git a/server/like-common/src/main/java/com/hxkj/common/mapper/AlbumMapper.java b/server/like-common/src/main/java/com/hxkj/common/mapper/album/AlbumMapper.java similarity index 69% rename from server/like-common/src/main/java/com/hxkj/common/mapper/AlbumMapper.java rename to server/like-common/src/main/java/com/hxkj/common/mapper/album/AlbumMapper.java index f57f6d5a..139be769 100644 --- a/server/like-common/src/main/java/com/hxkj/common/mapper/AlbumMapper.java +++ b/server/like-common/src/main/java/com/hxkj/common/mapper/album/AlbumMapper.java @@ -1,7 +1,7 @@ -package com.hxkj.common.mapper; +package com.hxkj.common.mapper.album; import com.hxkj.common.core.basics.IBaseMapper; -import com.hxkj.common.entity.Album; +import com.hxkj.common.entity.album.Album; import org.apache.ibatis.annotations.Mapper; /** diff --git a/server/like-common/src/main/java/com/hxkj/common/mapper/ArticleCategoryMapper.java b/server/like-common/src/main/java/com/hxkj/common/mapper/article/ArticleCategoryMapper.java similarity index 68% rename from server/like-common/src/main/java/com/hxkj/common/mapper/ArticleCategoryMapper.java rename to server/like-common/src/main/java/com/hxkj/common/mapper/article/ArticleCategoryMapper.java index 7ac31d07..963ef187 100644 --- a/server/like-common/src/main/java/com/hxkj/common/mapper/ArticleCategoryMapper.java +++ b/server/like-common/src/main/java/com/hxkj/common/mapper/article/ArticleCategoryMapper.java @@ -1,7 +1,7 @@ -package com.hxkj.common.mapper; +package com.hxkj.common.mapper.article; import com.hxkj.common.core.basics.IBaseMapper; -import com.hxkj.common.entity.ArticleCategory; +import com.hxkj.common.entity.article.ArticleCategory; import org.apache.ibatis.annotations.Mapper; /** diff --git a/server/like-common/src/main/java/com/hxkj/common/mapper/ArticleMapper.java b/server/like-common/src/main/java/com/hxkj/common/mapper/article/ArticleMapper.java similarity index 68% rename from server/like-common/src/main/java/com/hxkj/common/mapper/ArticleMapper.java rename to server/like-common/src/main/java/com/hxkj/common/mapper/article/ArticleMapper.java index 6979220b..b106c261 100644 --- a/server/like-common/src/main/java/com/hxkj/common/mapper/ArticleMapper.java +++ b/server/like-common/src/main/java/com/hxkj/common/mapper/article/ArticleMapper.java @@ -1,7 +1,7 @@ -package com.hxkj.common.mapper; +package com.hxkj.common.mapper.article; import com.hxkj.common.core.basics.IBaseMapper; -import com.hxkj.common.entity.Article; +import com.hxkj.common.entity.article.Article; import org.apache.ibatis.annotations.Mapper; /**