diff --git a/server/like-admin/pom.xml b/server/like-admin/pom.xml index 723a952b..981c18b8 100644 --- a/server/like-admin/pom.xml +++ b/server/like-admin/pom.xml @@ -17,16 +17,24 @@ - + org.mdd like-common + + org.mdd like-generator 1.0.0 + + + + cn.dev33 + sa-token-spring-boot-starter + diff --git a/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java b/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java index a0fa7134..7b18d04b 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java +++ b/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java @@ -1,10 +1,10 @@ package com.mdd.admin; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.mdd.admin.config.AdminConfig; -import com.mdd.admin.service.system.ISystemAuthAdminService; -import com.mdd.admin.service.system.ISystemAuthPermService; +import com.mdd.admin.service.ISystemAuthAdminService; +import com.mdd.admin.service.ISystemAuthPermService; import com.mdd.common.core.AjaxResult; import com.mdd.common.enums.HttpEnum; import com.mdd.common.utils.RedisUtil; @@ -37,7 +37,7 @@ public class LikeAdminInterceptor implements HandlerInterceptor { // 404拦截 response.setContentType("application/json;charset=utf-8"); if (response.getStatus() == 404) { - AjaxResult result = AjaxResult.failed(HttpEnum.REQUEST_404_ERROR.getCode(), HttpEnum.REQUEST_404_ERROR.getMsg()); + AjaxResult result = AjaxResult.failed(HttpEnum.REQUEST_404_ERROR.getCode(), HttpEnum.REQUEST_404_ERROR.getMsg()); response.getWriter().print(JSON.toJSONString(result)); return false; } @@ -61,7 +61,7 @@ public class LikeAdminInterceptor implements HandlerInterceptor { // Token是否为空 String token = request.getHeader("token"); if (StringUtils.isBlank(token)) { - AjaxResult result = AjaxResult.failed(HttpEnum.TOKEN_EMPTY.getCode(), HttpEnum.TOKEN_EMPTY.getMsg()); + AjaxResult result = AjaxResult.failed(HttpEnum.TOKEN_EMPTY.getCode(), HttpEnum.TOKEN_EMPTY.getMsg()); response.getWriter().print(JSON.toJSONString(result)); return false; } @@ -69,7 +69,7 @@ public class LikeAdminInterceptor implements HandlerInterceptor { // Token是否过期 token = AdminConfig.backstageTokenKey + token; if (!RedisUtil.exists(token)) { - AjaxResult result = AjaxResult.failed(HttpEnum.TOKEN_INVALID.getCode(), HttpEnum.TOKEN_INVALID.getMsg()); + AjaxResult result = AjaxResult.failed(HttpEnum.TOKEN_INVALID.getCode(), HttpEnum.TOKEN_INVALID.getMsg()); response.getWriter().print(JSON.toJSONString(result)); return false; } @@ -85,14 +85,14 @@ public class LikeAdminInterceptor implements HandlerInterceptor { if (map == null || map.get("isDelete").equals("1")) { RedisUtil.del(token); RedisUtil.hDel(AdminConfig.backstageManageKey, uid); - AjaxResult result = AjaxResult.failed(HttpEnum.TOKEN_INVALID.getCode(), HttpEnum.TOKEN_INVALID.getMsg()); + AjaxResult result = AjaxResult.failed(HttpEnum.TOKEN_INVALID.getCode(), HttpEnum.TOKEN_INVALID.getMsg()); response.getWriter().print(JSON.toJSONString(result)); return false; } // 校验用户被禁用 if (map.get("isDisable").equals("1")) { - AjaxResult result = AjaxResult.failed(HttpEnum.LOGIN_DISABLE_ERROR.getCode(), HttpEnum.LOGIN_DISABLE_ERROR.getMsg()); + AjaxResult result = AjaxResult.failed(HttpEnum.LOGIN_DISABLE_ERROR.getCode(), HttpEnum.LOGIN_DISABLE_ERROR.getMsg()); response.getWriter().print(JSON.toJSONString(result)); return false; } @@ -123,7 +123,7 @@ public class LikeAdminInterceptor implements HandlerInterceptor { // 验证是否有权限操作 String menus = RedisUtil.hGet(AdminConfig.backstageRolesKey, roleId).toString(); if (menus.equals("") || !Arrays.asList(menus.split(",")).contains(auths)) { - AjaxResult result = AjaxResult.failed(HttpEnum.NO_PERMISSION.getCode(), HttpEnum.NO_PERMISSION.getMsg()); + AjaxResult result = AjaxResult.failed(HttpEnum.NO_PERMISSION.getCode(), HttpEnum.NO_PERMISSION.getMsg()); response.getWriter().print(JSON.toJSONString(result)); return false; } diff --git a/server/like-admin/src/main/java/com/mdd/admin/config/aop/LogAspect.java b/server/like-admin/src/main/java/com/mdd/admin/config/aop/LogAspect.java index a39ebb62..7cabacb6 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/config/aop/LogAspect.java +++ b/server/like-admin/src/main/java/com/mdd/admin/config/aop/LogAspect.java @@ -1,6 +1,6 @@ package com.mdd.admin.config.aop; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.mdd.admin.LikeAdminThreadLocal; import com.mdd.common.entity.system.SystemLogOperate; import com.mdd.common.mapper.system.SystemLogOperateMapper; @@ -16,7 +16,6 @@ import org.aspectj.lang.reflect.MethodSignature; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import org.springframework.util.MultiValueMap; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.multipart.MultipartFile; @@ -25,9 +24,7 @@ import org.springframework.web.multipart.support.StandardMultipartHttpServletReq import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; -import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; @Aspect @Component diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/AlbumsController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/AlbumsController.java new file mode 100644 index 00000000..6c92b08e --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/AlbumsController.java @@ -0,0 +1,135 @@ +package com.mdd.admin.controller; + +import com.alibaba.fastjson2.JSONArray; +import com.mdd.admin.config.aop.Log; +import com.mdd.admin.service.IAlbumsService; +import com.mdd.admin.validate.AlbumCateValidate; +import com.mdd.admin.validate.AlbumMoveValidate; +import com.mdd.admin.validate.AlbumRenameValidate; +import com.mdd.admin.validate.AlbumSearchValidate; +import com.mdd.admin.validate.commons.IdValidate; +import com.mdd.admin.validate.commons.IdsValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.vo.album.AlbumVo; +import com.mdd.common.core.AjaxResult; +import com.mdd.common.core.PageResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 相册管理 + */ +@RestController +@RequestMapping("api/common/album") +public class AlbumsController { + + @Resource + IAlbumsService iAlbumsService; + + /** + * 相册文件列表 + * + * @author fzr + * @return AjaxResult> + */ + @GetMapping("/albumList") + public AjaxResult> albumList(@Validated PageValidate pageValidate, + @Validated AlbumSearchValidate searchValidate) { + PageResult voPageResult = iAlbumsService.albumList(pageValidate, searchValidate); + return AjaxResult.success(voPageResult); + } + + /** + * 相册文件重命名 + * + * @author fzr + * @return AjaxResult + */ + @Log(title = "相册文件重命名") + @PostMapping("/albumRename") + public AjaxResult albumRename(@Validated @RequestBody AlbumRenameValidate renameValidate) { + iAlbumsService.albumRename(renameValidate.getId(), renameValidate.getName()); + return AjaxResult.success(); + } + + /** + * 相册文件移动 + * + * @author fzr + * @return AjaxResult + */ + @Log(title = "相册文件移动") + @PostMapping("/albumMove") + public AjaxResult albumMove(@Validated @RequestBody AlbumMoveValidate moveValidate) { + iAlbumsService.albumMove(moveValidate.getIds(), moveValidate.getCid()); + return AjaxResult.success(); + } + + /** + * 相册文件删除 + * + * @author fzr + * @return AjaxResult + */ + @Log(title = "相册文件删除") + @PostMapping("/albumDel") + public AjaxResult albumDel(@Validated @RequestBody IdsValidate idsValidate) { + iAlbumsService.albumDel(idsValidate.getIds()); + return AjaxResult.success(); + } + + /** + * 相册分类列表 + * + * @author fzr + * @param searchValidate 搜索参数 + * @return AjaxResult + */ + @GetMapping("/cateList") + public AjaxResult cateList(@Validated AlbumSearchValidate searchValidate) { + JSONArray jsonArray = iAlbumsService.cateList(searchValidate); + return AjaxResult.success(jsonArray); + } + + /** + * 相册分类新增 + * + * @author fzr + * @return AjaxResult + */ + @Log(title = "相册分类新增") + @PostMapping("/cateAdd") + public AjaxResult cateAdd(@Validated @RequestBody AlbumCateValidate cateValidate) { + iAlbumsService.cateAdd(cateValidate); + return AjaxResult.success(); + } + + /** + * 相册分类重命名 + * + * @author fzr + * @return AjaxResult + */ + @Log(title = "相册分类重命名") + @PostMapping("/cateRename") + public AjaxResult cateRename(@Validated @RequestBody AlbumRenameValidate renameValidate) { + iAlbumsService.cateRename(renameValidate.getId(), renameValidate.getName()); + return AjaxResult.success(); + } + + /** + * 相册分类删除 + * + * @author fzr + * @return AjaxResult + */ + @Log(title = "相册分类删除") + @PostMapping("/cateDel") + public AjaxResult cateDel(@Validated @RequestBody IdValidate idValidate) { + iAlbumsService.cateDel(idValidate.getId()); + return AjaxResult.success(); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/ArtCateController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/ArtCateController.java new file mode 100644 index 00000000..11d2155a --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/ArtCateController.java @@ -0,0 +1,126 @@ +package com.mdd.admin.controller; + +import com.mdd.admin.config.aop.Log; +import com.mdd.admin.service.IArtCateService; +import com.mdd.admin.validate.ArtCateCreateValidate; +import com.mdd.admin.validate.ArtCateUpdateValidate; +import com.mdd.admin.validate.ArtCateSearchValidate; +import com.mdd.admin.validate.commons.IdValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.vo.article.ArticleCateVo; +import com.mdd.common.core.AjaxResult; +import com.mdd.common.core.PageResult; +import com.mdd.common.validator.annotation.IDMust; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 文章分类管理 + */ +@RestController +@RequestMapping("api/article/cate") +public class ArtCateController { + + @Resource + IArtCateService iArtCateService; + + /** + * 分类所有 + * + * @author fzr + * @return AjaxResult> + */ + @GetMapping("/all") + public AjaxResult> all() { + List list = iArtCateService.all(); + return AjaxResult.success(list); + } + + /** + * 分类列表 + * + * @author fzr + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return AjaxResult> + */ + @GetMapping("/list") + public AjaxResult> list(@Validated PageValidate pageValidate, + @Validated ArtCateSearchValidate searchValidate) { + PageResult list = iArtCateService.list(pageValidate, searchValidate); + return AjaxResult.success(list); + } + + /** + * 分类详情 + * + * @author fzr + * @param id 主键 + * @return AjaxResult + */ + @GetMapping("/detail") + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + ArticleCateVo vo = iArtCateService.detail(id); + return AjaxResult.success(vo); + } + + /** + * 分类新增 + * + * @author fzr + * @param createValidate 参数 + * @return AjaxResult + */ + @Log(title = "文章分类新增") + @PostMapping("/add") + public AjaxResult add(@Validated @RequestBody ArtCateCreateValidate createValidate) { + iArtCateService.add(createValidate); + return AjaxResult.success(); + } + + /** + * 分类编辑 + * + * @author fzr + * @param updateValidate 编辑 + * @return AjaxResult + */ + @Log(title = "文章分类编辑") + @PostMapping("/edit") + public AjaxResult edit(@Validated @RequestBody ArtCateUpdateValidate updateValidate) { + iArtCateService.edit(updateValidate); + return AjaxResult.success(); + } + + /** + * 分类删除 + * + * @author fzr + * @param idValidate 参数 + * @return AjaxResult + */ + @Log(title = "文章分类删除") + @PostMapping("/del") + public AjaxResult del(@Validated @RequestBody IdValidate idValidate) { + iArtCateService.del(idValidate.getId()); + return AjaxResult.success(); + } + + /** + * 分类状态 + * + * @author fzr + * @param idValidate 参数 + * @return AjaxResult + */ + @Log(title = "文章分类状态") + @PostMapping("/change") + public AjaxResult change(@Validated @RequestBody IdValidate idValidate) { + iArtCateService.change(idValidate.getId()); + return AjaxResult.success(); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/ArticleController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/ArticleController.java new file mode 100644 index 00000000..d31f843d --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/ArticleController.java @@ -0,0 +1,115 @@ +package com.mdd.admin.controller; + +import com.mdd.admin.config.aop.Log; +import com.mdd.admin.service.IArticleService; +import com.mdd.admin.validate.ArticleCreateValidate; +import com.mdd.admin.validate.ArticleSearchValidate; +import com.mdd.admin.validate.ArticleUpdateValidate; + +import com.mdd.admin.validate.commons.IdValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.vo.article.ArticleDetailVo; +import com.mdd.admin.vo.article.ArticleListedVo; +import com.mdd.common.core.AjaxResult; +import com.mdd.common.core.PageResult; +import com.mdd.common.validator.annotation.IDMust; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 文章管理 + */ +@RestController +@RequestMapping("api/article") +public class ArticleController { + + @Resource + IArticleService iArticleService; + + /** + * 文章列表 + * + * @author fzr + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return AjaxResult> + */ + @GetMapping("/list") + public AjaxResult> list(@Validated PageValidate pageValidate, + @Validated ArticleSearchValidate searchValidate) { + PageResult vos = iArticleService.list(pageValidate, searchValidate); + return AjaxResult.success(vos); + } + + /** + * 文章详情 + * + * @author fzr + * @param id 文章ID + * @return AjaxResult + */ + @GetMapping("/detail") + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + ArticleDetailVo vo = iArticleService.detail(id); + return AjaxResult.success(vo); + } + + /** + * 文章新增 + * + * @author fzr + * @param createValidate 参数 + * @return AjaxResult + */ + @Log(title = "文章新增") + @PostMapping("/add") + public AjaxResult add(@Validated @RequestBody ArticleCreateValidate createValidate) { + iArticleService.add(createValidate); + return AjaxResult.success(); + } + + /** + * 文章编辑 + * + * @author fzr + * @param updateValidate 参数 + * @return AjaxResult + */ + @Log(title = "文章编辑") + @PostMapping("/edit") + public AjaxResult edit(@Validated @RequestBody ArticleUpdateValidate updateValidate) { + iArticleService.edit(updateValidate); + return AjaxResult.success(); + } + + /** + * 文章删除 + * + * @author fzr + * @param idValidate 参数 + * @return AjaxResult + */ + @Log(title = "文章删除") + @PostMapping("/del") + public AjaxResult del(@Validated @RequestBody IdValidate idValidate) { + iArticleService.del(idValidate.getId()); + return AjaxResult.success(); + } + + /** + * 文章状态 + * + * @author fzr + * @param idValidate 参数 + * @return AjaxResult + */ + @Log(title = "文章状态") + @PostMapping("/change") + public AjaxResult change(@Validated @RequestBody IdValidate idValidate) { + iArticleService.change(idValidate.getId()); + return AjaxResult.success(); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/common/IndexController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/IndexController.java similarity index 60% rename from server/like-admin/src/main/java/com/mdd/admin/controller/common/IndexController.java rename to server/like-admin/src/main/java/com/mdd/admin/controller/IndexController.java index a338690b..3a16ab9f 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/common/IndexController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/IndexController.java @@ -1,6 +1,6 @@ -package com.mdd.admin.controller.common; +package com.mdd.admin.controller; -import com.mdd.admin.service.common.IIndexService; +import com.mdd.admin.service.IIndexCommonService; import com.mdd.common.core.AjaxResult; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; @@ -19,17 +19,17 @@ import java.util.Map; public class IndexController { @Resource - IIndexService iIndexService; + IIndexCommonService iIndexCommonService; /** * 控制台 * * @author fzr - * @return AjaxResult + * @return AjaxResult> */ @GetMapping("/console") - public AjaxResult console() { - Map map = iIndexService.console(); + public AjaxResult> console() { + Map map = iIndexCommonService.console(); return AjaxResult.success(map); } @@ -37,11 +37,11 @@ public class IndexController { * 公共配置 * * @author fzr - * @return AjaxResult + * @return AjaxResult */ @GetMapping("/config") - public AjaxResult config() { - Map map = iIndexService.config(); + public AjaxResult> config() { + Map map = iIndexCommonService.config(); return AjaxResult.success(map); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/common/UploadController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/UploadController.java similarity index 90% rename from server/like-admin/src/main/java/com/mdd/admin/controller/common/UploadController.java rename to server/like-admin/src/main/java/com/mdd/admin/controller/UploadController.java index 9d2786f8..6918c7d9 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/common/UploadController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/UploadController.java @@ -1,9 +1,9 @@ -package com.mdd.admin.controller.common; +package com.mdd.admin.controller; import com.mdd.admin.LikeAdminThreadLocal; import com.mdd.admin.config.aop.Log; import com.mdd.admin.config.aop.RequestType; -import com.mdd.admin.service.common.IAlbumService; +import com.mdd.admin.service.IAlbumsService; import com.mdd.common.core.AjaxResult; import com.mdd.common.enums.AlbumEnum; import com.mdd.common.exception.OperateException; @@ -28,18 +28,18 @@ import java.util.Map; public class UploadController { @Resource - IAlbumService iAlbumService; + IAlbumsService iAlbumsService; /** * 上传图片 * * @author fzr * @param request 请求对象 - * @return AjaxResult + * @return AjaxResult */ @Log(title = "上传图片", requestType = RequestType.File) @PostMapping("/image") - public AjaxResult image(HttpServletRequest request) { + public AjaxResult image(HttpServletRequest request) { MultipartFile multipartFile; try { multipartFile = ((MultipartRequest) request).getFile("file"); @@ -64,7 +64,7 @@ public class UploadController { album.put("ext", map.get("ext").toString()); album.put("url", map.get("url").toString()); album.put("name", map.get("name").toString()); - Integer id = iAlbumService.albumAdd(album); + Integer id = iAlbumsService.albumAdd(album); map.put("id", id); @@ -79,11 +79,11 @@ public class UploadController { * * @author fzr * @param request 请求对象 - * @return AjaxResult + * @return AjaxResult */ @Log(title = "上传视频", requestType = RequestType.File) @PostMapping("/video") - public AjaxResult video(HttpServletRequest request) { + public AjaxResult video(HttpServletRequest request) { MultipartFile multipartFile; try { multipartFile = ((MultipartRequest) request).getFile("file"); @@ -108,7 +108,7 @@ public class UploadController { album.put("size", map.get("size").toString()); album.put("url", map.get("url").toString()); album.put("name", map.get("name").toString()); - Integer id = iAlbumService.albumAdd(album); + Integer id = iAlbumsService.albumAdd(album); map.put("id", id); diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/UsersController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/UsersController.java new file mode 100644 index 00000000..d977c82a --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/UsersController.java @@ -0,0 +1,67 @@ +package com.mdd.admin.controller; + +import com.mdd.admin.service.IUsersService; +import com.mdd.admin.validate.UsersSearchValidate; +import com.mdd.admin.validate.UsersUpdateValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.vo.user.UserVo; +import com.mdd.common.core.AjaxResult; +import com.mdd.common.core.PageResult; +import com.mdd.common.validator.annotation.IDMust; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 用户管理 + */ +@RestController +@RequestMapping("api/user") +public class UsersController { + + @Resource + IUsersService iUsersService; + + /** + * 用户列表 + * + * @author fzr + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return AjaxResult> + */ + @GetMapping("/list") + public AjaxResult> list(@Validated PageValidate pageValidate, + @Validated UsersSearchValidate searchValidate) { + PageResult list = iUsersService.list(pageValidate, searchValidate); + return AjaxResult.success(list); + } + + /** + * 用户详情 + * + * @author fzr + * @param id 主键 + * @return AjaxResult + */ + @GetMapping("/detail") + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + UserVo vo = iUsersService.detail(id); + return AjaxResult.success(vo); + } + + /** + * 用户编辑 + * + * @author fzr + * @param updateValidate 参数 + * @return AjaxResult + */ + @PostMapping("/edit") + public AjaxResult edit(@Validated @RequestBody UsersUpdateValidate updateValidate) { + iUsersService.edit(updateValidate); + return AjaxResult.success(); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/article/ArticleController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/article/ArticleController.java deleted file mode 100644 index 9162acbd..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/article/ArticleController.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.mdd.admin.controller.article; - -import com.mdd.admin.config.aop.Log; -import com.mdd.admin.service.article.IArticleArchivesService; -import com.mdd.admin.validate.article.ArticleParam; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.vo.article.ArticleDetailVo; -import com.mdd.admin.vo.article.ArticleListVo; -import com.mdd.common.core.AjaxResult; -import com.mdd.common.core.PageResult; -import com.mdd.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("articleController") -@RequestMapping("api/article") -public class ArticleController { - - @Resource - IArticleArchivesService iArticleArchivesService; - - /** - * 文章列表 - * - * @author fzr - * @param pageParam 分页参数 - * @param params 搜索参数 - * @return AjaxResult - */ - @GetMapping("/list") - public AjaxResult list(@Validated PageParam pageParam, - @RequestParam Map params) { - PageResult vos = iArticleArchivesService.list(pageParam, params); - return AjaxResult.success(vos); - } - - /** - * 文章详情 - * - * @author fzr - * @param id 文章ID - * @return AjaxResult - */ - @GetMapping("/detail") - public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { - ArticleDetailVo vo = iArticleArchivesService.detail(id); - return AjaxResult.success(vo); - } - - /** - * 文章新增 - * - * @author fzr - * @param articleParam 文章参数 - * @return Object - */ - @Log(title = "文章新增") - @PostMapping("/add") - public AjaxResult add( - @Validated(value = ArticleParam.create.class) - @RequestBody ArticleParam articleParam) { - iArticleArchivesService.add(articleParam); - return AjaxResult.success(); - } - - /** - * 文章编辑 - * - * @author fzr - * @param articleParam 文章参数 - * @return AjaxResult - */ - @Log(title = "文章编辑") - @PostMapping("/edit") - public AjaxResult edit(@Validated(value = ArticleParam.update.class) - @RequestBody ArticleParam articleParam) { - iArticleArchivesService.edit(articleParam); - return AjaxResult.success(); - } - - /** - * 文章删除 - * - * @author fzr - * @param articleParam 文章参数 - * @return AjaxResult - */ - @Log(title = "文章删除") - @PostMapping("/del") - public Object del(@Validated(value = ArticleParam.delete.class) - @RequestBody ArticleParam articleParam) { - iArticleArchivesService.del(articleParam.getId()); - return AjaxResult.success(); - } - - /** - * 文章状态 - * - * @author fzr - * @param articleParam 文章参数 - * @return AjaxResult - */ - @Log(title = "文章状态") - @PostMapping("/change") - public AjaxResult change(@Validated(value = ArticleParam.change.class) - @RequestBody ArticleParam articleParam) { - iArticleArchivesService.change(articleParam.getId()); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/article/CategoryController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/article/CategoryController.java deleted file mode 100644 index 72a9b505..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/article/CategoryController.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.mdd.admin.controller.article; - -import com.mdd.admin.config.aop.Log; -import com.mdd.admin.service.article.IArticleCategoryService; -import com.mdd.admin.validate.article.CategoryParam; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.vo.article.ArticleCateVo; -import com.mdd.common.core.AjaxResult; -import com.mdd.common.core.PageResult; -import com.mdd.common.validator.annotation.IDMust; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; - -/** - * 文章分类管理 - */ -@RestController("articleCategoryController") -@RequestMapping("api/article/cate") -public class CategoryController { - - @Resource - IArticleCategoryService iArticleCategoryService; - - /** - * 分类所有 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/all") - public AjaxResult all() { - List list = iArticleCategoryService.all(); - return AjaxResult.success(list); - } - - /** - * 分类列表 - * - * @author fzr - * @param pageParam 分页参数 - * @param params 搜索参数 - * @return Object - */ - @GetMapping("/list") - public AjaxResult list(@Validated PageParam pageParam, - @RequestParam Map params) { - PageResult list = iArticleCategoryService.list(pageParam, params); - return AjaxResult.success(list); - } - - /** - * 分类详情 - * - * @author fzr - * @param id 主键 - * @return AjaxResult - */ - @GetMapping("/detail") - public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { - ArticleCateVo vo = iArticleCategoryService.detail(id); - return AjaxResult.success(vo); - } - - /** - * 分类新增 - * - * @author fzr - * @param categoryParam 分类参数 - * @return AjaxResult - */ - @Log(title = "文章分类新增") - @PostMapping("/add") - public AjaxResult add(@Validated(value = CategoryParam.create.class) - @RequestBody CategoryParam categoryParam) { - iArticleCategoryService.add(categoryParam); - return AjaxResult.success(); - } - - /** - * 分类编辑 - * - * @author fzr - * @param categoryParam 分类编辑 - * @return AjaxResult - */ - @Log(title = "文章分类编辑") - @PostMapping("/edit") - public AjaxResult edit(@Validated(value = CategoryParam.update.class) - @RequestBody CategoryParam categoryParam) { - iArticleCategoryService.edit(categoryParam); - return AjaxResult.success(); - } - - /** - * 分类删除 - * - * @author fzr - * @param categoryParam 分类删除 - * @return AjaxResult - */ - @Log(title = "文章分类删除") - @PostMapping("/del") - public AjaxResult del(@Validated(value = CategoryParam.delete.class) - @RequestBody CategoryParam categoryParam) { - iArticleCategoryService.del(categoryParam.getId()); - return AjaxResult.success(); - } - - /** - * 分类状态 - * - * @author fzr - * @param categoryParam 分类参数 - * @return AjaxResult - */ - @Log(title = "文章分类状态") - @PostMapping("/change") - public AjaxResult change(@Validated(value = CategoryParam.change.class) - @RequestBody CategoryParam categoryParam) { - iArticleCategoryService.change(categoryParam.getId()); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/H5Controller.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelH5Controller.java similarity index 56% rename from server/like-admin/src/main/java/com/mdd/admin/controller/channel/H5Controller.java rename to server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelH5Controller.java index 3e7f6e93..269b6ca1 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/H5Controller.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelH5Controller.java @@ -1,8 +1,8 @@ package com.mdd.admin.controller.channel; import com.mdd.admin.config.aop.Log; -import com.mdd.admin.service.channel.IChannelH5Service; -import com.mdd.admin.validate.channel.ChannelH5Param; +import com.mdd.admin.service.IChannelH5ConfigService; +import com.mdd.admin.validate.channel.ChannelH5Validate; import com.mdd.admin.vo.channel.ChannelH5Vo; import com.mdd.common.core.AjaxResult; import org.springframework.validation.annotation.Validated; @@ -15,20 +15,20 @@ import javax.annotation.Resource; */ @RestController @RequestMapping("api/channel/h5") -public class H5Controller { +public class ChannelH5Controller { @Resource - IChannelH5Service iChannelH5Service; + IChannelH5ConfigService iChannelH5ConfigService; /** * H5渠道设置详情 * * @author fzr - * @return AjaxResult + * @return AjaxResult */ @GetMapping("/detail") - public AjaxResult detail() { - ChannelH5Vo vo = iChannelH5Service.detail(); + public AjaxResult detail() { + ChannelH5Vo vo = iChannelH5ConfigService.detail(); return AjaxResult.success(vo); } @@ -36,13 +36,13 @@ public class H5Controller { * H5渠道设置保存 * * @author fzr - * @param channelH5Param 参数 - * @return AjaxResult + * @param channelH5Validate 参数 + * @return AjaxResult */ @Log(title = "H5渠道设置保存") @PostMapping("/save") - public AjaxResult save(@Validated @RequestBody ChannelH5Param channelH5Param) { - iChannelH5Service.save(channelH5Param); + public AjaxResult save(@Validated @RequestBody ChannelH5Validate channelH5Validate) { + iChannelH5ConfigService.save(channelH5Validate); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/MpController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelMpController.java similarity index 57% rename from server/like-admin/src/main/java/com/mdd/admin/controller/channel/MpController.java rename to server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelMpController.java index 482972ab..16d43912 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/MpController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelMpController.java @@ -1,8 +1,8 @@ package com.mdd.admin.controller.channel; import com.mdd.admin.config.aop.Log; -import com.mdd.admin.service.channel.IChannelMpService; -import com.mdd.admin.validate.channel.ChannelMpParam; +import com.mdd.admin.service.IChannelMpConfigService; +import com.mdd.admin.validate.channel.ChannelMpValidate; import com.mdd.admin.vo.channel.ChannelMpVo; import com.mdd.common.core.AjaxResult; import org.springframework.validation.annotation.Validated; @@ -15,20 +15,20 @@ import javax.annotation.Resource; */ @RestController @RequestMapping("api/channel/mp") -public class MpController { +public class ChannelMpController { @Resource - IChannelMpService iChannelMpService; + IChannelMpConfigService iChannelMpConfigService; /** * 微信小程序渠道设置详情 * * @author fzr - * @return AjaxResult + * @return AjaxResult */ @GetMapping("/detail") - public AjaxResult detail() { - ChannelMpVo vo = iChannelMpService.detail(); + public AjaxResult detail() { + ChannelMpVo vo = iChannelMpConfigService.detail(); return AjaxResult.success(vo); } @@ -36,13 +36,13 @@ public class MpController { * 微信小程序渠道设置保存 * * @author fzr - * @param channelMpParam 参数 - * @return AjaxResult + * @param channelMpValidate 参数 + * @return AjaxResult */ @Log(title = "微信小程序渠道设置保存") @PostMapping("/save") - public AjaxResult save(@Validated @RequestBody ChannelMpParam channelMpParam) { - iChannelMpService.save(channelMpParam); + public AjaxResult save(@Validated @RequestBody ChannelMpValidate channelMpValidate) { + iChannelMpConfigService.save(channelMpValidate); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaController.java similarity index 57% rename from server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaController.java rename to server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaController.java index eadda9e5..0b55b632 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaController.java @@ -1,8 +1,8 @@ package com.mdd.admin.controller.channel; import com.mdd.admin.config.aop.Log; -import com.mdd.admin.service.channel.IChannelOaService; -import com.mdd.admin.validate.channel.ChannelOaParam; +import com.mdd.admin.service.IChannelOaConfigService; +import com.mdd.admin.validate.channel.ChannelOaValidate; import com.mdd.admin.vo.channel.ChannelOaVo; import com.mdd.common.core.AjaxResult; import org.springframework.validation.annotation.Validated; @@ -15,20 +15,20 @@ import javax.annotation.Resource; */ @RestController @RequestMapping("api/channel/oa") -public class OaController { +public class ChannelOaController { @Resource - IChannelOaService iChannelOaService; + IChannelOaConfigService iChannelOaConfigService; /** * 公众号渠道设置详情 * * @author fzr - * @return AjaxResult + * @return AjaxResult */ @GetMapping("/detail") - public AjaxResult detail() { - ChannelOaVo vo = iChannelOaService.detail(); + public AjaxResult detail() { + ChannelOaVo vo = iChannelOaConfigService.detail(); return AjaxResult.success(vo); } @@ -36,13 +36,13 @@ public class OaController { * 公众号渠道设置保存 * * @author fzr - * @param channelOaParam 参数 - * @return AjaxResult + * @param channelOaValidate 参数 + * @return AjaxResult */ @Log(title = "公众号渠道设置保存") @PostMapping("/save") - public AjaxResult save(@Validated @RequestBody ChannelOaParam channelOaParam) { - iChannelOaService.save(channelOaParam); + public AjaxResult save(@Validated @RequestBody ChannelOaValidate channelOaValidate) { + iChannelOaConfigService.save(channelOaValidate); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaMenuController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaMenuController.java similarity index 54% rename from server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaMenuController.java rename to server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaMenuController.java index 34a45e7c..6f01b548 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaMenuController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaMenuController.java @@ -1,7 +1,7 @@ package com.mdd.admin.controller.channel; -import com.alibaba.fastjson.JSONArray; -import com.mdd.admin.service.channel.IChannelOaMenuService; +import com.alibaba.fastjson2.JSONArray; +import com.mdd.admin.service.IChannelOaMenusService; import com.mdd.common.core.AjaxResult; import org.springframework.web.bind.annotation.*; @@ -13,20 +13,20 @@ import java.util.List; */ @RestController @RequestMapping("api/channel/oaMenu") -public class OaMenuController { +public class ChannelOaMenuController { @Resource - IChannelOaMenuService iChannelOaMenuService; + IChannelOaMenusService iChannelOaMenusService; /** * 菜单详情 * * @author fzr - * @return AjaxResult + * @return AjaxResult */ @GetMapping("/detail") - public AjaxResult detail() { - JSONArray detail = iChannelOaMenuService.detail(); + public AjaxResult detail() { + JSONArray detail = iChannelOaMenusService.detail(); return AjaxResult.success(detail); } @@ -35,11 +35,11 @@ public class OaMenuController { * * @author fzr * @param params 参数 - * @return AjaxResult + * @return AjaxResult */ @PostMapping("/save") - public AjaxResult save(@RequestBody List params) { - iChannelOaMenuService.save(params, false); + public AjaxResult save(@RequestBody List params) { + iChannelOaMenusService.save(params, false); return AjaxResult.success(); } @@ -48,11 +48,11 @@ public class OaMenuController { * * @author fzr * @param params 参数 - * @return AjaxResult + * @return AjaxResult */ @PostMapping("/publish") - public AjaxResult publish(@RequestBody List params) { - iChannelOaMenuService.save(params, true); + public AjaxResult publish(@RequestBody List params) { + iChannelOaMenusService.save(params, true); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaReplyDefaultController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaReplyDefaultController.java new file mode 100644 index 00000000..f47560ed --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaReplyDefaultController.java @@ -0,0 +1,104 @@ +package com.mdd.admin.controller.channel; + +import com.mdd.admin.service.IChannelOaReplyDefaultService; +import com.mdd.admin.validate.channel.ChannelRpDefaultValidate; +import com.mdd.admin.validate.commons.IdValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.vo.channel.ChannelRpDefaultVo; +import com.mdd.common.core.AjaxResult; +import com.mdd.common.core.PageResult; +import com.mdd.common.validator.annotation.IDMust; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 公众号默认回复管理 + */ +@RestController +@RequestMapping("api/channel/oaReplyDefault") +public class ChannelOaReplyDefaultController { + + @Resource + IChannelOaReplyDefaultService iChannelOaReplyDefaultService; + + /** + * 默认回复列表 + * + * @author fzr + * @param pageValidate 分页参数 + * @return AjaxResult> + */ + @GetMapping("/list") + public AjaxResult> list(@Validated PageValidate pageValidate) { + PageResult list = iChannelOaReplyDefaultService.list(pageValidate); + return AjaxResult.success(list); + } + + /** + * 默认回复详情 + * + * @author fzr + * @param id 主键 + * @return AjaxResult + */ + @GetMapping("/detail") + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + ChannelRpDefaultVo vo = iChannelOaReplyDefaultService.detail(id); + return AjaxResult.success(vo); + } + + /** + * 默认回复新增 + * + * @author fzr + * @param defaultValidate 参数 + * @return AjaxResult + */ + @PostMapping("/add") + public AjaxResult add(@Validated @RequestBody ChannelRpDefaultValidate defaultValidate) { + iChannelOaReplyDefaultService.add(defaultValidate); + return AjaxResult.success(); + } + + /** + * 默认回复编辑 + * + * @author fzr + * @param defaultValidate 参数 + * @return AjaxResult + */ + @PostMapping("/edit") + public AjaxResult edit(@Validated @RequestBody ChannelRpDefaultValidate defaultValidate) { + iChannelOaReplyDefaultService.edit(defaultValidate); + return AjaxResult.success(); + } + + /** + * 默认回复删除 + * + * @author fzr + * @param idValidate 参数 + * @return AjaxResult + */ + @PostMapping("/del") + public AjaxResult del(@Validated @RequestBody IdValidate idValidate) { + iChannelOaReplyDefaultService.del(idValidate.getId()); + return AjaxResult.success(); + } + + /** + * 默认回复状态 + * + * @author fzr + * @param idValidate 参数 + * @return AjaxResult + */ + @PostMapping("/status") + public AjaxResult status(@Validated @RequestBody IdValidate idValidate) { + iChannelOaReplyDefaultService.status(idValidate.getId()); + return AjaxResult.success(); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaReplyFollowController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaReplyFollowController.java new file mode 100644 index 00000000..f95f2b1c --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaReplyFollowController.java @@ -0,0 +1,104 @@ +package com.mdd.admin.controller.channel; + +import com.mdd.admin.service.IChannelOaReplyFollowService; +import com.mdd.admin.validate.channel.ChannelRpFollowsValidate; +import com.mdd.admin.validate.commons.IdValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.vo.channel.ChannelRpFollowsVo; +import com.mdd.common.core.AjaxResult; +import com.mdd.common.core.PageResult; +import com.mdd.common.validator.annotation.IDMust; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 公众号关注回复管理 + */ +@RestController +@RequestMapping("api/channel/oaReplyFollow") +public class ChannelOaReplyFollowController { + + @Resource + IChannelOaReplyFollowService iChannelOaReplyFollowService; + + /** + * 关注回复列表 + * + * @author fzr + * @param pageValidate 分页参数 + * @return AjaxResult> + */ + @GetMapping("/list") + public AjaxResult> list(@Validated PageValidate pageValidate) { + PageResult list = iChannelOaReplyFollowService.list(pageValidate); + return AjaxResult.success(list); + } + + /** + * 关注回复详情 + * + * @author fzr + * @param id 参数 + * @return AjaxResult + */ + @GetMapping("/detail") + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + ChannelRpFollowsVo vo = iChannelOaReplyFollowService.detail(id); + return AjaxResult.success(vo); + } + + /** + * 关注回复新增 + * + * @author fzr + * @param followsValidate 参数 + * @return AjaxResult + */ + @PostMapping("/add") + public AjaxResult add(@Validated @RequestBody ChannelRpFollowsValidate followsValidate) { + iChannelOaReplyFollowService.add(followsValidate); + return AjaxResult.success(); + } + + /** + * 关注回复编辑 + * + * @author fzr + * @param followsValidate 参数 + * @return AjaxResult + */ + @PostMapping("/edit") + public AjaxResult edit(@Validated @RequestBody ChannelRpFollowsValidate followsValidate) { + iChannelOaReplyFollowService.edit(followsValidate); + return AjaxResult.success(); + } + + /** + * 关注回复删除 + * + * @author fzr + * @param idValidate 参数 + * @return AjaxResult + */ + @PostMapping("/del") + public AjaxResult del(@Validated @RequestBody IdValidate idValidate) { + iChannelOaReplyFollowService.del(idValidate.getId()); + return AjaxResult.success(); + } + + /** + * 关注回复状态 + * + * @author fzr + * @param idValidate 参数 + * @return AjaxResult + */ + @PostMapping("/status") + public AjaxResult status(@Validated @RequestBody IdValidate idValidate) { + iChannelOaReplyFollowService.status(idValidate.getId()); + return AjaxResult.success(); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaReplyKeywordController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaReplyKeywordController.java new file mode 100644 index 00000000..4038f47d --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaReplyKeywordController.java @@ -0,0 +1,104 @@ +package com.mdd.admin.controller.channel; + +import com.mdd.admin.service.IChannelOaReplyKeywordService; +import com.mdd.admin.validate.channel.ChannelRpKeywordValidate; +import com.mdd.admin.validate.commons.IdValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.vo.channel.ChannelRpKeywordVo; +import com.mdd.common.core.AjaxResult; +import com.mdd.common.core.PageResult; +import com.mdd.common.validator.annotation.IDMust; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 公众号关键词回复管理 + */ +@RestController +@RequestMapping("api/channel/oaReplyKeyword") +public class ChannelOaReplyKeywordController { + + @Resource + IChannelOaReplyKeywordService iChannelOaReplyKeywordService; + + /** + * 关键词回复列表 + * + * @author fzr + * @return AjaxResult> + */ + @GetMapping("/list") + public AjaxResult> list(@Validated PageValidate pageValidate) { + PageResult list = iChannelOaReplyKeywordService.list(pageValidate); + return AjaxResult.success(list); + } + + /** + * 关键词回复详情 + * + * @author fzr + * @param id 主键 + * @return AjaxResult + */ + @GetMapping("/detail") + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + ChannelRpKeywordVo vo = iChannelOaReplyKeywordService.detail(id); + return AjaxResult.success(vo); + } + + /** + * 关键词回复新增 + * + * @author fzr + * @param keywordValidate 参数 + * @return AjaxResult + */ + @PostMapping("/add") + public AjaxResult add(@Validated @RequestBody ChannelRpKeywordValidate keywordValidate) { + iChannelOaReplyKeywordService.add(keywordValidate); + return AjaxResult.success(); + } + + /** + * 关键词回复编辑 + * + * @author fzr + * @param keywordValidate 参数 + * @return AjaxResult + */ + @PostMapping("/edit") + public AjaxResult edit(@Validated @RequestBody ChannelRpKeywordValidate keywordValidate) { + iChannelOaReplyKeywordService.edit(keywordValidate); + return AjaxResult.success(); + } + + /** + * 关键词回复删除 + * + * @author fzr + * @param idValidate 参数 + * @return AjaxResult + */ + @PostMapping("/del") + public AjaxResult del(@Validated @RequestBody IdValidate idValidate) { + iChannelOaReplyKeywordService.del(idValidate.getId()); + return AjaxResult.success(); + } + + /** + * 关键词回复状态 + * + * @author fzr + * @param idValidate 参数 + * @return AjaxResult + */ + @PostMapping("/status") + public AjaxResult status(@Validated @RequestBody IdValidate idValidate) { + iChannelOaReplyKeywordService.status(idValidate.getId()); + return AjaxResult.success(); + } + + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaReplyDefaultController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaReplyDefaultController.java deleted file mode 100644 index 935efd91..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaReplyDefaultController.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.mdd.admin.controller.channel; - -import com.mdd.admin.service.channel.IChannelOaReplyDefaultService; -import com.mdd.admin.validate.channel.ChannelOaReplyParam; -import com.mdd.admin.validate.common.IDParam; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.vo.channel.ChannelOaReplyVo; -import com.mdd.common.core.AjaxResult; -import com.mdd.common.core.PageResult; -import com.mdd.common.validator.annotation.IDMust; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -/** - * 公众号默认回复管理 - */ -@RestController -@RequestMapping("api/channel/oaReplyDefault") -public class OaReplyDefaultController { - - @Resource - IChannelOaReplyDefaultService iChannelOaReplyDefaultService; - - /** - * 默认回复列表 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/list") - public AjaxResult list(@Validated PageParam pageParam) { - PageResult list = iChannelOaReplyDefaultService.list(pageParam); - return AjaxResult.success(list); - } - - /** - * 默认回复详情 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/detail") - public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { - ChannelOaReplyVo vo = iChannelOaReplyDefaultService.detail(id); - return AjaxResult.success(vo); - } - - /** - * 默认回复新增 - * - * @author fzr - * @param channelOaReplyParam 参数 - * @return AjaxResult - */ - @PostMapping("/add") - public AjaxResult add(@Validated(value = ChannelOaReplyParam.defaults.class) @RequestBody ChannelOaReplyParam channelOaReplyParam) { - iChannelOaReplyDefaultService.add(channelOaReplyParam); - return AjaxResult.success(); - } - - /** - * 默认回复编辑 - * - * @author fzr - * @return AjaxResult - */ - @PostMapping("/edit") - public AjaxResult edit(@Validated(value = ChannelOaReplyParam.defaults.class) @RequestBody ChannelOaReplyParam channelOaReplyParam) { - iChannelOaReplyDefaultService.edit(channelOaReplyParam); - return AjaxResult.success(); - } - - /** - * 默认回复删除 - * - * @author fzr - * @return AjaxResult - */ - @PostMapping("/del") - public AjaxResult del(@Validated @RequestBody IDParam idParam) { - iChannelOaReplyDefaultService.del(idParam.getId()); - return AjaxResult.success(); - } - - /** - * 默认回复状态 - * - * @author fzr - * @return AjaxResult - */ - @PostMapping("/status") - public AjaxResult status(@Validated @RequestBody IDParam idParam) { - iChannelOaReplyDefaultService.status(idParam.getId()); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaReplyFollowController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaReplyFollowController.java deleted file mode 100644 index 22f1df78..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaReplyFollowController.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.mdd.admin.controller.channel; - -import com.mdd.admin.service.channel.IChannelOaReplyFollowService; -import com.mdd.admin.validate.channel.ChannelOaReplyParam; -import com.mdd.admin.validate.common.IDParam; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.vo.channel.ChannelOaReplyVo; -import com.mdd.common.core.AjaxResult; -import com.mdd.common.core.PageResult; -import com.mdd.common.validator.annotation.IDMust; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -/** - * 公众号关注回复管理 - */ -@RestController -@RequestMapping("api/channel/oaReplyFollow") -public class OaReplyFollowController { - - @Resource - IChannelOaReplyFollowService iChannelOaReplyFollowService; - - /** - * 关注回复列表 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/list") - public AjaxResult list(@Validated PageParam pageParam) { - PageResult list = iChannelOaReplyFollowService.list(pageParam); - return AjaxResult.success(list); - } - - /** - * 关注回复详情 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/detail") - public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { - ChannelOaReplyVo vo = iChannelOaReplyFollowService.detail(id); - return AjaxResult.success(vo); - } - - /** - * 关注回复新增 - * - * @author fzr - * @param channelOaReplyParam 参数 - * @return AjaxResult - */ - @PostMapping("/add") - public AjaxResult add(@Validated(value = ChannelOaReplyParam.follow.class) @RequestBody ChannelOaReplyParam channelOaReplyParam) { - iChannelOaReplyFollowService.add(channelOaReplyParam); - return AjaxResult.success(); - } - - /** - * 关注回复编辑 - * - * @author fzr - * @return AjaxResult - */ - @PostMapping("/edit") - public AjaxResult edit(@Validated(value = ChannelOaReplyParam.follow.class) @RequestBody ChannelOaReplyParam channelOaReplyParam) { - iChannelOaReplyFollowService.edit(channelOaReplyParam); - return AjaxResult.success(); - } - - /** - * 关注回复删除 - * - * @author fzr - * @return AjaxResult - */ - @PostMapping("/del") - public AjaxResult del(@Validated @RequestBody IDParam idParam) { - iChannelOaReplyFollowService.del(idParam.getId()); - return AjaxResult.success(); - } - - /** - * 关注回复状态 - * - * @author fzr - * @return AjaxResult - */ - @PostMapping("/status") - public AjaxResult status(@Validated @RequestBody IDParam idParam) { - iChannelOaReplyFollowService.status(idParam.getId()); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaReplyKeywordController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaReplyKeywordController.java deleted file mode 100644 index c21d0536..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaReplyKeywordController.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.mdd.admin.controller.channel; - -import com.mdd.admin.service.channel.IChannelOaReplyKeywordService; -import com.mdd.admin.validate.channel.ChannelOaReplyParam; -import com.mdd.admin.validate.common.IDParam; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.vo.channel.ChannelOaReplyVo; -import com.mdd.common.core.AjaxResult; -import com.mdd.common.core.PageResult; -import com.mdd.common.validator.annotation.IDMust; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -/** - * 公众号关键词回复管理 - */ -@RestController -@RequestMapping("api/channel/oaReplyKeyword") -public class OaReplyKeywordController { - - @Resource - IChannelOaReplyKeywordService iChannelOaReplyKeywordService; - - /** - * 关键词回复列表 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/list") - public AjaxResult list(@Validated PageParam pageParam) { - PageResult list = iChannelOaReplyKeywordService.list(pageParam); - return AjaxResult.success(list); - } - - /** - * 关键词回复详情 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/detail") - public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { - ChannelOaReplyVo vo = iChannelOaReplyKeywordService.detail(id); - return AjaxResult.success(vo); - } - - /** - * 关键词回复新增 - * - * @author fzr - * @param channelOaReplyParam 参数 - * @return AjaxResult - */ - @PostMapping("/add") - public AjaxResult add(@Validated(value = ChannelOaReplyParam.keywords.class) @RequestBody ChannelOaReplyParam channelOaReplyParam) { - iChannelOaReplyKeywordService.add(channelOaReplyParam); - return AjaxResult.success(); - } - - /** - * 关键词回复编辑 - * - * @author fzr - * @return AjaxResult - */ - @PostMapping("/edit") - public AjaxResult edit(@Validated(value = ChannelOaReplyParam.keywords.class) @RequestBody ChannelOaReplyParam channelOaReplyParam) { - iChannelOaReplyKeywordService.edit(channelOaReplyParam); - return AjaxResult.success(); - } - - /** - * 关键词回复删除 - * - * @author fzr - * @return AjaxResult - */ - @PostMapping("/del") - public AjaxResult del(@Validated @RequestBody IDParam idParam) { - iChannelOaReplyKeywordService.del(idParam.getId()); - return AjaxResult.success(); - } - - /** - * 关键词回复状态 - * - * @author fzr - * @return AjaxResult - */ - @PostMapping("/status") - public AjaxResult status(@Validated @RequestBody IDParam idParam) { - iChannelOaReplyKeywordService.status(idParam.getId()); - return AjaxResult.success(); - } - - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/WxController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/WxController.java deleted file mode 100644 index a2195bb2..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/WxController.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.mdd.admin.controller.channel; - -import com.mdd.admin.config.aop.Log; -import com.mdd.admin.service.channel.IChannelWxService; -import com.mdd.admin.validate.channel.ChannelWxParam; -import com.mdd.admin.vo.channel.ChannelWxVo; -import com.mdd.common.core.AjaxResult; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -/** - * 微信开发平台渠道设置 - */ -@RestController -@RequestMapping("api/channel/wx") -public class WxController { - - @Resource - IChannelWxService iChannelWxService; - - /** - * 开放平台渠道设置详情 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/detail") - public AjaxResult detail() { - ChannelWxVo vo = iChannelWxService.detail(); - return AjaxResult.success(vo); - } - - /** - * 开放平台渠道设置保存 - * - * @author fzr - * @param channelWxParam 参数 - * @return AjaxResult - */ - @Log(title = "开放平台渠道设置保存") - @PostMapping("/save") - public AjaxResult save(@Validated @RequestBody ChannelWxParam channelWxParam) { - iChannelWxService.save(channelWxParam); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/common/AlbumController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/common/AlbumController.java deleted file mode 100644 index 1498b51f..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/common/AlbumController.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.mdd.admin.controller.common; - -import com.alibaba.fastjson.JSONArray; -import com.mdd.admin.config.aop.Log; -import com.mdd.admin.service.common.IAlbumService; -import com.mdd.admin.validate.common.AlbumParam; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.vo.album.AlbumVo; -import com.mdd.common.core.AjaxResult; -import com.mdd.common.core.PageResult; -import com.mdd.common.utils.ArrayUtil; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; - -/** - * 相册管理 - */ -@RestController -@RequestMapping("api/common/album") -public class AlbumController { - - @Resource - IAlbumService iAlbumService; - - /** - * 相册文件列表 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/albumList") - public AjaxResult albumList(@Validated PageParam pageParam, - @RequestParam Map params) { - PageResult voPageResult = iAlbumService.albumList(pageParam, params); - return AjaxResult.success(voPageResult); - } - - /** - * 相册文件重命名 - * - * @author fzr - * @return AjaxResult - */ - @Log(title = "相册文件重命名") - @PostMapping("/albumRename") - public AjaxResult albumRename(@Validated(value = AlbumParam.rename.class) @RequestBody AlbumParam albumParam) { - iAlbumService.albumRename(albumParam.getId(), albumParam.getName()); - return AjaxResult.success(); - } - - /** - * 相册文件移动 - * - * @author fzr - * @return Object - */ - @Log(title = "相册文件移动") - @PostMapping("/albumMove") - public AjaxResult albumMove(@RequestBody Map params) { - if (params.get("ids") == null) { - return AjaxResult.failed("缺少ids参数"); - } - - if (params.get("cid") == null) { - return AjaxResult.failed("缺少cid参数"); - } - - List ids = ArrayUtil.objectToListAsInt(params.get("ids")); - if (ids.size() <= 0) { - return AjaxResult.failed("请至少选择一个文件"); - } - - iAlbumService.albumMove(ids, Integer.parseInt(params.get("cid").toString())); - return AjaxResult.success(); - } - - /** - * 相册文件删除 - * - * @author fzr - * @return AjaxResult - */ - @Log(title = "相册文件删除") - @PostMapping("/albumDel") - public AjaxResult albumDel(@RequestBody Map> params) { - if (params.get("ids") == null) { - return AjaxResult.failed("缺少ids参数"); - } - - iAlbumService.albumDel(params.get("ids")); - return AjaxResult.success(); - } - - /** - * 相册分类列表 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/cateList") - public AjaxResult cateList(@RequestParam Map params) { - JSONArray jsonArray = iAlbumService.cateList(params); - return AjaxResult.success(jsonArray); - } - - /** - * 相册分类新增 - * - * @author fzr - * @return Object - */ - @Log(title = "相册分类新增") - @PostMapping("/cateAdd") - public AjaxResult cateAdd(@Validated(value = AlbumParam.cateAdd.class) @RequestBody AlbumParam albumParam) { - iAlbumService.cateAdd(albumParam); - return AjaxResult.success(); - } - - /** - * 相册分类重命名 - * - * @author fzr - * @return AjaxResult - */ - @Log(title = "相册分类重命名") - @PostMapping("/cateRename") - public AjaxResult cateRename(@Validated(value = AlbumParam.rename.class) @RequestBody AlbumParam albumParam) { - iAlbumService.cateRename(albumParam.getId(), albumParam.getName()); - return AjaxResult.success(); - } - - /** - * 相册分类删除 - * - * @author fzr - * @return Object - */ - @Log(title = "相册分类删除") - @PostMapping("/cateDel") - public AjaxResult cateDel(@Validated(value = AlbumParam.delete.class) @RequestBody AlbumParam albumParam) { - iAlbumService.cateDel(albumParam.getId()); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DataController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateDataController.java similarity index 75% rename from server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DataController.java rename to server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateDataController.java index 4c56384b..33c02cfa 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DataController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateDataController.java @@ -1,6 +1,6 @@ package com.mdd.admin.controller.decorate; -import com.mdd.admin.service.decorate.IDecorateDataService; +import com.mdd.admin.service.IDecorateDataService; import com.mdd.admin.vo.decorate.DecorateDataArticleVo; import com.mdd.common.core.AjaxResult; import org.springframework.web.bind.annotation.GetMapping; @@ -14,9 +14,9 @@ import java.util.List; /** * 装修数据管理 */ -@RestController("decorateDataController") +@RestController @RequestMapping("api/decorate/data") -public class DataController { +public class DecorateDataController { @Resource IDecorateDataService iDecorateDataService; @@ -26,10 +26,10 @@ public class DataController { * * @author fzr * @param limit 条数 - * @return AjaxResult + * @return AjaxResult> */ @GetMapping("/article") - public AjaxResult article(@RequestParam(defaultValue = "10") Integer limit) { + public AjaxResult> article(@RequestParam(defaultValue = "10") Integer limit) { List list = iDecorateDataService.article(limit); return AjaxResult.success(list); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/PagesController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecoratePagesController.java similarity index 63% rename from server/like-admin/src/main/java/com/mdd/admin/controller/decorate/PagesController.java rename to server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecoratePagesController.java index fd31d2b6..c5d7da35 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/PagesController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecoratePagesController.java @@ -1,8 +1,8 @@ package com.mdd.admin.controller.decorate; import com.mdd.admin.config.aop.Log; -import com.mdd.admin.service.decorate.IDecoratePageService; -import com.mdd.admin.validate.decorate.DecoratePageParam; +import com.mdd.admin.service.IDecoratePageService; +import com.mdd.admin.validate.DecoratePageValidate; import com.mdd.admin.vo.decorate.DecoratePageVo; import com.mdd.common.core.AjaxResult; import com.mdd.common.validator.annotation.IDMust; @@ -10,14 +10,13 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.Map; /** * 页面装修管理 */ -@RestController("decoratePagesController") +@RestController @RequestMapping("api/decorate/pages") -public class PagesController { +public class DecoratePagesController { @Resource IDecoratePageService iDecoratePageService; @@ -27,10 +26,10 @@ public class PagesController { * * @author fzr * @param id 主键 - * @return AjaxResult + * @return AjaxResult */ @GetMapping("/detail") - public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { DecoratePageVo vo = iDecoratePageService.detail(id); return AjaxResult.success(vo); } @@ -39,13 +38,13 @@ public class PagesController { * 页面装修保存 * * @author fzr - * @param decoratePageParam 参数 - * @return AjaxResult + * @param decoratePageValidate 参数 + * @return AjaxResult */ @Log(title = "页面装修保存") @PostMapping("/save") - public AjaxResult save(@RequestBody DecoratePageParam decoratePageParam) { - iDecoratePageService.save(decoratePageParam); + public AjaxResult save(@RequestBody DecoratePageValidate decoratePageValidate) { + iDecoratePageService.save(decoratePageValidate); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/TabbarController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateTabbarController.java similarity index 57% rename from server/like-admin/src/main/java/com/mdd/admin/controller/decorate/TabbarController.java rename to server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateTabbarController.java index 4897965e..af3da643 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/TabbarController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateTabbarController.java @@ -1,19 +1,20 @@ package com.mdd.admin.controller.decorate; -import com.mdd.admin.service.decorate.IDecorateTabbarService; +import com.mdd.admin.service.IDecorateTabbarService; +import com.mdd.admin.validate.DecorateTabsValidate; import com.mdd.admin.vo.decorate.DecorateTabbarVo; import com.mdd.common.core.AjaxResult; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.Map; /** * 装修底部导航管理 */ -@RestController("decorateTabbarController") +@RestController @RequestMapping("api/decorate/tabbar") -public class TabbarController { +public class DecorateTabbarController { @Resource IDecorateTabbarService iDecorateTabbarService; @@ -22,10 +23,10 @@ public class TabbarController { * 底部导航详情 * * @author fzr - * @return AjaxResult + * @return AjaxResult */ @GetMapping("/detail") - public AjaxResult detail() { + public AjaxResult detail() { DecorateTabbarVo vo = iDecorateTabbarService.detail(); return AjaxResult.success(vo); } @@ -34,12 +35,12 @@ public class TabbarController { * 底部导航保存 * * @author fzr - * @param params 参数 - * @return AjaxResult + * @param tabsValidate 参数 + * @return AjaxResult */ @PostMapping("/save") - public AjaxResult save(@RequestBody Map params) { - iDecorateTabbarService.save(params); + public AjaxResult save(@Validated @RequestBody DecorateTabsValidate tabsValidate) { + iDecorateTabbarService.save(tabsValidate); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/monitor/CacheController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/monitor/MonitorCacheController.java similarity index 93% rename from server/like-admin/src/main/java/com/mdd/admin/controller/monitor/CacheController.java rename to server/like-admin/src/main/java/com/mdd/admin/controller/monitor/MonitorCacheController.java index 5fc987a9..16751936 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/monitor/CacheController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/monitor/MonitorCacheController.java @@ -17,9 +17,9 @@ import java.util.*; /** * 缓存监控管理 */ -@RestController(value = "monitorCacheController") +@RestController @RequestMapping("api/monitor") -public class CacheController { +public class MonitorCacheController { @Resource private RedisTemplate redisTemplate; @@ -28,11 +28,11 @@ public class CacheController { * 缓存监控 * * @author fzr - * @return AjaxResult + * @return AjaxResult */ @Log(title = "缓存监控") @GetMapping("/cache") - public AjaxResult info() { + public AjaxResult info() { Properties info = (Properties) redisTemplate.execute((RedisCallback) RedisServerCommands::info); Properties commandStats = (Properties) redisTemplate.execute((RedisCallback) connection -> connection.info("commandstats")); Object dbSize = redisTemplate.execute((RedisCallback) RedisServerCommands::dbSize); diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/monitor/ServerController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/monitor/MonitorServerController.java similarity index 78% rename from server/like-admin/src/main/java/com/mdd/admin/controller/monitor/ServerController.java rename to server/like-admin/src/main/java/com/mdd/admin/controller/monitor/MonitorServerController.java index 856a8a24..dcc1ce3e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/monitor/ServerController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/monitor/MonitorServerController.java @@ -7,22 +7,24 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + /** * 服务监控管理 */ -@RestController(value = "monitorServerController") +@RestController @RequestMapping("api/monitor") -public class ServerController { +public class MonitorServerController { /** * 服务器信息 * * @author fzr - * @return AjaxResult + * @return AjaxResult> */ @Log(title = "服务监控") @GetMapping("/server") - public AjaxResult info() { + public AjaxResult> info() { ServerResult server = new ServerResult(); return AjaxResult.success(server.copyTo()); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/CopyrightController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/CopyrightController.java deleted file mode 100644 index 8b292652..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/CopyrightController.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.mdd.admin.controller.setting; - -import com.mdd.admin.service.setting.ISettingCopyrightService; -import com.mdd.common.core.AjaxResult; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; - -/** - * 网站版权配置管理 - */ -@RestController("settingCopyrightController") -@RequestMapping("api/setting/copyright") -public class CopyrightController { - - @Resource - ISettingCopyrightService iSettingCopyrightService; - - /** - * 获取网站版权信息 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/detail") - public AjaxResult detail() { - List> list = iSettingCopyrightService.detail(); - return AjaxResult.success(list); - } - - /** - * 保存网站版本信息 - * - * @author fzr - * @return AjaxResult - */ - @PostMapping("/save") - public AjaxResult save(@RequestBody List> params) { - iSettingCopyrightService.save(params); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/LoginController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/LoginController.java deleted file mode 100644 index bc404d2c..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/LoginController.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.mdd.admin.controller.setting; - -import com.mdd.admin.service.setting.ISettingLoginService; -import com.mdd.common.core.AjaxResult; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.Map; - -@RestController("settingLoginController") -@RequestMapping("api/setting/login") -public class LoginController { - - @Resource - ISettingLoginService iSettingLoginService; - - /** - * 登录设置详情 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/detail") - public AjaxResult detail() { - Map map = iSettingLoginService.detail(); - return AjaxResult.success(map); - } - - /** - * 登录设置保存 - * - * @author fzr - * @param params 参数 - * @return Object - */ - @PostMapping("/save") - public AjaxResult save(@RequestBody Map params) { - iSettingLoginService.save(params); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/ProtocolController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/ProtocolController.java deleted file mode 100644 index 471ec41a..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/ProtocolController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.mdd.admin.controller.setting; - -import com.mdd.admin.service.setting.ISettingProtocolService; -import com.mdd.common.core.AjaxResult; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.Map; - -/** - * 政策协议配置管理 - */ -@RestController("settingProtocolController") -@RequestMapping("api/setting/protocol") -public class ProtocolController { - - @Resource - ISettingProtocolService iSettingProtocolService; - - /** - * 获取网站版权信息 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/detail") - public AjaxResult detail() { - Map> detail = iSettingProtocolService.detail(); - return AjaxResult.success(detail); - } - - /** - * 保存网站版本信息 - * - * @author fzr - * @return Object - */ - @PostMapping("/save") - public AjaxResult save(@RequestBody Map params) { - iSettingProtocolService.save(params); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SearchController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SearchController.java deleted file mode 100644 index a8519f2b..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SearchController.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.mdd.admin.controller.setting; - -import com.mdd.admin.service.setting.ISettingSearchService; -import com.mdd.common.core.AjaxResult; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.Map; - -/** - * 热搜设置 - */ -@RestController("settingSearchController") -@RequestMapping("api/setting/search") -public class SearchController { - - @Resource - ISettingSearchService iSettingSearchService; - - /** - * 热门搜索详情 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/detail") - public AjaxResult detail() { - Map map = iSettingSearchService.detail(); - return AjaxResult.success(map); - } - - /** - * 热门搜索保存 - * - * @author fzr - * @param params 参数 - * @return AjaxResult - */ - @PostMapping("/save") - public AjaxResult save(@RequestBody Map params) { - iSettingSearchService.save(params); - return AjaxResult.success(); - } - - - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingCopyrightController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingCopyrightController.java new file mode 100644 index 00000000..392657d7 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingCopyrightController.java @@ -0,0 +1,48 @@ +package com.mdd.admin.controller.setting; + +import com.mdd.admin.service.ISettingCopyrightService; +import com.mdd.admin.validate.setting.SettingCopyrightValidate; +import com.mdd.admin.vo.setting.SettingCopyrightVo; +import com.mdd.common.core.AjaxResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 网站版权配置管理 + */ +@RestController +@RequestMapping("api/setting/copyright") +public class SettingCopyrightController { + + @Resource + ISettingCopyrightService iSettingCopyrightService; + + /** + * 获取网站版权信息 + * + * @author fzr + * @return AjaxResult> + */ + @GetMapping("/detail") + public AjaxResult> detail() { + List list = iSettingCopyrightService.detail(); + return AjaxResult.success(list); + } + + /** + * 保存网站版本信息 + * + * @author fzr + * @param copyrightValidate 参数 + * @return AjaxResult + */ + @PostMapping("/save") + public AjaxResult save(@Validated @RequestBody SettingCopyrightValidate copyrightValidate) { + iSettingCopyrightService.save(copyrightValidate); + return AjaxResult.success(); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictDataController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictDataController.java similarity index 54% rename from server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictDataController.java rename to server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictDataController.java index f19092b3..e3b1cf0d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictDataController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictDataController.java @@ -1,9 +1,11 @@ package com.mdd.admin.controller.setting; import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.mdd.admin.service.setting.ISettingDictDataService; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.validate.setting.DictDataParam; +import com.mdd.admin.service.ISettingDictDataService; +import com.mdd.admin.validate.commons.IdsValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.setting.DictDataCreateValidate; +import com.mdd.admin.validate.setting.DictDataUpdateValidate; import com.mdd.admin.vo.setting.SettingDictDataVo; import com.mdd.common.core.AjaxResult; import com.mdd.common.core.PageResult; @@ -19,9 +21,9 @@ import java.util.Map; /** * 字典数据配置管理 */ -@RestController("settingDictDataController") +@RestController @RequestMapping("api/setting/dict/data") -public class DictDataController { +public class SettingDictDataController { @Resource ISettingDictDataService iSettingDictDataService; @@ -30,10 +32,11 @@ public class DictDataController { * 字典数据所有 * * @author fzr - * @return Object + * @param params 参数 + * @return jaxResult> */ @GetMapping("/all") - public AjaxResult all(@RequestParam Map params) { + public AjaxResult> all(@RequestParam Map params) { Assert.isFalse(StringUtil.isEmpty(params.get("dictType")), "dictType缺失"); List list = iSettingDictDataService.all(params); return AjaxResult.success(list); @@ -43,15 +46,15 @@ public class DictDataController { * 字典数据列表 * * @author fzr - * @param pageParam 分页参数 + * @param pageValidate 分页参数 * @param params 搜索参数 - * @return AjaxResult + * @return PageResult */ @GetMapping("/list") - public AjaxResult list(@Validated PageParam pageParam, - @RequestParam Map params) { + public AjaxResult> list(@Validated PageValidate pageValidate, + @RequestParam Map params) { Assert.isFalse(StringUtil.isEmpty(params.get("dictType")), "dictType缺失"); - PageResult list = iSettingDictDataService.list(pageParam, params); + PageResult list = iSettingDictDataService.list(pageValidate, params); return AjaxResult.success(list); } @@ -60,10 +63,10 @@ public class DictDataController { * * @author fzr * @param id 主键 - * @return Object + * @return AjaxResult */ @GetMapping("/detail") - public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { SettingDictDataVo vo = iSettingDictDataService.detail(id); return AjaxResult.success(vo); } @@ -72,12 +75,12 @@ public class DictDataController { * 字典数据新增 * * @author fzr - * @param dictDataParam 参数 - * @return AjaxResult + * @param createValidate 参数 + * @return AjaxResult */ @PostMapping("/add") - public AjaxResult add(@Validated(value = DictDataParam.create.class) @RequestBody DictDataParam dictDataParam) { - iSettingDictDataService.add(dictDataParam); + public AjaxResult add(@Validated @RequestBody DictDataCreateValidate createValidate) { + iSettingDictDataService.add(createValidate); return AjaxResult.success(); } @@ -85,12 +88,12 @@ public class DictDataController { * 字典数据编辑 * * @author fzr - * @param dictDataParam 参数 - * @return AjaxResult + * @param updateValidate 参数 + * @return AjaxResult */ @PostMapping("/edit") - public Object edit(@Validated(value = DictDataParam.update.class) @RequestBody DictDataParam dictDataParam) { - iSettingDictDataService.edit(dictDataParam); + public AjaxResult edit(@Validated @RequestBody DictDataUpdateValidate updateValidate) { + iSettingDictDataService.edit(updateValidate); return AjaxResult.success(); } @@ -98,12 +101,12 @@ public class DictDataController { * 字典数据删除 * * @author fzr - * @param dictDataParam 参数 - * @return AjaxResult + * @param idsValidate 参数 + * @return AjaxResult */ @PostMapping("/del") - public AjaxResult del(@Validated(value = DictDataParam.delete.class) @RequestBody DictDataParam dictDataParam) { - iSettingDictDataService.del(dictDataParam.getIds()); + public AjaxResult del(@Validated @RequestBody IdsValidate idsValidate) { + iSettingDictDataService.del(idsValidate.getIds()); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictTypeController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictTypeController.java similarity index 53% rename from server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictTypeController.java rename to server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictTypeController.java index 94a14eb5..cbfe4588 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/DictTypeController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictTypeController.java @@ -1,8 +1,10 @@ package com.mdd.admin.controller.setting; -import com.mdd.admin.service.setting.ISettingDictTypeService; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.validate.setting.DictTypeParam; +import com.mdd.admin.service.ISettingDictTypeService; +import com.mdd.admin.validate.commons.IdsValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.setting.DictTypeCreateValidate; +import com.mdd.admin.validate.setting.DictTypeUpdateValidate; import com.mdd.admin.vo.setting.SettingDictTypeVo; import com.mdd.common.core.AjaxResult; import com.mdd.common.core.PageResult; @@ -17,9 +19,9 @@ import java.util.Map; /** * 字典类型配置管理 */ -@RestController("settingDictTypeController") +@RestController @RequestMapping("api/setting/dict/type") -public class DictTypeController { +public class SettingDictTypeController { @Resource ISettingDictTypeService iSettingDictTypeService; @@ -28,10 +30,10 @@ public class DictTypeController { * 字典类型所有 * * @author fzr - * @return Object + * @return AjaxResult> */ @GetMapping("/all") - public AjaxResult all() { + public AjaxResult> all() { List list = iSettingDictTypeService.all(); return AjaxResult.success(list); } @@ -40,14 +42,14 @@ public class DictTypeController { * 字典类型列表 * * @author fzr - * @param pageParam 分页参数 + * @param pageValidate 分页参数 * @param params 搜索参数 - * @return Object + * @return AjaxResult> */ @GetMapping("/list") - public AjaxResult list(@Validated PageParam pageParam, + public AjaxResult> list(@Validated PageValidate pageValidate, @RequestParam Map params) { - PageResult list = iSettingDictTypeService.list(pageParam, params); + PageResult list = iSettingDictTypeService.list(pageValidate, params); return AjaxResult.success(list); } @@ -56,10 +58,10 @@ public class DictTypeController { * * @author fzr * @param id 主键 - * @return Object + * @return AjaxResult */ @GetMapping("/detail") - public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { SettingDictTypeVo vo = iSettingDictTypeService.detail(id); return AjaxResult.success(vo); } @@ -68,12 +70,12 @@ public class DictTypeController { * 字典类型新增 * * @author fzr - * @param dictTypeParam 参数 - * @return Object + * @param createValidate 参数 + * @return AjaxResult */ @PostMapping("/add") - public AjaxResult add(@Validated(value = DictTypeParam.create.class) @RequestBody DictTypeParam dictTypeParam) { - iSettingDictTypeService.add(dictTypeParam); + public AjaxResult add(@Validated @RequestBody DictTypeCreateValidate createValidate) { + iSettingDictTypeService.add(createValidate); return AjaxResult.success(); } @@ -81,12 +83,12 @@ public class DictTypeController { * 字典类型编辑 * * @author fzr - * @param dictTypeParam 参数 - * @return Object + * @param updateValidate 参数 + * @return AjaxResult */ @PostMapping("/edit") - public AjaxResult edit(@Validated(value = DictTypeParam.update.class) @RequestBody DictTypeParam dictTypeParam) { - iSettingDictTypeService.edit(dictTypeParam); + public AjaxResult edit(@Validated @RequestBody DictTypeUpdateValidate updateValidate) { + iSettingDictTypeService.edit(updateValidate); return AjaxResult.success(); } @@ -94,12 +96,12 @@ public class DictTypeController { * 字典类型删除 * * @author fzr - * @param dictTypeParam 参数 - * @return Object + * @param idsValidate 参数 + * @return AjaxResult */ @PostMapping("/del") - public AjaxResult del(@Validated(value = DictTypeParam.delete.class) @RequestBody DictTypeParam dictTypeParam) { - iSettingDictTypeService.del(dictTypeParam.getIds()); + public AjaxResult del(@Validated @RequestBody IdsValidate idsValidate) { + iSettingDictTypeService.del(idsValidate.getIds()); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingLoginController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingLoginController.java new file mode 100644 index 00000000..591e631f --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingLoginController.java @@ -0,0 +1,45 @@ +package com.mdd.admin.controller.setting; + +import com.mdd.admin.service.ISettingLoginService; +import com.mdd.admin.validate.setting.SettingLoginValidate; +import com.mdd.admin.vo.setting.SettingLoginVo; +import com.mdd.common.core.AjaxResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Map; + +@RestController +@RequestMapping("api/setting/login") +public class SettingLoginController { + + @Resource + ISettingLoginService iSettingLoginService; + + /** + * 登录设置详情 + * + * @author fzr + * @return AjaxResult + */ + @GetMapping("/detail") + public AjaxResult detail() { + SettingLoginVo vo = iSettingLoginService.detail(); + return AjaxResult.success(vo); + } + + /** + * 登录设置保存 + * + * @author fzr + * @param loginValidate 参数 + * @return AjaxResult + */ + @PostMapping("/save") + public AjaxResult save(@Validated @RequestBody SettingLoginValidate loginValidate) { + iSettingLoginService.save(loginValidate); + return AjaxResult.success(); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingNoticeController.java similarity index 63% rename from server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java rename to server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingNoticeController.java index 79fb4288..46518a82 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingNoticeController.java @@ -1,8 +1,8 @@ package com.mdd.admin.controller.setting; -import com.mdd.admin.service.setting.ISettingNoticeService; +import com.mdd.admin.service.ISettingNoticeService; import com.mdd.admin.vo.setting.SettingNoticeDetailVo; -import com.mdd.admin.vo.setting.SettingNoticeListVo; +import com.mdd.admin.vo.setting.SettingNoticeListedVo; import com.mdd.common.core.AjaxResult; import com.mdd.common.validator.annotation.IDMust; import org.springframework.validation.annotation.Validated; @@ -15,9 +15,9 @@ import java.util.Map; /** * 通知设置管理 */ -@RestController("settingNoticeController") +@RestController @RequestMapping("api/setting/notice") -public class NoticeController { +public class SettingNoticeController { @Resource ISettingNoticeService iSettingNoticeService; @@ -27,11 +27,11 @@ public class NoticeController { * * @author fzr * @param recipient 类型: 1=用户, 2=平台 - * @return AjaxResult + * @return AjaxResult> */ @GetMapping("/list") - public AjaxResult list(@RequestParam Integer recipient) { - List list = iSettingNoticeService.list(recipient); + public AjaxResult> list(@RequestParam Integer recipient) { + List list = iSettingNoticeService.list(recipient); return AjaxResult.success(list); } @@ -40,10 +40,10 @@ public class NoticeController { * * @author fzr * @param id 主键 - * @return AjaxResult + * @return AjaxResult */ @GetMapping("/detail") - public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { SettingNoticeDetailVo vo = iSettingNoticeService.detail(id); return AjaxResult.success(vo); } @@ -53,10 +53,10 @@ public class NoticeController { * * @author fzr * @param params 参数 - * @return Object + * @return AjaxResult */ @PostMapping("/save") - public AjaxResult save(@RequestBody Map params) { + public AjaxResult save(@RequestBody Map params) { iSettingNoticeService.save(params); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingProtocolController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingProtocolController.java new file mode 100644 index 00000000..03cf7681 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingProtocolController.java @@ -0,0 +1,47 @@ +package com.mdd.admin.controller.setting; + +import com.mdd.admin.service.ISettingProtocolService; +import com.mdd.admin.validate.setting.SettingProtocolValidate; +import com.mdd.admin.vo.setting.SettingProtocolDetailVo; +import com.mdd.common.core.AjaxResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 政策协议配置管理 + */ +@RestController +@RequestMapping("api/setting/protocol") +public class SettingProtocolController { + + @Resource + ISettingProtocolService iSettingProtocolService; + + /** + * 获取政策协议信息 + * + * @author fzr + * @return AjaxResult + */ + @GetMapping("/detail") + public AjaxResult detail() { + SettingProtocolDetailVo detail = iSettingProtocolService.detail(); + return AjaxResult.success(detail); + } + + /** + * 保存政策协议信息 + * + * @author fzr + * @param protocolValidate 参数 + * @return AjaxResult + */ + @PostMapping("/save") + public AjaxResult save(@Validated @RequestBody SettingProtocolValidate protocolValidate) { + iSettingProtocolService.save(protocolValidate); + return AjaxResult.success(); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingSearchController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingSearchController.java new file mode 100644 index 00000000..7f05f709 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingSearchController.java @@ -0,0 +1,48 @@ +package com.mdd.admin.controller.setting; + +import com.mdd.admin.service.ISettingSearchService; +import com.mdd.admin.validate.setting.SettingSearchValidate; +import com.mdd.admin.vo.setting.SettingSearchDetailVo; +import com.mdd.common.core.AjaxResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Map; + +/** + * 热搜设置 + */ +@RestController +@RequestMapping("api/setting/search") +public class SettingSearchController { + + @Resource + ISettingSearchService iSettingSearchService; + + /** + * 热门搜索详情 + * + * @author fzr + * @return AjaxResult + */ + @GetMapping("/detail") + public AjaxResult detail() { + SettingSearchDetailVo vo = iSettingSearchService.detail(); + return AjaxResult.success(vo); + } + + /** + * 热门搜索保存 + * + * @author fzr + * @param searchValidate 参数 + * @return AjaxResult + */ + @PostMapping("/save") + public AjaxResult save(@Validated @RequestBody SettingSearchValidate searchValidate) { + iSettingSearchService.save(searchValidate); + return AjaxResult.success(); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SmsController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingSmsController.java similarity index 70% rename from server/like-admin/src/main/java/com/mdd/admin/controller/setting/SmsController.java rename to server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingSmsController.java index ff8d979d..76906734 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SmsController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingSmsController.java @@ -1,7 +1,7 @@ package com.mdd.admin.controller.setting; import com.mdd.admin.config.aop.Log; -import com.mdd.admin.service.setting.ISettingSmsService; +import com.mdd.admin.service.ISettingSmsService; import com.mdd.common.core.AjaxResult; import org.springframework.web.bind.annotation.*; @@ -12,9 +12,9 @@ import java.util.Map; /** * 短信设置管理 */ -@RestController("settingSmsController") +@RestController @RequestMapping("api/setting/sms") -public class SmsController { +public class SettingSmsController { @Resource ISettingSmsService iSettingSmsService; @@ -23,10 +23,10 @@ public class SmsController { * 短信引擎列表 * * @author fzr - * @return AjaxResult + * @return AjaxResult>> */ @GetMapping("/list") - public AjaxResult list() { + public AjaxResult>> list() { List> list = iSettingSmsService.list(); return AjaxResult.success(list); } @@ -36,10 +36,10 @@ public class SmsController { * * @author fzr * @param alias 别名 - * @return AjaxResult + * @return AjaxResult> */ @GetMapping("/detail") - public AjaxResult detail(String alias) { + public AjaxResult> detail(String alias) { Map map = iSettingSmsService.detail(alias); return AjaxResult.success(map); } @@ -49,11 +49,11 @@ public class SmsController { * * @author fzr * @param params 参数 - * @return AjaxResult + * @return AjaxResult */ @Log(title = "短信引擎保存") @PostMapping("/save") - public AjaxResult save(@RequestBody Map params) { + public AjaxResult save(@RequestBody Map params) { iSettingSmsService.save(params); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/StorageController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingStorageController.java similarity index 72% rename from server/like-admin/src/main/java/com/mdd/admin/controller/setting/StorageController.java rename to server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingStorageController.java index 219fb156..1517c10d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/StorageController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingStorageController.java @@ -1,7 +1,7 @@ package com.mdd.admin.controller.setting; import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.mdd.admin.service.setting.ISettingStorageService; +import com.mdd.admin.service.ISettingStorageService; import com.mdd.common.core.AjaxResult; import org.springframework.web.bind.annotation.*; @@ -12,9 +12,9 @@ import java.util.Map; /** * 存储方式配置管理 */ -@RestController("settingStorageController") +@RestController @RequestMapping("api/setting/storage") -public class StorageController { +public class SettingStorageController { @Resource ISettingStorageService iSettingStorageService; @@ -23,10 +23,10 @@ public class StorageController { * 存储列表 * * @author fzr - * @return AjaxResult + * @return AjaxResult>> */ @GetMapping("/list") - public AjaxResult list() { + public AjaxResult>> list() { List> list = iSettingStorageService.list(); return AjaxResult.success(list); } @@ -35,10 +35,10 @@ public class StorageController { * 存储详情 * * @param alias 引擎别名 - * @return AjaxResult + * @return AjaxResult> */ @GetMapping("/detail") - public AjaxResult detail(String alias) { + public AjaxResult> detail(String alias) { Map map = iSettingStorageService.detail(alias); return AjaxResult.success(map); } @@ -48,10 +48,10 @@ public class StorageController { * * @author fzr * @param params 参数 - * @return AjaxResult + * @return AjaxResult */ @PostMapping("/edit") - public AjaxResult edit(@RequestBody Map params) { + public AjaxResult edit(@RequestBody Map params) { iSettingStorageService.edit(params); return AjaxResult.success(); } @@ -61,10 +61,10 @@ public class StorageController { * * @author fzr * @param params 参数 - * @return AjaxResult + * @return AjaxResult */ @PostMapping("/change") - public AjaxResult change(@RequestBody Map params) { + public AjaxResult change(@RequestBody Map params) { Assert.notNull(params.get("alias"), "alias参数缺失"); Assert.notNull(params.get("status"), "status参数缺失"); String alias = params.get("alias"); diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingUserController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingUserController.java new file mode 100644 index 00000000..b0b1a8e9 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingUserController.java @@ -0,0 +1,47 @@ +package com.mdd.admin.controller.setting; + +import com.mdd.admin.service.ISettingUserService; +import com.mdd.admin.validate.setting.SettingUserValidate; +import com.mdd.admin.vo.setting.SettingUserVo; +import com.mdd.common.core.AjaxResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 用户设置管理 + */ +@RestController +@RequestMapping("api/setting/user") +public class SettingUserController { + + @Resource + ISettingUserService iSettingUserService; + + /** + * 用户设置详情 + * + * @author fzr + * @return AjaxResult + */ + @GetMapping("/detail") + public AjaxResult detail() { + SettingUserVo vo = iSettingUserService.detail(); + return AjaxResult.success(vo); + } + + /** + * 用户设置保存 + * + * @author fzr + * @param userValidate 参数 + * @return AjaxResult + */ + @PostMapping("/save") + public AjaxResult save(@Validated @RequestBody SettingUserValidate userValidate) { + iSettingUserService.save(userValidate); + return AjaxResult.success(); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java new file mode 100644 index 00000000..cfb7ca85 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java @@ -0,0 +1,48 @@ +package com.mdd.admin.controller.setting; + +import com.mdd.admin.service.ISettingWebsiteService; +import com.mdd.admin.validate.setting.SettingWebsiteValidate; +import com.mdd.admin.vo.setting.SettingWebsiteVo; +import com.mdd.common.core.AjaxResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Map; + +/** + * 网站信息配置管理 + */ +@RestController +@RequestMapping("api/setting/website") +public class SettingWebsiteController { + + @Resource + ISettingWebsiteService iSettingWebsiteService; + + /** + * 获取网站配置信息 + * + * @author fzr + * @return AjaxResult + */ + @GetMapping("/detail") + public AjaxResult detail() { + SettingWebsiteVo detail = iSettingWebsiteService.detail(); + return AjaxResult.success(detail); + } + + /** + * 保存网站配置信息 + * + * @author fzr + * @param websiteValidate 参数 + * @return AjaxResult + */ + @PostMapping("/save") + public AjaxResult save(@Validated @RequestBody SettingWebsiteValidate websiteValidate) { + iSettingWebsiteService.save(websiteValidate); + return AjaxResult.success(); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/UserController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/UserController.java deleted file mode 100644 index bbc9764f..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/UserController.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.mdd.admin.controller.setting; - -import com.mdd.admin.service.setting.ISettingUserService; -import com.mdd.common.core.AjaxResult; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.Map; - -/** - * 用户设置管理 - */ -@RestController("settingUserController") -@RequestMapping("api/setting/user") -public class UserController { - - @Resource - ISettingUserService iSettingUserService; - - /** - * 用户设置详情 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/detail") - public Object detail() { - Map map = iSettingUserService.detail(); - return AjaxResult.success(map); - } - - /** - * 用户设置保存 - * - * @author fzr - * @param params 参数 - * @return AjaxResult - */ - @PostMapping("/save") - public AjaxResult save(@RequestBody Map params) { - iSettingUserService.save(params); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/WebsiteController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/WebsiteController.java deleted file mode 100644 index e90eae93..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/WebsiteController.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.mdd.admin.controller.setting; - -import com.mdd.admin.service.setting.ISettingWebsiteService; -import com.mdd.common.core.AjaxResult; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.Map; - -/** - * 网站信息配置管理 - */ -@RestController("settingWebsiteController") -@RequestMapping("api/setting/website") -public class WebsiteController { - - @Resource - ISettingWebsiteService iSettingWebsiteService; - - /** - * 获取网站配置信息 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/detail") - public AjaxResult detail() { - Map detail = iSettingWebsiteService.detail(); - return AjaxResult.success(detail); - } - - /** - * 保存网站配置信息 - * - * @author fzr - * @param params 参数 - * @return Object - */ - @PostMapping("/save") - public AjaxResult save(@RequestBody Map params) { - iSettingWebsiteService.save(params); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthAdminController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthAdminController.java deleted file mode 100644 index 5800a4bb..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthAdminController.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.mdd.admin.controller.system; - -import com.mdd.admin.LikeAdminThreadLocal; -import com.mdd.admin.config.aop.Log; -import com.mdd.admin.service.system.ISystemAuthAdminService; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.validate.system.SystemAuthAdminParam; -import com.mdd.admin.vo.system.SystemAuthAdminVo; -import com.mdd.admin.vo.system.SystemAuthSelfVo; -import com.mdd.common.core.AjaxResult; -import com.mdd.common.core.PageResult; -import com.mdd.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/system/admin") -public class AuthAdminController { - - @Resource - ISystemAuthAdminService iSystemAuthAdminService; - - /** - * 管理员列表 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/list") - public AjaxResult list(@Validated PageParam pageParam, - @RequestParam Map params) { - PageResult list = iSystemAuthAdminService.list(pageParam, params); - return AjaxResult.success(list); - } - - /** - * 管理员信息 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/self") - public AjaxResult self() { - Integer adminId = LikeAdminThreadLocal.getAdminId(); - SystemAuthSelfVo vo = iSystemAuthAdminService.self(adminId); - return AjaxResult.success(vo); - } - - /** - * 管理员详情 - * - * @author fzr - * @param id 主键ID - * @return AjaxResult - */ - @GetMapping("/detail") - public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { - SystemAuthAdminVo vo = iSystemAuthAdminService.detail(id); - return AjaxResult.success(vo); - } - - /** - * 管理员新增 - * - * @author fzr - * @param systemAuthAdminParam 参数 - * @return AjaxResult - */ - @Log(title = "管理员新增") - @PostMapping("/add") - public AjaxResult add(@Validated(value = SystemAuthAdminParam.create.class) @RequestBody SystemAuthAdminParam systemAuthAdminParam) { - iSystemAuthAdminService.add(systemAuthAdminParam); - return AjaxResult.success(); - } - - /** - * 管理员编辑 - * - * @author fzr - * @param systemAuthAdminParam 参数 - * @return AjaxResult - */ - @Log(title = "管理员编辑") - @PostMapping("/edit") - public AjaxResult edit(@Validated(value = SystemAuthAdminParam.update.class) @RequestBody SystemAuthAdminParam systemAuthAdminParam) { - iSystemAuthAdminService.edit(systemAuthAdminParam); - return AjaxResult.success(); - } - - /** - * 当前管理员更新 - * - * @author fzr - * @return AjaxResult - */ - @Log(title = "管理员更新") - @PostMapping("/upInfo") - public AjaxResult upInfo(@Validated(value = SystemAuthAdminParam.upInfo.class) @RequestBody SystemAuthAdminParam systemAuthAdminParam) { - Integer adminId = LikeAdminThreadLocal.getAdminId(); - iSystemAuthAdminService.upInfo(systemAuthAdminParam, adminId); - return AjaxResult.success(); - } - - /** - * 管理员删除 - * - * @author fzr - * @return AjaxResult - */ - @Log(title = "管理员删除") - @PostMapping("/del") - public AjaxResult del(@Validated(value = SystemAuthAdminParam.delete.class) @RequestBody SystemAuthAdminParam systemAuthAdminParam) { - iSystemAuthAdminService.del(systemAuthAdminParam.getId()); - return AjaxResult.success(); - } - - /** - * 管理员状态切换 - * - * @author fzr - * @return AjaxResult - */ - @Log(title = "管理员状态切换") - @PostMapping("/disable") - public AjaxResult disable(@Validated(value = SystemAuthAdminParam.delete.class) @RequestBody SystemAuthAdminParam systemAuthAdminParam) { - iSystemAuthAdminService.disable(systemAuthAdminParam.getId()); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthDeptController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthDeptController.java deleted file mode 100644 index 50428c99..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthDeptController.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.mdd.admin.controller.system; - -import com.alibaba.fastjson.JSONArray; -import com.mdd.admin.service.system.ISystemAuthDeptService; -import com.mdd.admin.validate.system.SystemAuthDeptParam; -import com.mdd.admin.vo.system.SystemAuthDeptVo; -import com.mdd.common.core.AjaxResult; -import com.mdd.common.validator.annotation.IDMust; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; - -/** - * 系统部门管理 - */ -@RestController -@RequestMapping("api/system/dept") -public class AuthDeptController { - - @Resource - ISystemAuthDeptService iSystemAuthDeptService; - - /** - * 部门所有 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/all") - public AjaxResult all() { - List vos = iSystemAuthDeptService.all(); - return AjaxResult.success(vos); - } - - /** - * 部门列表 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/list") - public AjaxResult list(@RequestParam Map params) { - JSONArray list = iSystemAuthDeptService.list(params); - return AjaxResult.success(list); - } - - /** - * 部门详情 - * - * @author fzr - * @param id 主键 - * @return AjaxResult - */ - @GetMapping("/detail") - public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { - SystemAuthDeptVo vo = iSystemAuthDeptService.detail(id); - return AjaxResult.success(vo); - } - - /** - * 部门新增 - * - * @author fzr - * @param systemAuthDeptParam 参数 - * @return AjaxResult - */ - @PostMapping("/add") - public AjaxResult add(@Validated(value = SystemAuthDeptParam.create.class) @RequestBody SystemAuthDeptParam systemAuthDeptParam) { - iSystemAuthDeptService.add(systemAuthDeptParam); - return AjaxResult.success(); - } - - /** - * 部门编辑 - * - * @author fzr - * @param systemAuthDeptParam 参数 - * @return AjaxResult - */ - @PostMapping("/edit") - public AjaxResult edit(@Validated(value = SystemAuthDeptParam.update.class) @RequestBody SystemAuthDeptParam systemAuthDeptParam) { - iSystemAuthDeptService.edit(systemAuthDeptParam); - return AjaxResult.success(); - } - - /** - * 部门删除 - * - * @author fzr - * @param systemAuthDeptParam 参数 - * @return AjaxResult - */ - @PostMapping("/del") - public AjaxResult del(@Validated(value = SystemAuthDeptParam.delete.class) @RequestBody SystemAuthDeptParam systemAuthDeptParam) { - iSystemAuthDeptService.del(systemAuthDeptParam.getId()); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthPostController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthPostController.java deleted file mode 100644 index 95e88e69..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthPostController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.mdd.admin.controller.system; - -import com.mdd.admin.service.system.ISystemAuthPostService; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.validate.system.SystemAuthPostParam; -import com.mdd.admin.vo.system.SystemAuthPostVo; -import com.mdd.common.core.AjaxResult; -import com.mdd.common.core.PageResult; -import com.mdd.common.validator.annotation.IDMust; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; - -/** - * 系统岗位管理 - */ -@RestController -@RequestMapping("api/system/post") -public class AuthPostController { - - @Resource - ISystemAuthPostService iSystemAuthPostService; - - /** - * 岗位所有 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/all") - public AjaxResult all() { - List vos = iSystemAuthPostService.all(); - return AjaxResult.success(vos); - } - - /** - * 岗位列表 - * @param pageParam 分页参数 - * @param params 搜索参数 - * @return Object - */ - @GetMapping("/list") - public AjaxResult list(@Validated PageParam pageParam, - @RequestParam Map params) { - PageResult list = iSystemAuthPostService.list(pageParam, params); - return AjaxResult.success(list); - } - - /** - * 岗位详情 - * - * @author fzr - * @param id 主键 - * @return AjaxResult - */ - @GetMapping("/detail") - public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { - SystemAuthPostVo vo = iSystemAuthPostService.detail(id); - return AjaxResult.success(vo); - } - - /** - * 岗位新增 - * - * @author fzr - * @param systemAuthPostParam 参数 - * @return AjaxResult - */ - @PostMapping("/add") - public AjaxResult add(@Validated(value = SystemAuthPostParam.create.class) @RequestBody SystemAuthPostParam systemAuthPostParam) { - iSystemAuthPostService.add(systemAuthPostParam); - return AjaxResult.success(); - } - - /** - * 岗位编辑 - * - * @author fzr - * @param systemAuthPostParam 参数 - * @return AjaxResult - */ - @PostMapping("/edit") - public AjaxResult edit(@Validated(value = SystemAuthPostParam.update.class) @RequestBody SystemAuthPostParam systemAuthPostParam) { - iSystemAuthPostService.edit(systemAuthPostParam); - return AjaxResult.success(); - } - - /** - * 岗位删除 - * - * @author fzr - * @param systemAuthPostParam 参数 - * @return AjaxResult - */ - @PostMapping("/del") - public AjaxResult del(@Validated(value = SystemAuthPostParam.delete.class) @RequestBody SystemAuthPostParam systemAuthPostParam) { - iSystemAuthPostService.del(systemAuthPostParam.getId()); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthRoleController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthRoleController.java deleted file mode 100644 index 6ced19d9..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthRoleController.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.mdd.admin.controller.system; - -import com.mdd.admin.config.aop.Log; -import com.mdd.admin.service.system.ISystemAuthRoleService; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.validate.system.SystemAuthRoleParam; -import com.mdd.admin.vo.system.SystemAuthRoleVo; -import com.mdd.common.core.AjaxResult; -import com.mdd.common.core.PageResult; -import com.mdd.common.validator.annotation.IDMust; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; - -/** - * 系统角色管理 - */ -@RestController -@RequestMapping("api/system/role") -public class AuthRoleController { - - @Resource - ISystemAuthRoleService iSystemAuthRoleService; - - /** - * 角色所有 - * - * @author fzr - * @return AjaxResult - */ - @GetMapping("/all") - public AjaxResult all() { - List> list = iSystemAuthRoleService.all(); - return AjaxResult.success(list); - } - - /** - * 角色列表 - * - * @author fzr - * @param pageParam 分页参数 - * @return AjaxResult - */ - @Log(title = "角色列表") - @GetMapping("/list") - public AjaxResult list(@Validated PageParam pageParam) { - PageResult lists = iSystemAuthRoleService.list(pageParam); - return AjaxResult.success(lists); - } - - /** - * 角色详情 - * - * @author fzr - * @return AjaxResult - */ - @Log(title = "角色详情") - @GetMapping("/detail") - public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { - SystemAuthRoleVo vo = iSystemAuthRoleService.detail(id); - return AjaxResult.success(vo); - } - - /** - * 新增角色 - * - * @author fzr - * @param systemAuthRoleParam 角色参数 - * @return AjaxResult - */ - @Log(title = "角色新增") - @PostMapping("/add") - public AjaxResult add(@Validated(value = SystemAuthRoleParam.create.class) @RequestBody SystemAuthRoleParam systemAuthRoleParam) { - iSystemAuthRoleService.add(systemAuthRoleParam); - return AjaxResult.success(); - } - - /** - * 编辑角色 - * - * @author fzr - * @param systemAuthRoleParam 角色参数 - * @return AjaxResult - */ - @Log(title = "角色编辑") - @PostMapping("/edit") - public AjaxResult edit(@Validated(value = SystemAuthRoleParam.create.class) @RequestBody SystemAuthRoleParam systemAuthRoleParam) { - iSystemAuthRoleService.edit(systemAuthRoleParam); - return AjaxResult.success(); - } - - /** - * 删除角色 - * - * @author fzr - * @param systemAuthRoleParam 角色参数 - * @return AjaxResult - */ - @Log(title = "角色删除") - @PostMapping("/del") - public AjaxResult del(@Validated(value = SystemAuthRoleParam.delete.class) @RequestBody SystemAuthRoleParam systemAuthRoleParam) { - iSystemAuthRoleService.del(systemAuthRoleParam.getId()); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/LoginController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/LoginController.java deleted file mode 100644 index a8ccad6d..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/LoginController.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.mdd.admin.controller.system; - -import com.mdd.admin.service.system.ISystemLoginService; -import com.mdd.admin.validate.system.SystemLoginParam; -import com.mdd.common.core.AjaxResult; -import com.mdd.common.exception.LoginException; -import com.mdd.common.exception.OperateException; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.Map; - -/** - * 系统登录管理 - */ -@RestController("systemLoginController") -@RequestMapping("api/system") -public class LoginController { - - @Resource - ISystemLoginService iSystemLoginService; - - /** - * 登录系统 - * - * @author fzr - * @param systemLoginParam 登录参数 - * @return AjaxResult - */ - @PostMapping("/login") - public AjaxResult login(@Validated() @RequestBody SystemLoginParam systemLoginParam) { - try { - Map map = iSystemLoginService.login(systemLoginParam); - return AjaxResult.success(map); - } catch (LoginException e) { - return AjaxResult.failed(e.getCode(), e.getMsg()); - } catch (OperateException e) { - return AjaxResult.failed(e.getMsg()); - } - } - - /** - * 退出登录 - * - * @author fzr - * @param request 请求接口 - * @return AjaxResult - */ - @PostMapping("/logout") - public AjaxResult logout(HttpServletRequest request) { - try { - iSystemLoginService.logout(request.getHeader("token")); - return AjaxResult.success(); - } catch (Exception e) { - return AjaxResult.failed(e.getMessage()); - } - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/LogsController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/LogsController.java deleted file mode 100644 index 0838f505..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/LogsController.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.mdd.admin.controller.system; - -import com.mdd.admin.service.system.ISystemLogsServer; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.vo.system.LogLoginVo; -import com.mdd.admin.vo.system.LogOperateVo; -import com.mdd.common.core.AjaxResult; -import com.mdd.common.core.PageResult; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.Map; - -/** - * 系统日志管理 - */ -@RestController("systemLogController") -@RequestMapping("api/system/log") -public class LogsController { - - @Resource - ISystemLogsServer iSystemLogsServer; - - /** - * 系统操作日志 - * - * @author fzr - * @param params 搜索参数 - * @return AjaxResult - */ - @GetMapping("/operate") - public AjaxResult operate(@Validated PageParam pageParam, @RequestParam Map params) { - PageResult list = iSystemLogsServer.operate(pageParam, params); - return AjaxResult.success(list); - } - - /** - * 系统登录日志 - * - * @author fzr - * @param params 搜索参数 - * @return AjaxResult - */ - @GetMapping("/login") - public AjaxResult login(@Validated PageParam pageParam, @RequestParam Map params) { - PageResult list = iSystemLogsServer.login(pageParam, params); - return AjaxResult.success(list); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthAdminController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthAdminController.java new file mode 100644 index 00000000..9236d897 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthAdminController.java @@ -0,0 +1,142 @@ +package com.mdd.admin.controller.system; + +import com.mdd.admin.LikeAdminThreadLocal; +import com.mdd.admin.config.aop.Log; +import com.mdd.admin.service.ISystemAuthAdminService; +import com.mdd.admin.validate.commons.IdValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.system.SystemAdminCreateValidate; +import com.mdd.admin.validate.system.SystemAdminSearchValidate; +import com.mdd.admin.validate.system.SystemAdminUpInfoValidate; +import com.mdd.admin.validate.system.SystemAdminUpdateValidate; +import com.mdd.admin.vo.system.SystemAuthAdminDetailVo; +import com.mdd.admin.vo.system.SystemAuthAdminListedVo; +import com.mdd.admin.vo.system.SystemAuthAdminSelvesVo; +import com.mdd.common.core.AjaxResult; +import com.mdd.common.core.PageResult; +import com.mdd.common.validator.annotation.IDMust; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 系统管理员管理 + */ +@RestController +@RequestMapping("api/system/admin") +public class SystemAuthAdminController { + + @Resource + ISystemAuthAdminService iSystemAuthAdminService; + + /** + * 管理员列表 + * + * @author fzr + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return AjaxResult> + */ + @GetMapping("/list") + public AjaxResult> list(@Validated PageValidate pageValidate, + @Validated SystemAdminSearchValidate searchValidate) { + PageResult list = iSystemAuthAdminService.list(pageValidate, searchValidate); + return AjaxResult.success(list); + } + + /** + * 管理员信息 + * + * @author fzr + * @return AjaxResult + */ + @GetMapping("/self") + public AjaxResult self() { + Integer adminId = LikeAdminThreadLocal.getAdminId(); + SystemAuthAdminSelvesVo vo = iSystemAuthAdminService.self(adminId); + return AjaxResult.success(vo); + } + + /** + * 管理员详情 + * + * @author fzr + * @param id 主键 + * @return AjaxResult + */ + @GetMapping("/detail") + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + SystemAuthAdminDetailVo vo = iSystemAuthAdminService.detail(id); + return AjaxResult.success(vo); + } + + /** + * 管理员新增 + * + * @author fzr + * @param createValidate 参数 + * @return AjaxResult + */ + @Log(title = "管理员新增") + @PostMapping("/add") + public AjaxResult add(@Validated @RequestBody SystemAdminCreateValidate createValidate) { + iSystemAuthAdminService.add(createValidate); + return AjaxResult.success(); + } + + /** + * 管理员编辑 + * + * @author fzr + * @param updateValidate 参数 + * @return AjaxResult + */ + @Log(title = "管理员编辑") + @PostMapping("/edit") + public AjaxResult edit(@Validated @RequestBody SystemAdminUpdateValidate updateValidate) { + iSystemAuthAdminService.edit(updateValidate); + return AjaxResult.success(); + } + + /** + * 当前管理员更新 + * + * @author fzr + * @return AjaxResult + */ + @Log(title = "管理员更新") + @PostMapping("/upInfo") + public AjaxResult upInfo(@Validated @RequestBody SystemAdminUpInfoValidate upInfoValidate) { + Integer adminId = LikeAdminThreadLocal.getAdminId(); + iSystemAuthAdminService.upInfo(upInfoValidate, adminId); + return AjaxResult.success(); + } + + /** + * 管理员删除 + * + * @author fzr + * @return AjaxResult + */ + @Log(title = "管理员删除") + @PostMapping("/del") + public AjaxResult del(@Validated @RequestBody IdValidate idValidate) { + iSystemAuthAdminService.del(idValidate.getId()); + return AjaxResult.success(); + } + + /** + * 管理员状态切换 + * + * @author fzr + * @return AjaxResult + */ + @Log(title = "管理员状态") + @PostMapping("/disable") + public AjaxResult disable(@Validated @RequestBody IdValidate idValidate) { + iSystemAuthAdminService.disable(idValidate.getId()); + return AjaxResult.success(); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthDeptController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthDeptController.java new file mode 100644 index 00000000..89365824 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthDeptController.java @@ -0,0 +1,105 @@ +package com.mdd.admin.controller.system; + +import com.alibaba.fastjson2.JSONArray; +import com.mdd.admin.service.ISystemAuthDeptService; +import com.mdd.admin.validate.commons.IdValidate; +import com.mdd.admin.validate.system.SystemDeptCreateValidate; +import com.mdd.admin.validate.system.SystemDeptSearchValidate; +import com.mdd.admin.validate.system.SystemDeptUpdateValidate; +import com.mdd.admin.vo.system.SystemAuthDeptVo; +import com.mdd.common.core.AjaxResult; +import com.mdd.common.validator.annotation.IDMust; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 系统部门管理 + */ +@RestController +@RequestMapping("api/system/dept") +public class SystemAuthDeptController { + + @Resource + ISystemAuthDeptService iSystemAuthDeptService; + + /** + * 部门所有 + * + * @author fzr + * @return AjaxResult> + */ + @GetMapping("/all") + public AjaxResult> all() { + List list = iSystemAuthDeptService.all(); + return AjaxResult.success(list); + } + + /** + * 部门列表 + * + * @author fzr + * @param searchValidate 搜索参数 + * @return AjaxResult + */ + @GetMapping("/list") + public AjaxResult list(@Validated SystemDeptSearchValidate searchValidate) { + JSONArray list = iSystemAuthDeptService.list(searchValidate); + return AjaxResult.success(list); + } + + /** + * 部门详情 + * + * @author fzr + * @param id 主键 + * @return AjaxResult + */ + @GetMapping("/detail") + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + SystemAuthDeptVo vo = iSystemAuthDeptService.detail(id); + return AjaxResult.success(vo); + } + + /** + * 部门新增 + * + * @author fzr + * @param createValidate 参数 + * @return AjaxResult + */ + @PostMapping("/add") + public AjaxResult add(@Validated @RequestBody SystemDeptCreateValidate createValidate) { + iSystemAuthDeptService.add(createValidate); + return AjaxResult.success(); + } + + /** + * 部门编辑 + * + * @author fzr + * @param updateValidate 参数 + * @return AjaxResult + */ + @PostMapping("/edit") + public AjaxResult edit(@Validated @RequestBody SystemDeptUpdateValidate updateValidate) { + iSystemAuthDeptService.edit(updateValidate); + return AjaxResult.success(); + } + + /** + * 部门删除 + * + * @author fzr + * @param idValidate 参数 + * @return AjaxResult + */ + @PostMapping("/del") + public AjaxResult del(@Validated @RequestBody IdValidate idValidate) { + iSystemAuthDeptService.del(idValidate.getId()); + return AjaxResult.success(); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthMenuController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthMenuController.java similarity index 57% rename from server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthMenuController.java rename to server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthMenuController.java index 7fabfaf8..296f6e28 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthMenuController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthMenuController.java @@ -1,10 +1,12 @@ package com.mdd.admin.controller.system; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.mdd.admin.LikeAdminThreadLocal; import com.mdd.admin.config.aop.Log; -import com.mdd.admin.service.system.ISystemAuthMenuService; -import com.mdd.admin.validate.system.SystemAuthMenuParam; +import com.mdd.admin.service.ISystemAuthMenuService; +import com.mdd.admin.validate.commons.IdValidate; +import com.mdd.admin.validate.system.SystemMenuCreateValidate; +import com.mdd.admin.validate.system.SystemMenuUpdateValidate; import com.mdd.admin.vo.system.SystemAuthMenuVo; import com.mdd.common.core.AjaxResult; import com.mdd.common.validator.annotation.IDMust; @@ -18,7 +20,7 @@ import javax.annotation.Resource; */ @RestController @RequestMapping("api/system/menu") -public class AuthMenuController { +public class SystemAuthMenuController { @Resource ISystemAuthMenuService iSystemAuthMenuService; @@ -27,10 +29,10 @@ public class AuthMenuController { * 获取菜单路由 * * @author fzr - * @return AjaxResult + * @return AjaxResult */ @GetMapping("/route") - public Object route() { + public AjaxResult route() { Integer roleId = LikeAdminThreadLocal.getRoleId(); JSONArray lists = iSystemAuthMenuService.selectMenuByRoleId(roleId); return AjaxResult.success(lists); @@ -40,10 +42,10 @@ public class AuthMenuController { * 获取菜单列表 * * @author fzr - * @return AjaxResult + * @return AjaxResult */ @GetMapping("/list") - public Object list() { + public AjaxResult list() { JSONArray lists = iSystemAuthMenuService.list(); return AjaxResult.success(lists); } @@ -52,10 +54,11 @@ public class AuthMenuController { * 获取菜单详情 * * @author fzr - * @return AjaxResult + * @param id 主键 + * @return AjaxResult */ @GetMapping("/detail") - public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { SystemAuthMenuVo vo = iSystemAuthMenuService.detail(id); return AjaxResult.success(vo); } @@ -64,12 +67,13 @@ public class AuthMenuController { * 新增菜单 * * @author fzr - * @return AjaxResult + * @param createValidate 参数 + * @return AjaxResult */ @Log(title = "菜单新增") @PostMapping("/add") - public Object add(@Validated(value = SystemAuthMenuParam.create.class) @RequestBody SystemAuthMenuParam systemAuthMenuParam) { - iSystemAuthMenuService.add(systemAuthMenuParam); + public AjaxResult add(@Validated @RequestBody SystemMenuCreateValidate createValidate) { + iSystemAuthMenuService.add(createValidate); return AjaxResult.success(); } @@ -77,12 +81,13 @@ public class AuthMenuController { * 更新菜单 * * @author fzr - * @return AjaxResult + * @param updateValidate 参数 + * @return AjaxResult */ @Log(title = "菜单编辑") @PostMapping("/edit") - public AjaxResult edit(@Validated(value = SystemAuthMenuParam.update.class) @RequestBody SystemAuthMenuParam systemAuthMenuParam) { - iSystemAuthMenuService.edit(systemAuthMenuParam); + public AjaxResult edit(@Validated @RequestBody SystemMenuUpdateValidate updateValidate) { + iSystemAuthMenuService.edit(updateValidate); return AjaxResult.success(); } @@ -90,12 +95,13 @@ public class AuthMenuController { * 删除菜单 * * @author fzr - * @return AjaxResult + * @param idValidate 参数 + * @return AjaxResult */ @Log(title = "菜单删除") @PostMapping("/del") - public AjaxResult del(@Validated(value = SystemAuthMenuParam.delete.class) @RequestBody SystemAuthMenuParam systemAuthMenuParam) { - iSystemAuthMenuService.del(systemAuthMenuParam.getId()); + public AjaxResult del(@Validated @RequestBody IdValidate idValidate) { + iSystemAuthMenuService.del(idValidate.getId()); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthPostController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthPostController.java new file mode 100644 index 00000000..a50c57dd --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthPostController.java @@ -0,0 +1,106 @@ +package com.mdd.admin.controller.system; + +import com.mdd.admin.service.ISystemAuthPostService; +import com.mdd.admin.validate.commons.IdValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.system.SystemPostCreateValidate; +import com.mdd.admin.validate.system.SystemPostSearchValidate; +import com.mdd.admin.validate.system.SystemPostUpdateValidate; +import com.mdd.admin.vo.system.SystemAuthPostVo; +import com.mdd.common.core.AjaxResult; +import com.mdd.common.core.PageResult; +import com.mdd.common.validator.annotation.IDMust; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 系统岗位管理 + */ +@RestController +@RequestMapping("api/system/post") +public class SystemAuthPostController { + + @Resource + ISystemAuthPostService iSystemAuthPostService; + + /** + * 岗位所有 + * + * @author fzr + * @return AjaxResult> + */ + @GetMapping("/all") + public AjaxResult> all() { + List list = iSystemAuthPostService.all(); + return AjaxResult.success(list); + } + + /** + * 岗位列表 + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + @GetMapping("/list") + public AjaxResult> list(@Validated PageValidate pageValidate, + @Validated SystemPostSearchValidate searchValidate) { + PageResult list = iSystemAuthPostService.list(pageValidate, searchValidate); + return AjaxResult.success(list); + } + + /** + * 岗位详情 + * + * @author fzr + * @param id 主键 + * @return AjaxResult + */ + @GetMapping("/detail") + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + SystemAuthPostVo vo = iSystemAuthPostService.detail(id); + return AjaxResult.success(vo); + } + + /** + * 岗位新增 + * + * @author fzr + * @param createValidate 参数 + * @return AjaxResult + */ + @PostMapping("/add") + public AjaxResult add(@Validated @RequestBody SystemPostCreateValidate createValidate) { + iSystemAuthPostService.add(createValidate); + return AjaxResult.success(); + } + + /** + * 岗位编辑 + * + * @author fzr + * @param updateValidate 参数 + * @return AjaxResult + */ + @PostMapping("/edit") + public AjaxResult edit(@Validated @RequestBody SystemPostUpdateValidate updateValidate) { + iSystemAuthPostService.edit(updateValidate); + return AjaxResult.success(); + } + + /** + * 岗位删除 + * + * @author fzr + * @param idValidate 参数 + * @return AjaxResult + */ + @PostMapping("/del") + public AjaxResult del(@Validated @RequestBody IdValidate idValidate) { + iSystemAuthPostService.del(idValidate.getId()); + return AjaxResult.success(); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthRoleController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthRoleController.java new file mode 100644 index 00000000..d08a3424 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthRoleController.java @@ -0,0 +1,112 @@ +package com.mdd.admin.controller.system; + +import com.mdd.admin.config.aop.Log; +import com.mdd.admin.service.ISystemAuthRoleService; +import com.mdd.admin.validate.commons.IdValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.system.SystemRoleCreateValidate; +import com.mdd.admin.validate.system.SystemRoleUpdateValidate; +import com.mdd.admin.vo.system.SystemAuthRoleVo; +import com.mdd.common.core.AjaxResult; +import com.mdd.common.core.PageResult; +import com.mdd.common.validator.annotation.IDMust; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +/** + * 系统角色管理 + */ +@RestController +@RequestMapping("api/system/role") +public class SystemAuthRoleController { + + @Resource + ISystemAuthRoleService iSystemAuthRoleService; + + /** + * 角色所有 + * + * @author fzr + * @return AjaxResult> + */ + @GetMapping("/all") + public AjaxResult> all() { + List list = iSystemAuthRoleService.all(); + return AjaxResult.success(list); + } + + /** + * 角色列表 + * + * @author fzr + * @param pageValidate 分页参数 + * @return PageResult + */ + @Log(title = "角色列表") + @GetMapping("/list") + public AjaxResult> list(@Validated PageValidate pageValidate) { + PageResult list = iSystemAuthRoleService.list(pageValidate); + return AjaxResult.success(list); + } + + /** + * 角色详情 + * + * @author fzr + * @param id 主键 + * @return AjaxResult + */ + @Log(title = "角色详情") + @GetMapping("/detail") + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { + SystemAuthRoleVo vo = iSystemAuthRoleService.detail(id); + return AjaxResult.success(vo); + } + + /** + * 新增角色 + * + * @author fzr + * @param createValidate 参数 + * @return AjaxResult + */ + @Log(title = "角色新增") + @PostMapping("/add") + public AjaxResult add(@Validated @RequestBody SystemRoleCreateValidate createValidate) { + iSystemAuthRoleService.add(createValidate); + return AjaxResult.success(); + } + + /** + * 编辑角色 + * + * @author fzr + * @param updateValidate 参数 + * @return AjaxResult + */ + @Log(title = "角色编辑") + @PostMapping("/edit") + public AjaxResult edit(@Validated @RequestBody SystemRoleUpdateValidate updateValidate) { + iSystemAuthRoleService.edit(updateValidate); + return AjaxResult.success(); + } + + /** + * 删除角色 + * + * @author fzr + * @param idValidate 参数 + * @return AjaxResult + */ + @Log(title = "角色删除") + @PostMapping("/del") + public AjaxResult del(@Validated @RequestBody IdValidate idValidate) { + iSystemAuthRoleService.del(idValidate.getId()); + return AjaxResult.success(); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemLoginController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemLoginController.java new file mode 100644 index 00000000..8f967646 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemLoginController.java @@ -0,0 +1,52 @@ +package com.mdd.admin.controller.system; + +import com.mdd.admin.service.ISystemLoginService; +import com.mdd.admin.validate.system.SystemAdminLoginsValidate; +import com.mdd.common.core.AjaxResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + +/** + * 系统登录管理 + */ +@RestController +@RequestMapping("api/system") +public class SystemLoginController { + + @Resource + ISystemLoginService iSystemLoginService; + + /** + * 登录系统 + * + * @author fzr + * @param loginsValidate 登录参数 + * @return AjaxResult> + */ + @PostMapping("/login") + public AjaxResult> login(@Validated() @RequestBody SystemAdminLoginsValidate loginsValidate) { + Map map = iSystemLoginService.login(loginsValidate); + return AjaxResult.success(map); + } + + /** + * 退出登录 + * + * @author fzr + * @param request 请求接口 + * @return AjaxResult + */ + @PostMapping("/logout") + public AjaxResult logout(HttpServletRequest request) { + iSystemLoginService.logout(request.getHeader("token")); + return AjaxResult.success(); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemLogsController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemLogsController.java new file mode 100644 index 00000000..fb18d80a --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemLogsController.java @@ -0,0 +1,56 @@ +package com.mdd.admin.controller.system; + +import com.mdd.admin.service.ISystemLogsServer; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.system.SystemSearchLoginsValidate; +import com.mdd.admin.validate.system.SystemSearchOperateValidate; +import com.mdd.admin.vo.system.SystemLogLoginVo; +import com.mdd.admin.vo.system.SystemLogOperateVo; +import com.mdd.common.core.AjaxResult; +import com.mdd.common.core.PageResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 系统日志管理 + */ +@RestController +@RequestMapping("api/system/log") +public class SystemLogsController { + + @Resource + ISystemLogsServer iSystemLogsServer; + + /** + * 系统操作日志 + * + * @author fzr + * @param searchValidate 搜索参数 + * @return AjaxResult> + */ + @GetMapping("/operate") + public AjaxResult> operate(@Validated PageValidate pageValidate, + @Validated SystemSearchOperateValidate searchValidate) { + PageResult list = iSystemLogsServer.operate(pageValidate, searchValidate); + return AjaxResult.success(list); + } + + /** + * 系统登录日志 + * + * @author fzr + * @param searchValidate 搜索参数 + * @return AjaxResult> + */ + @GetMapping("/login") + public AjaxResult> login(@Validated PageValidate pageValidate, + @Validated SystemSearchLoginsValidate searchValidate) { + PageResult list = iSystemLogsServer.login(pageValidate, searchValidate); + return AjaxResult.success(list); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/user/UserController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/user/UserController.java deleted file mode 100644 index e3d97a7b..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/user/UserController.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.mdd.admin.controller.user; - -import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.mdd.admin.service.user.IUserService; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.vo.user.UserVo; -import com.mdd.common.core.AjaxResult; -import com.mdd.common.core.PageResult; -import com.mdd.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/user") -public class UserController { - - @Resource - IUserService iUserService; - - /** - * 用户列表 - * - * @author fzr - * @param pageParam 分页参数 - * @param params 搜索参数 - * @return AjaxResult - */ - @GetMapping("/list") - public AjaxResult list(@Validated PageParam pageParam, - @RequestParam Map params) { - PageResult list = iUserService.list(pageParam, params); - return AjaxResult.success(list); - } - - /** - * 用户详情 - * - * @author fzr - * @param id 主键 - * @return AjaxResult - */ - @GetMapping("/detail") - public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { - UserVo vo = iUserService.detail(id); - return AjaxResult.success(vo); - } - - /** - * 用户编辑 - * - * @author fzr - * @param params 参数 - * @return AjaxResult - */ - @PostMapping("/edit") - public AjaxResult edit(@RequestBody Map params) { - Assert.notNull(params.get("id"), "id参数缺失"); - Assert.notNull(params.get("field"), "field参数缺失"); - Assert.notNull(params.get("value"), "value参数缺失"); - iUserService.edit(params); - return AjaxResult.success(); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/common/IAlbumService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IAlbumsService.java similarity index 65% rename from server/like-admin/src/main/java/com/mdd/admin/service/common/IAlbumService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/IAlbumsService.java index 5343643b..f07b8ccb 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/common/IAlbumService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IAlbumsService.java @@ -1,8 +1,9 @@ -package com.mdd.admin.service.common; +package com.mdd.admin.service; -import com.alibaba.fastjson.JSONArray; -import com.mdd.admin.validate.common.AlbumParam; -import com.mdd.admin.validate.common.PageParam; +import com.alibaba.fastjson2.JSONArray; +import com.mdd.admin.validate.AlbumCateValidate; +import com.mdd.admin.validate.AlbumSearchValidate; +import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.album.AlbumVo; import com.mdd.common.core.PageResult; @@ -12,17 +13,17 @@ import java.util.Map; /** * 相册服务接口类 */ -public interface IAlbumService { +public interface IAlbumsService { /** * 文件列表 * * @author fzr - * @param pageParam 分页参数 - * @param params 其他搜索参数 + * @param pageValidate 分页参数 + * @param searchValidate 其他搜索参数 * @return PageResult */ - PageResult albumList(PageParam pageParam, Map params); + PageResult albumList(PageValidate pageValidate, AlbumSearchValidate searchValidate); /** * 文件重命名 @@ -61,15 +62,18 @@ public interface IAlbumService { * 分类列表 * * @author fzr - * @param params 搜索参数 + * @param searchValidate 搜索参数 * @return JSONArray */ - JSONArray cateList(Map params); + JSONArray cateList(AlbumSearchValidate searchValidate); /** * 分类新增 + * + * @author fzr + * @param cateValidate 分类参数 */ - void cateAdd(AlbumParam albumParam); + void cateAdd(AlbumCateValidate cateValidate); /** * 分类编辑 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/article/IArticleCategoryService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IArtCateService.java similarity index 57% rename from server/like-admin/src/main/java/com/mdd/admin/service/article/IArticleCategoryService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/IArtCateService.java index a29fda77..6894db48 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/article/IArticleCategoryService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IArtCateService.java @@ -1,17 +1,18 @@ -package com.mdd.admin.service.article; +package com.mdd.admin.service; -import com.mdd.admin.validate.article.CategoryParam; -import com.mdd.admin.validate.common.PageParam; +import com.mdd.admin.validate.ArtCateCreateValidate; +import com.mdd.admin.validate.ArtCateUpdateValidate; +import com.mdd.admin.validate.ArtCateSearchValidate; +import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.article.ArticleCateVo; import com.mdd.common.core.PageResult; import java.util.List; -import java.util.Map; /** * 文章分类服接口务类 */ -public interface IArticleCategoryService { +public interface IArtCateService { /** * 分类所有 @@ -25,11 +26,11 @@ public interface IArticleCategoryService { * 分类列表 * * @author fzr - * @param pageParam 分页参数 - * @param params 搜索参数 + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 * @return PageResult */ - PageResult list(PageParam pageParam, Map params); + PageResult list(PageValidate pageValidate, ArtCateSearchValidate searchValidate); /** * 分类详情 @@ -43,17 +44,17 @@ public interface IArticleCategoryService { * 分类新增 * * @author fzr - * @param categoryParam 分类参数 + * @param createValidate 参数 */ - void add(CategoryParam categoryParam); + void add(ArtCateCreateValidate createValidate); /** * 分类编辑 * * @author fzr - * @param categoryParam 分类参数 + * @param updateValidate 参数 */ - void edit(CategoryParam categoryParam); + void edit(ArtCateUpdateValidate updateValidate); /** * 分类删除 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/article/IArticleArchivesService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IArticleService.java similarity index 51% rename from server/like-admin/src/main/java/com/mdd/admin/service/article/IArticleArchivesService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/IArticleService.java index 4d0f255c..6c31ec94 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/article/IArticleArchivesService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IArticleService.java @@ -1,27 +1,27 @@ -package com.mdd.admin.service.article; +package com.mdd.admin.service; -import com.mdd.admin.validate.article.ArticleParam; -import com.mdd.admin.validate.common.PageParam; +import com.mdd.admin.validate.ArticleCreateValidate; +import com.mdd.admin.validate.ArticleSearchValidate; +import com.mdd.admin.validate.ArticleUpdateValidate; +import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.article.ArticleDetailVo; -import com.mdd.admin.vo.article.ArticleListVo; +import com.mdd.admin.vo.article.ArticleListedVo; import com.mdd.common.core.PageResult; -import java.util.Map; - /** * 文章服务接口类 */ -public interface IArticleArchivesService { +public interface IArticleService { /** * 文章列表 * * @author fzr - * @param pageParam 分页参数 - * @param params 搜索参数 + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 * @return PageResult */ - PageResult list(PageParam pageParam, Map params); + PageResult list(PageValidate pageValidate, ArticleSearchValidate searchValidate); /** * 文章详情 @@ -35,17 +35,17 @@ public interface IArticleArchivesService { * 文章新增 * * @author fzr - * @param articleParam 文章参数 + * @param createValidate 参数 */ - void add(ArticleParam articleParam); + void add(ArticleCreateValidate createValidate); /** * 文章编辑 * * @author fzr - * @param articleParam 文章参数 + * @param updateValidate 参数 */ - void edit(ArticleParam articleParam); + void edit(ArticleUpdateValidate updateValidate); /** * 文章删除 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelH5Service.java b/server/like-admin/src/main/java/com/mdd/admin/service/IChannelH5ConfigService.java similarity index 53% rename from server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelH5Service.java rename to server/like-admin/src/main/java/com/mdd/admin/service/IChannelH5ConfigService.java index 2a493025..04f1b86a 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelH5Service.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IChannelH5ConfigService.java @@ -1,14 +1,12 @@ -package com.mdd.admin.service.channel; +package com.mdd.admin.service; -import com.mdd.admin.validate.channel.ChannelH5Param; +import com.mdd.admin.validate.channel.ChannelH5Validate; import com.mdd.admin.vo.channel.ChannelH5Vo; -import java.util.Map; - /** * H5渠道设置服务接口类 */ -public interface IChannelH5Service { +public interface IChannelH5ConfigService { /** * H5设置详情 @@ -22,8 +20,8 @@ public interface IChannelH5Service { * H5设置保存 * * @author fzr - * @param channelH5Param 参数 + * @param channelH5Validate 参数 */ - void save(ChannelH5Param channelH5Param); + void save(ChannelH5Validate channelH5Validate); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelMpService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IChannelMpConfigService.java similarity index 57% rename from server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelMpService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/IChannelMpConfigService.java index c865c3c8..433e6353 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelMpService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IChannelMpConfigService.java @@ -1,14 +1,12 @@ -package com.mdd.admin.service.channel; +package com.mdd.admin.service; -import com.mdd.admin.validate.channel.ChannelMpParam; +import com.mdd.admin.validate.channel.ChannelMpValidate; import com.mdd.admin.vo.channel.ChannelMpVo; -import java.util.Map; - /** * 微信小程序渠道服务接口类 */ -public interface IChannelMpService { +public interface IChannelMpConfigService { /** * 微信小程序设置详情 @@ -22,8 +20,8 @@ public interface IChannelMpService { * 微信小程序设置保存 * * @author fzr - * @param channelMpParam + * @param channelMpValidate */ - void save(ChannelMpParam channelMpParam); + void save(ChannelMpValidate channelMpValidate); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaConfigService.java similarity index 57% rename from server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaConfigService.java index d5059bbe..f354639f 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaConfigService.java @@ -1,13 +1,13 @@ -package com.mdd.admin.service.channel; +package com.mdd.admin.service; -import com.mdd.admin.validate.channel.ChannelOaParam; +import com.mdd.admin.validate.channel.ChannelOaValidate; import com.mdd.admin.vo.channel.ChannelOaVo; /** * 公众号渠道设置服务接口类 */ -public interface IChannelOaService { +public interface IChannelOaConfigService { /** * 公众号设置详情 @@ -21,8 +21,8 @@ public interface IChannelOaService { * 公众号设置保存 * * @author fzr - * @param channelOaParam 参数 + * @param channelOaValidate 参数 */ - void save(ChannelOaParam channelOaParam); + void save(ChannelOaValidate channelOaValidate); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaMenuService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaMenusService.java similarity index 72% rename from server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaMenuService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaMenusService.java index 782ceadb..e9c3647a 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaMenuService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaMenusService.java @@ -1,14 +1,14 @@ -package com.mdd.admin.service.channel; +package com.mdd.admin.service; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import java.util.List; -import java.util.Map; + /** * 公众号菜单服务接口类 */ -public interface IChannelOaMenuService { +public interface IChannelOaMenusService { /** * 菜单详情 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaReplyDefaultService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaReplyDefaultService.java similarity index 51% rename from server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaReplyDefaultService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaReplyDefaultService.java index c723e816..26ce4c59 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaReplyDefaultService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaReplyDefaultService.java @@ -1,12 +1,10 @@ -package com.mdd.admin.service.channel; +package com.mdd.admin.service; -import com.mdd.admin.validate.channel.ChannelOaReplyParam; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.vo.channel.ChannelOaReplyVo; +import com.mdd.admin.validate.channel.ChannelRpDefaultValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.vo.channel.ChannelRpDefaultVo; import com.mdd.common.core.PageResult; -import java.util.List; - /** * 公众号默认回复服务接口类 */ @@ -16,35 +14,35 @@ public interface IChannelOaReplyDefaultService { * 默认回复列表 * * @author fzr - * @param pageParam 分页参数 - * @return PageResult + * @param pageValidate 分页参数 + * @return PageResult */ - PageResult list(PageParam pageParam); + PageResult list(PageValidate pageValidate); /** * 默认回复详情 * * @author fzr * @param id 主键 - * @return ChannelOaReplyDefaultVo + * @return ChannelRpDefaultVo */ - ChannelOaReplyVo detail(Integer id); + ChannelRpDefaultVo detail(Integer id); /** * 默认回复新增 * * @author fzr - * @param channelOaReplyParam 参数 + * @param defaultValidate 参数 */ - void add(ChannelOaReplyParam channelOaReplyParam); + void add(ChannelRpDefaultValidate defaultValidate); /** * 默认回复编辑 * * @author fzr - * @param channelOaReplyParam 参数 + * @param defaultValidate 参数 */ - void edit(ChannelOaReplyParam channelOaReplyParam); + void edit(ChannelRpDefaultValidate defaultValidate); /** * 默认回复删除 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaReplyFollowService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaReplyFollowService.java similarity index 51% rename from server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaReplyFollowService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaReplyFollowService.java index 0fa893bb..95101a47 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaReplyFollowService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaReplyFollowService.java @@ -1,12 +1,10 @@ -package com.mdd.admin.service.channel; +package com.mdd.admin.service; -import com.mdd.admin.validate.channel.ChannelOaReplyParam; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.vo.channel.ChannelOaReplyVo; +import com.mdd.admin.validate.channel.ChannelRpFollowsValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.vo.channel.ChannelRpFollowsVo; import com.mdd.common.core.PageResult; -import java.util.List; - /** * 公众号关注回复服务接口类 */ @@ -16,35 +14,35 @@ public interface IChannelOaReplyFollowService { * 关注回复列表 * * @author fzr - * @param pageParam 分页参数 - * @return PageResult + * @param pageValidate 分页参数 + * @return PageResult */ - PageResult list(PageParam pageParam); + PageResult list(PageValidate pageValidate); /** * 关注回复详情 * * @author fzr * @param id 主键 - * @return ChannelOaReplyFollowVo + * @return ChannelRpFollowsVo */ - ChannelOaReplyVo detail(Integer id); + ChannelRpFollowsVo detail(Integer id); /** * 关注回复新增 * * @author fzr - * @param channelOaReplyParam 参数 + * @param followsValidate 参数 */ - void add(ChannelOaReplyParam channelOaReplyParam); + void add(ChannelRpFollowsValidate followsValidate); /** * 关注回复编辑 * * @author fzr - * @param channelOaReplyParam 参数 + * @param followsValidate 参数 */ - void edit(ChannelOaReplyParam channelOaReplyParam); + void edit(ChannelRpFollowsValidate followsValidate); /** * 关注回复删除 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaReplyKeywordService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaReplyKeywordService.java similarity index 52% rename from server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaReplyKeywordService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaReplyKeywordService.java index db531050..d21402c5 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaReplyKeywordService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaReplyKeywordService.java @@ -1,12 +1,10 @@ -package com.mdd.admin.service.channel; +package com.mdd.admin.service; -import com.mdd.admin.validate.channel.ChannelOaReplyParam; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.vo.channel.ChannelOaReplyVo; +import com.mdd.admin.validate.channel.ChannelRpKeywordValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.vo.channel.ChannelRpKeywordVo; import com.mdd.common.core.PageResult; -import java.util.List; - /** * 公众号关键词回复服务接口类 */ @@ -16,36 +14,36 @@ public interface IChannelOaReplyKeywordService { * 关键词回复列表 * * @author fzr - * @param pageParam 分页参数 - * @return PageResult + * @param pageValidate 分页参数 + * @return PageResult */ - PageResult list(PageParam pageParam); + PageResult list(PageValidate pageValidate); /** * 关键词回复详情 * * @author fzr * @param id 主键 - * @return Map + * @return ChannelRpKeywordVo */ - ChannelOaReplyVo detail(Integer id); + ChannelRpKeywordVo detail(Integer id); /** * 关键词回复新增 * * @author fzr - * @param channelOaReplyParam 参数 + * @param keywordValidate 参数 */ - void add(ChannelOaReplyParam channelOaReplyParam); + void add(ChannelRpKeywordValidate keywordValidate); /** * 关键词回复编辑 * * @author fzr - * @param channelOaReplyParam 参数 + * @param keywordValidate 参数 */ - void edit(ChannelOaReplyParam channelOaReplyParam); + void edit(ChannelRpKeywordValidate keywordValidate); /** * 关键词回复删除 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecorateDataService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IDecorateDataService.java similarity index 89% rename from server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecorateDataService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/IDecorateDataService.java index 0b793bba..c24dbe3c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecorateDataService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IDecorateDataService.java @@ -1,4 +1,4 @@ -package com.mdd.admin.service.decorate; +package com.mdd.admin.service; import com.mdd.admin.vo.decorate.DecorateDataArticleVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecoratePageService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IDecoratePageService.java similarity index 60% rename from server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecoratePageService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/IDecoratePageService.java index 2b13e734..1a66af11 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecoratePageService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IDecoratePageService.java @@ -1,10 +1,8 @@ -package com.mdd.admin.service.decorate; +package com.mdd.admin.service; -import com.mdd.admin.validate.decorate.DecoratePageParam; +import com.mdd.admin.validate.DecoratePageValidate; import com.mdd.admin.vo.decorate.DecoratePageVo; -import java.util.Map; - public interface IDecoratePageService { /** @@ -20,7 +18,7 @@ public interface IDecoratePageService { * 页面装修保存 * * @author fzr - * @param decoratePageParam 参数 + * @param decoratePageValidate 参数 */ - void save(DecoratePageParam decoratePageParam); + void save(DecoratePageValidate decoratePageValidate); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecorateTabbarService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IDecorateTabbarService.java similarity index 66% rename from server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecorateTabbarService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/IDecorateTabbarService.java index ab72468d..a8ba91db 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecorateTabbarService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IDecorateTabbarService.java @@ -1,10 +1,8 @@ -package com.mdd.admin.service.decorate; +package com.mdd.admin.service; +import com.mdd.admin.validate.DecorateTabsValidate; import com.mdd.admin.vo.decorate.DecorateTabbarVo; -import java.util.List; -import java.util.Map; - /** * 底部导航服务接口类 */ @@ -22,8 +20,8 @@ public interface IDecorateTabbarService { * 底部导航保存 * * @author fzr - * @param params 参数 + * @param tabsValidate 参数 */ - void save(Map params); + void save(DecorateTabsValidate tabsValidate); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/common/IIndexService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IIndexCommonService.java similarity index 78% rename from server/like-admin/src/main/java/com/mdd/admin/service/common/IIndexService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/IIndexCommonService.java index 6bf33708..37cf1cae 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/common/IIndexService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IIndexCommonService.java @@ -1,11 +1,11 @@ -package com.mdd.admin.service.common; +package com.mdd.admin.service; import java.util.Map; /** * 主页服务接口类 */ -public interface IIndexService { +public interface IIndexCommonService { /** * 控制台数据 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/ISettingCopyrightService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingCopyrightService.java new file mode 100644 index 00000000..a851f238 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingCopyrightService.java @@ -0,0 +1,29 @@ +package com.mdd.admin.service; + +import com.mdd.admin.validate.setting.SettingCopyrightValidate; +import com.mdd.admin.vo.setting.SettingCopyrightVo; + +import java.util.List; + +/** + * 网站备案服务接口类 + */ +public interface ISettingCopyrightService { + + /** + * 获取网站备案信息 + * + * @author fzr + * @return List + */ + List detail(); + + /** + * 保存网站备案信息 + * + * @author fzr + * @param copyrightValidate 参数 + */ + void save(SettingCopyrightValidate copyrightValidate); + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingDictDataService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingDictDataService.java similarity index 64% rename from server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingDictDataService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/ISettingDictDataService.java index 4317db32..0fbf043c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingDictDataService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingDictDataService.java @@ -1,7 +1,8 @@ -package com.mdd.admin.service.setting; +package com.mdd.admin.service; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.validate.setting.DictDataParam; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.setting.DictDataCreateValidate; +import com.mdd.admin.validate.setting.DictDataUpdateValidate; import com.mdd.admin.vo.setting.SettingDictDataVo; import com.mdd.common.core.PageResult; @@ -25,11 +26,11 @@ public interface ISettingDictDataService { * 字典数据列表 * * @author fzr - * @param pageParam 分页参数 + * @param pageValidate 分页参数 * @param params 搜索参数 * @return PageResult */ - PageResult list(PageParam pageParam, Map params); + PageResult list(PageValidate pageValidate, Map params); /** * 字典数据详情 @@ -44,17 +45,17 @@ public interface ISettingDictDataService { * 字典数据新增 * * @author fzr - * @param dictDataParam 参数 + * @param createValidate 参数 */ - void add(DictDataParam dictDataParam); + void add(DictDataCreateValidate createValidate); /** * 字典数据编辑 * * @author fzr - * @param dictDataParam 参数 + * @param updateValidate 参数 */ - void edit(DictDataParam dictDataParam); + void edit(DictDataUpdateValidate updateValidate); /** * 字典数据删除 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingDictTypeService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingDictTypeService.java similarity index 63% rename from server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingDictTypeService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/ISettingDictTypeService.java index b8b0effc..5bdc3cbb 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingDictTypeService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingDictTypeService.java @@ -1,7 +1,8 @@ -package com.mdd.admin.service.setting; +package com.mdd.admin.service; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.validate.setting.DictTypeParam; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.setting.DictTypeCreateValidate; +import com.mdd.admin.validate.setting.DictTypeUpdateValidate; import com.mdd.admin.vo.setting.SettingDictTypeVo; import com.mdd.common.core.PageResult; @@ -25,11 +26,11 @@ public interface ISettingDictTypeService { * 字典类型列表 * * @author fzr - * @param pageParam 分页参数 + * @param pageValidate 分页参数 * @param params 搜索参数 * @return PageResult */ - PageResult list(PageParam pageParam, Map params); + PageResult list(PageValidate pageValidate, Map params); /** * 字典类型详情 @@ -44,17 +45,17 @@ public interface ISettingDictTypeService { * 字典类型新增 * * @author fzr - * @param dictTypeParam 参数 + * @param createValidate 参数 */ - void add(DictTypeParam dictTypeParam); + void add(DictTypeCreateValidate createValidate); /** * 字典类型编辑 * * @author fzr - * @param dictTypeParam 参数 + * @param updateValidate 参数 */ - void edit(DictTypeParam dictTypeParam); + void edit(DictTypeUpdateValidate updateValidate); /** * 字典类型删除 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/ISettingLoginService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingLoginService.java new file mode 100644 index 00000000..9a8947a1 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingLoginService.java @@ -0,0 +1,29 @@ +package com.mdd.admin.service; + +import com.mdd.admin.validate.setting.SettingLoginValidate; +import com.mdd.admin.vo.setting.SettingLoginVo; + +import java.util.Map; + +/** + * 登录设置服务接口类 + */ +public interface ISettingLoginService { + + /** + * 登录设置详情 + * + * @author fzr + * @return SettingLoginVo + */ + SettingLoginVo detail(); + + /** + * 登录设置保存 + * + * @author fzr + * @param loginValidate 参数 + */ + void save(SettingLoginValidate loginValidate); + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingNoticeService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingNoticeService.java similarity index 81% rename from server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingNoticeService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/ISettingNoticeService.java index 4447fb6e..8956e2c3 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingNoticeService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingNoticeService.java @@ -1,7 +1,7 @@ -package com.mdd.admin.service.setting; +package com.mdd.admin.service; import com.mdd.admin.vo.setting.SettingNoticeDetailVo; -import com.mdd.admin.vo.setting.SettingNoticeListVo; +import com.mdd.admin.vo.setting.SettingNoticeListedVo; import java.util.List; import java.util.Map; @@ -18,7 +18,7 @@ public interface ISettingNoticeService { * @param recipient 1=用户, 2=平台 * @return List */ - List list(Integer recipient); + List list(Integer recipient); /** * 通知设置详情 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/ISettingProtocolService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingProtocolService.java new file mode 100644 index 00000000..4f22a000 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingProtocolService.java @@ -0,0 +1,29 @@ +package com.mdd.admin.service; + +import com.mdd.admin.validate.setting.SettingProtocolValidate; +import com.mdd.admin.vo.setting.SettingProtocolDetailVo; + +import java.util.Map; + +/** + * 政策协议服务接口类 + */ +public interface ISettingProtocolService { + + /** + * 获取政策协议信息 + * + * @author fzr + * @return SettingProtocolDetailVo + */ + SettingProtocolDetailVo detail(); + + /** + * 保存政策协议信息 + * + * @author fzr + * @param protocolValidate 参数 + */ + void save(SettingProtocolValidate protocolValidate); + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/ISettingSearchService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingSearchService.java new file mode 100644 index 00000000..cd5d17f7 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingSearchService.java @@ -0,0 +1,30 @@ +package com.mdd.admin.service; + +import com.mdd.admin.validate.setting.SettingSearchValidate; +import com.mdd.admin.vo.setting.SettingSearchDetailVo; + +import java.util.Map; + +/** + * 热门搜索服务接口类 + */ +public interface ISettingSearchService { + + /** + * 热门搜索详情 + * + * @author fzr + * @return SettingSearchDetailVo + */ + SettingSearchDetailVo detail(); + + /** + * 热门搜索新增 + * + * @author fzr + * @param searchValidate 参数 + */ + void save(SettingSearchValidate searchValidate); + + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingSmsService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingSmsService.java similarity index 93% rename from server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingSmsService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/ISettingSmsService.java index b017c534..007aa9f0 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingSmsService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingSmsService.java @@ -1,4 +1,4 @@ -package com.mdd.admin.service.setting; +package com.mdd.admin.service; import java.util.List; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingStorageService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingStorageService.java similarity index 95% rename from server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingStorageService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/ISettingStorageService.java index d16ff1fc..a6126a17 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingStorageService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingStorageService.java @@ -1,4 +1,4 @@ -package com.mdd.admin.service.setting; +package com.mdd.admin.service; import java.util.List; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/ISettingUserService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingUserService.java new file mode 100644 index 00000000..7ce96f32 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingUserService.java @@ -0,0 +1,29 @@ +package com.mdd.admin.service; + +import com.mdd.admin.validate.setting.SettingUserValidate; +import com.mdd.admin.vo.setting.SettingUserVo; + +import java.util.Map; + +/** + * 用户设置服务接口类 + */ +public interface ISettingUserService { + + /** + * 用户设置详情 + * + * @author fzr + * @return SettingUserVo + */ + SettingUserVo detail(); + + /** + * 用户设置保存 + * + * @author fzr + * @param userValidate 参数 + */ + void save(SettingUserValidate userValidate); + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/ISettingWebsiteService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingWebsiteService.java new file mode 100644 index 00000000..a301dd42 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISettingWebsiteService.java @@ -0,0 +1,29 @@ +package com.mdd.admin.service; + +import com.mdd.admin.validate.setting.SettingWebsiteValidate; +import com.mdd.admin.vo.setting.SettingWebsiteVo; + +import java.util.Map; + +/** + * 网站信息服务接口类 + */ +public interface ISettingWebsiteService { + + /** + * 获取网站信息 + * + * @author fzr + * @return SettingWebsiteVo + */ + SettingWebsiteVo detail(); + + /** + * 保存网站信息 + * + * @author fzr + * @param websiteValidate 参数 + */ + void save(SettingWebsiteValidate websiteValidate); + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthAdminService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthAdminService.java new file mode 100644 index 00000000..4f1a9958 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthAdminService.java @@ -0,0 +1,100 @@ +package com.mdd.admin.service; + +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.system.SystemAdminCreateValidate; +import com.mdd.admin.validate.system.SystemAdminSearchValidate; +import com.mdd.admin.validate.system.SystemAdminUpInfoValidate; +import com.mdd.admin.validate.system.SystemAdminUpdateValidate; +import com.mdd.admin.vo.system.SystemAuthAdminDetailVo; +import com.mdd.admin.vo.system.SystemAuthAdminListedVo; +import com.mdd.admin.vo.system.SystemAuthAdminSelvesVo; +import com.mdd.common.core.PageResult; +import com.mdd.common.entity.system.SystemAuthAdmin; + +/** + * 系统管理员服务接口类 + */ +public interface ISystemAuthAdminService { + + /** + * 根据账号查找管理员 + * + * @author fzr + * @param username 主键ID + * @return SysAdmin + */ + SystemAuthAdmin findByUsername(String username); + + /** + * 管理员列表 + * + * @author fzr + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + PageResult list(PageValidate pageValidate, SystemAdminSearchValidate searchValidate); + + /** + * 当前管理员 + * + * @author fzr + * @return SystemSelfVo + */ + SystemAuthAdminSelvesVo self(Integer adminId); + + /** + * 管理员详情 + * + * @author fzr + * @param id 主键参数 + * @return SystemAuthAdminDetailVo + */ + SystemAuthAdminDetailVo detail(Integer id); + + /** + * 管理员新增 + * + * @author fzr + * @param createValidate 参数 + */ + void add(SystemAdminCreateValidate createValidate); + + /** + * 管理员编辑 + * + * @author fzr + * @param updateValidate 参数 + */ + void edit(SystemAdminUpdateValidate updateValidate); + + /** + * 当前管理员更新 + * + * @author fzr + * @param upInfoValidate 参数 + */ + void upInfo(SystemAdminUpInfoValidate upInfoValidate, 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/mdd/admin/service/system/ISystemAuthDeptService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthDeptService.java similarity index 58% rename from server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthDeptService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthDeptService.java index 3b3e5863..c804a63a 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthDeptService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthDeptService.java @@ -1,11 +1,12 @@ -package com.mdd.admin.service.system; +package com.mdd.admin.service; -import com.alibaba.fastjson.JSONArray; -import com.mdd.admin.validate.system.SystemAuthDeptParam; +import com.alibaba.fastjson2.JSONArray; +import com.mdd.admin.validate.system.SystemDeptCreateValidate; +import com.mdd.admin.validate.system.SystemDeptSearchValidate; +import com.mdd.admin.validate.system.SystemDeptUpdateValidate; import com.mdd.admin.vo.system.SystemAuthDeptVo; import java.util.List; -import java.util.Map; /** * 系统部门服务接口类 @@ -24,10 +25,10 @@ public interface ISystemAuthDeptService { * 部门列表 * * @author fzr - * @param params 搜索参数 + * @param searchValidate 搜索参数 * @return JSONArray */ - JSONArray list(Map params); + JSONArray list(SystemDeptSearchValidate searchValidate); /** * 部门详情 @@ -42,17 +43,17 @@ public interface ISystemAuthDeptService { * 部门新增 * * @author fzr - * @param systemAuthDeptParam 参数 + * @param createValidate 参数 */ - void add(SystemAuthDeptParam systemAuthDeptParam); + void add(SystemDeptCreateValidate createValidate); /** * 部门编辑 * * @author fzr - * @param systemAuthDeptParam 参数 + * @param updateValidate 参数 */ - void edit(SystemAuthDeptParam systemAuthDeptParam); + void edit(SystemDeptUpdateValidate updateValidate); /** * 部门删除 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthMenuService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthMenuService.java similarity index 67% rename from server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthMenuService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthMenuService.java index 7a28521d..04c48ed9 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthMenuService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthMenuService.java @@ -1,7 +1,8 @@ -package com.mdd.admin.service.system; +package com.mdd.admin.service; -import com.alibaba.fastjson.JSONArray; -import com.mdd.admin.validate.system.SystemAuthMenuParam; +import com.alibaba.fastjson2.JSONArray; +import com.mdd.admin.validate.system.SystemMenuCreateValidate; +import com.mdd.admin.validate.system.SystemMenuUpdateValidate; import com.mdd.admin.vo.system.SystemAuthMenuVo; /** @@ -38,17 +39,17 @@ public interface ISystemAuthMenuService { * 菜单新增 * * @author fzr - * @param systemAuthMenuParam 参数 + * @param createValidate 参数 */ - void add(SystemAuthMenuParam systemAuthMenuParam); + void add(SystemMenuCreateValidate createValidate); /** * 菜单编辑 * * @author fzr - * @param systemAuthMenuParam 参数 + * @param updateValidate 参数 */ - void edit(SystemAuthMenuParam systemAuthMenuParam); + void edit(SystemMenuUpdateValidate updateValidate); /** * 菜单删除 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthPermService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthPermService.java similarity index 96% rename from server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthPermService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthPermService.java index 014ad2a4..37a0ab64 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthPermService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthPermService.java @@ -1,4 +1,4 @@ -package com.mdd.admin.service.system; +package com.mdd.admin.service; import java.util.List; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthPostService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthPostService.java similarity index 56% rename from server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthPostService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthPostService.java index aeaa52e9..735f0bba 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthPostService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthPostService.java @@ -1,7 +1,9 @@ -package com.mdd.admin.service.system; +package com.mdd.admin.service; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.validate.system.SystemAuthPostParam; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.system.SystemPostCreateValidate; +import com.mdd.admin.validate.system.SystemPostSearchValidate; +import com.mdd.admin.validate.system.SystemPostUpdateValidate; import com.mdd.admin.vo.system.SystemAuthPostVo; import com.mdd.common.core.PageResult; @@ -25,11 +27,11 @@ public interface ISystemAuthPostService { * 岗位列表 * * @author fzr - * @param pageParam 分页参数 - * @param params 搜索参数 + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 * @return PageResult */ - PageResult list(PageParam pageParam, Map params); + PageResult list(PageValidate pageValidate, SystemPostSearchValidate searchValidate); /** * 岗位详情 @@ -44,17 +46,17 @@ public interface ISystemAuthPostService { * 岗位新增 * * @author fzr - * @param systemAuthPostParam 参数 + * @param createValidate 参数 */ - void add(SystemAuthPostParam systemAuthPostParam); + void add(SystemPostCreateValidate createValidate); /** * 岗位编辑 * * @author fzr - * @param systemAuthPostParam 参数 + * @param updateValidate 参数 */ - void edit(SystemAuthPostParam systemAuthPostParam); + void edit(SystemPostUpdateValidate updateValidate); /** * 岗位删除 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthRoleService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthRoleService.java similarity index 62% rename from server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthRoleService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthRoleService.java index dcd9fb68..5a10d286 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthRoleService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthRoleService.java @@ -1,7 +1,8 @@ -package com.mdd.admin.service.system; +package com.mdd.admin.service; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.validate.system.SystemAuthRoleParam; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.system.SystemRoleCreateValidate; +import com.mdd.admin.validate.system.SystemRoleUpdateValidate; import com.mdd.admin.vo.system.SystemAuthRoleVo; import com.mdd.common.core.PageResult; import org.springframework.validation.annotation.Validated; @@ -20,16 +21,16 @@ public interface ISystemAuthRoleService { * @author fzr * @return List */ - List> all(); + List all(); /** * 角色列表 * * @author fzr - * @param pageParam 参数 + * @param pageValidate 参数 * @return PageResult */ - PageResult list(@Validated PageParam pageParam); + PageResult list(@Validated PageValidate pageValidate); /** * 角色详情 @@ -44,17 +45,17 @@ public interface ISystemAuthRoleService { * 角色新增 * * @author fzr - * @param systemAuthRoleParam 参数 + * @param createValidate 参数 */ - void add(SystemAuthRoleParam systemAuthRoleParam); + void add(SystemRoleCreateValidate createValidate); /** * 角色更新 * * @author fzr - * @param systemAuthRoleParam 参数 + * @param updateValidate 参数 */ - void edit(SystemAuthRoleParam systemAuthRoleParam); + void edit(SystemRoleUpdateValidate updateValidate); /** * 角色删除 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemLoginService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISystemLoginService.java similarity index 58% rename from server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemLoginService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/ISystemLoginService.java index 4622b8af..978256cd 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemLoginService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISystemLoginService.java @@ -1,6 +1,6 @@ -package com.mdd.admin.service.system; +package com.mdd.admin.service; -import com.mdd.admin.validate.system.SystemLoginParam; +import com.mdd.admin.validate.system.SystemAdminLoginsValidate; import java.util.Map; @@ -13,10 +13,10 @@ public interface ISystemLoginService { * 登录 * * @author fzr - * @param systemLoginParam 登录参数 + * @param loginsValidate 登录参数 * @return token */ - Map login(SystemLoginParam systemLoginParam); + Map login(SystemAdminLoginsValidate loginsValidate); /** * 退出 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/ISystemLogsServer.java b/server/like-admin/src/main/java/com/mdd/admin/service/ISystemLogsServer.java new file mode 100644 index 00000000..eca3bb8b --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ISystemLogsServer.java @@ -0,0 +1,34 @@ +package com.mdd.admin.service; + +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.system.SystemSearchLoginsValidate; +import com.mdd.admin.validate.system.SystemSearchOperateValidate; +import com.mdd.admin.vo.system.SystemLogLoginVo; +import com.mdd.admin.vo.system.SystemLogOperateVo; +import com.mdd.common.core.PageResult; + +/** + * 系统日志服务类接口类 + */ +public interface ISystemLogsServer { + + /** + * 系统操作日志 + * + * @author fzr + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + PageResult operate(PageValidate pageValidate, SystemSearchOperateValidate searchValidate); + + /** + * 系统登录日志 + * + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + PageResult login(PageValidate pageValidate, SystemSearchLoginsValidate searchValidate); + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/IUsersService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IUsersService.java new file mode 100644 index 00000000..d3309868 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IUsersService.java @@ -0,0 +1,43 @@ +package com.mdd.admin.service; + +import com.mdd.admin.validate.UsersSearchValidate; +import com.mdd.admin.validate.UsersUpdateValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.vo.user.UserVo; +import com.mdd.common.core.PageResult; + +import java.util.Map; + +/** + * 用户服务接口类 + */ +public interface IUsersService { + + /** + * 用户列表 + * + * @author fzr + * @param pageValidate (分页参数) + * @param searchValidate (搜索参数) + * @return PageResult + */ + PageResult list(PageValidate pageValidate, UsersSearchValidate searchValidate); + + /** + * 用户详情 + * + * @author fzr + * @param id 主键 + * @return UserVo + */ + UserVo detail(Integer id); + + /** + * 用户编辑 + * + * @author fzr + * @param updateValidate 参数 + */ + void edit(UsersUpdateValidate updateValidate); + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelWxService.java b/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelWxService.java deleted file mode 100644 index 4550b473..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelWxService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.mdd.admin.service.channel; - -import com.mdd.admin.validate.channel.ChannelWxParam; -import com.mdd.admin.vo.channel.ChannelWxVo; - -import java.util.Map; - -/** - * 微信开放平台设置服务接口类 - */ -public interface IChannelWxService { - - /** - * 微信开放平台设置详情 - * - * @author fzr - * @return ChannelWxVo - */ - ChannelWxVo detail(); - - /** - * 微信开放平台设置保存 - * - * @author fzr - * @param channelWxParam 参数 - */ - void save(ChannelWxParam channelWxParam); - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelWxServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelWxServiceImpl.java deleted file mode 100644 index 6d4ab6b7..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelWxServiceImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.mdd.admin.service.channel.impl; - -import com.mdd.admin.service.channel.IChannelWxService; -import com.mdd.admin.validate.channel.ChannelWxParam; -import com.mdd.admin.vo.channel.ChannelWxVo; -import com.mdd.common.utils.ConfigUtil; -import org.springframework.stereotype.Service; - -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * 微信开放平台设置服务实现类 - */ -@Service -public class ChannelWxServiceImpl implements IChannelWxService { - - /** - * 微信开放平台设置详情 - * - * @author fzr - * @return ChannelWxVo - */ - @Override - public ChannelWxVo detail() { - Map config = ConfigUtil.get("wx_channel"); - ChannelWxVo vo = new ChannelWxVo(); - - vo.setAppId(config.getOrDefault("appId", "")); - vo.setAppSecret(config.getOrDefault("appSecret", "")); - return vo; - } - - /** - * 微信开放平台设置保存 - * - * @author fzr - * @param channelWxParam 参数 - */ - @Override - public void save(ChannelWxParam channelWxParam) { - ConfigUtil.set("wx_channel", "appId", channelWxParam.getAppId()); - ConfigUtil.set("wx_channel", "appSecret", channelWxParam.getAppSecret()); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/common/impl/AlbumServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/AlbumsServiceImpl.java similarity index 85% rename from server/like-admin/src/main/java/com/mdd/admin/service/common/impl/AlbumServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/AlbumsServiceImpl.java index b49aa808..3943fe45 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/common/impl/AlbumServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/AlbumsServiceImpl.java @@ -1,13 +1,14 @@ -package com.mdd.admin.service.common.impl; +package com.mdd.admin.service.impl; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.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.mdd.admin.service.common.IAlbumService; -import com.mdd.admin.validate.common.AlbumParam; -import com.mdd.admin.validate.common.PageParam; +import com.mdd.admin.service.IAlbumsService; +import com.mdd.admin.validate.AlbumCateValidate; +import com.mdd.admin.validate.AlbumSearchValidate; +import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.album.AlbumCateVo; import com.mdd.admin.vo.album.AlbumVo; import com.mdd.common.config.GlobalConfig; @@ -30,7 +31,7 @@ import java.util.Map; * 相册服务实现类 */ @Service -public class AlbumServiceImpl implements IAlbumService { +public class AlbumsServiceImpl implements IAlbumsService { @Resource AlbumMapper albumMapper; @@ -42,13 +43,14 @@ public class AlbumServiceImpl implements IAlbumService { * 相册文件列表 * * @author fzr - * @param pageParam 分页参数 + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 * @return PageResult */ @Override - public PageResult albumList(PageParam pageParam, Map params) { - Integer page = pageParam.getPageNo(); - Integer limit = pageParam.getPageSize(); + public PageResult albumList(PageValidate pageValidate, AlbumSearchValidate searchValidate) { + Integer page = pageValidate.getPageNo(); + Integer limit = pageValidate.getPageSize(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select(Album.class, info-> @@ -60,11 +62,11 @@ public class AlbumServiceImpl implements IAlbumService { .eq("is_delete", 0) .orderByDesc("id"); - if (StringUtil.isNotEmpty(params.get("cid"))) { - queryWrapper.eq("cid", Integer.parseInt(params.get("cid"))); + if (StringUtil.isNotNull(searchValidate.getCid())) { + queryWrapper.eq("cid", searchValidate.getCid()); } - albumMapper.setSearch(queryWrapper, params, new String[]{ + albumMapper.setSearch(queryWrapper, searchValidate, new String[]{ "=:type:int", "like:keyword@name:str" }); @@ -194,11 +196,11 @@ public class AlbumServiceImpl implements IAlbumService { /** * 相册分类列表 * - * @param params 搜索参数 + * @param searchValidate 搜索参数 * @return JSONArray */ @Override - public JSONArray cateList(Map params) { + public JSONArray cateList(AlbumSearchValidate searchValidate) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select(AlbumCate.class, info-> !info.getColumn().equals("is_delete") && @@ -206,14 +208,12 @@ public class AlbumServiceImpl implements IAlbumService { .eq("is_delete", 0) .orderByDesc("id"); - long type = Integer.parseInt(params.getOrDefault("type", "0")); - String keyword = params.getOrDefault("keyword", ""); - if (type > 0) { - queryWrapper.eq("type", type); + if (StringUtil.isNotNull(searchValidate.getType()) && searchValidate.getType() > 0) { + queryWrapper.eq("type", searchValidate.getType()); } - if (!keyword.equals("")) { - queryWrapper.like("name", keyword); + if (StringUtil.isNotNull(searchValidate.getKeyword()) && StringUtil.isNotEmpty(searchValidate.getKeyword())) { + queryWrapper.like("name", searchValidate.getKeyword()); } List albumCateList = albumCateMapper.selectList(queryWrapper); @@ -236,14 +236,14 @@ public class AlbumServiceImpl implements IAlbumService { * 分类新增 * * @author fzr - * @param albumParam 分类参数 + * @param cateValidate 分类参数 */ @Override - public void cateAdd(AlbumParam albumParam) { + public void cateAdd(AlbumCateValidate cateValidate) { AlbumCate albumCate = new AlbumCate(); - albumCate.setType(albumParam.getType()); - albumCate.setPid(albumParam.getPid()); - albumCate.setName(albumParam.getName()); + albumCate.setType(cateValidate.getType()); + albumCate.setPid(cateValidate.getPid()); + albumCate.setName(cateValidate.getName()); albumCate.setCreateTime(System.currentTimeMillis() / 1000); albumCate.setUpdateTime(System.currentTimeMillis() / 1000); albumCateMapper.insert(albumCate); diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleCategoryServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ArtCateServiceImpl.java similarity index 79% rename from server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleCategoryServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/ArtCateServiceImpl.java index 917f649e..f483d394 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleCategoryServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ArtCateServiceImpl.java @@ -1,16 +1,17 @@ -package com.mdd.admin.service.article.impl; +package com.mdd.admin.service.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.mdd.admin.service.article.IArticleCategoryService; -import com.mdd.admin.validate.article.CategoryParam; -import com.mdd.admin.validate.common.PageParam; +import com.mdd.admin.service.IArtCateService; +import com.mdd.admin.validate.ArtCateCreateValidate; +import com.mdd.admin.validate.ArtCateUpdateValidate; +import com.mdd.admin.validate.ArtCateSearchValidate; +import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.article.ArticleCateVo; import com.mdd.common.core.PageResult; import com.mdd.common.entity.article.Article; import com.mdd.common.entity.article.ArticleCategory; -import com.mdd.common.exception.OperateException; import com.mdd.common.mapper.article.ArticleCategoryMapper; import com.mdd.common.mapper.article.ArticleMapper; import com.mdd.common.utils.TimeUtil; @@ -22,13 +23,12 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Map; /** * 文章分类服务实现类 */ @Service -public class ArticleCategoryServiceImpl implements IArticleCategoryService { +public class ArtCateServiceImpl implements IArtCateService { @Resource ArticleCategoryMapper articleCategoryMapper; @@ -67,21 +67,21 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService { /** * 分类列表 * - * @param pageParam 分页参数 - * @param params 搜索参数 + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 * @return PageResult */ @Override - public PageResult list(PageParam pageParam, Map params) { - Integer pageNo = pageParam.getPageNo(); - Integer pageSize = pageParam.getPageSize(); + public PageResult list(PageValidate pageValidate, ArtCateSearchValidate searchValidate) { + Integer pageNo = pageValidate.getPageNo(); + Integer pageSize = pageValidate.getPageSize(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select("id", "name", "sort", "is_show", "create_time", "update_time") .eq("is_delete", 0) .orderByDesc(Arrays.asList("sort", "id")); - articleCategoryMapper.setSearch(queryWrapper, params, new String[]{ + articleCategoryMapper.setSearch(queryWrapper, searchValidate, new String[]{ "like:name:str", "=:isShow@is_show:int" }); @@ -93,7 +93,7 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService { ArticleCateVo vo = new ArticleCateVo(); BeanUtils.copyProperties(category, vo); - Integer number = articleMapper.selectCount(new QueryWrapper
() + Long number = articleMapper.selectCount(new QueryWrapper
() .eq("cid", category.getId()) .eq("is_delete", 0)); @@ -137,18 +137,13 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService { * 分类新增 * * @author fzr - * @param categoryParam 分类参数 + * @param createValidate 分类参数 */ @Override - public void add(CategoryParam categoryParam) { - if (categoryParam.getName().trim().equals("")) { - throw new OperateException("名称不允许为空值!"); - } - + public void add(ArtCateCreateValidate createValidate) { ArticleCategory model = new ArticleCategory(); - model.setId(categoryParam.getId()); - model.setName(categoryParam.getName()); - model.setSort(categoryParam.getSort()); + model.setName(createValidate.getName()); + model.setSort(createValidate.getSort()); model.setIsShow(model.getIsShow()); model.setCreateTime(TimeUtil.timestamp()); model.setUpdateTime(TimeUtil.timestamp()); @@ -159,27 +154,23 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService { * 分类编辑 * * @author fzr - * @param categoryParam 分类参数 + * @param updateValidate 参数 */ @Override - public void edit(CategoryParam categoryParam) { - if (categoryParam.getName().trim().equals("")) { - throw new OperateException("名称不允许为空值!"); - } - + public void edit(ArtCateUpdateValidate updateValidate) { ArticleCategory model = articleCategoryMapper.selectOne( new QueryWrapper() .select(ArticleCategory.class, info-> !info.getColumn().equals("is_delete") && !info.getColumn().equals("delete_time")) - .eq("id", categoryParam.getId()) + .eq("id", updateValidate.getId()) .eq("is_delete", 0)); Assert.notNull(model, "分类不存在"); - model.setName(categoryParam.getName()); - model.setSort(categoryParam.getSort()); - model.setIsShow(categoryParam.getIsShow()); + model.setName(updateValidate.getName()); + model.setSort(updateValidate.getSort()); + model.setIsShow(updateValidate.getIsShow()); model.setUpdateTime(TimeUtil.timestamp()); articleCategoryMapper.updateById(model); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleArchivesServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ArticleServiceImpl.java similarity index 68% rename from server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleArchivesServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/ArticleServiceImpl.java index caf15e27..77ec598f 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleArchivesServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ArticleServiceImpl.java @@ -1,14 +1,16 @@ -package com.mdd.admin.service.article.impl; +package com.mdd.admin.service.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.mdd.admin.service.article.IArticleArchivesService; -import com.mdd.admin.validate.article.ArticleParam; -import com.mdd.admin.validate.common.PageParam; +import com.mdd.admin.service.IArticleService; +import com.mdd.admin.validate.ArticleCreateValidate; +import com.mdd.admin.validate.ArticleSearchValidate; +import com.mdd.admin.validate.ArticleUpdateValidate; +import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.article.ArticleDetailVo; -import com.mdd.admin.vo.article.ArticleListVo; +import com.mdd.admin.vo.article.ArticleListedVo; import com.mdd.common.config.GlobalConfig; import com.mdd.common.core.PageResult; import com.mdd.common.entity.article.Article; @@ -24,13 +26,12 @@ import org.springframework.util.Assert; import javax.annotation.Resource; import java.util.Arrays; -import java.util.Map; /** * 文章服务实现类 */ @Service -public class ArticleArchivesServiceImpl implements IArticleArchivesService { +public class ArticleServiceImpl implements IArticleService { @Resource ArticleMapper articleMapper; @@ -42,14 +43,14 @@ public class ArticleArchivesServiceImpl implements IArticleArchivesService { * 文章列表 * * @author fzr - * @param pageParam 分页参数 - * @param params 搜索参数 + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 * @return PageResult */ @Override - public PageResult list(PageParam pageParam, Map params) { - Integer pageNo = pageParam.getPageNo(); - Integer pageSize = pageParam.getPageSize(); + public PageResult list(PageValidate pageValidate, ArticleSearchValidate searchValidate) { + Integer pageNo = pageValidate.getPageNo(); + Integer pageSize = pageValidate.getPageSize(); MPJQueryWrapper
mpjQueryWrapper = new MPJQueryWrapper
() .selectAll(Article.class) @@ -58,19 +59,19 @@ public class ArticleArchivesServiceImpl implements IArticleArchivesService { .eq("t.is_delete", 0) .orderByDesc(Arrays.asList("t.sort", "t.id")); - articleMapper.setSearch(mpjQueryWrapper, params, new String[]{ + articleMapper.setSearch(mpjQueryWrapper, searchValidate, new String[]{ "like:title@t.title:str", "=:cid@t.cid:int", "=:isShow@t.is_show:int", "datetime:startTime-endTime@t.create_time:str" }); - IPage iPage = articleMapper.selectJoinPage( + IPage iPage = articleMapper.selectJoinPage( new Page<>(pageNo, pageSize), - ArticleListVo.class, + ArticleListedVo.class, mpjQueryWrapper); - for (ArticleListVo vo : iPage.getRecords()) { + for (ArticleListedVo vo : iPage.getRecords()) { vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage())); vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime())); vo.setUpdateTime(TimeUtil.timestampToDate(vo.getUpdateTime())); @@ -111,21 +112,21 @@ public class ArticleArchivesServiceImpl implements IArticleArchivesService { * 文章新增 * * @author fzr - * @param articleParam 文章参数 + * @param createValidate 文章参数 */ @Override - public void add(ArticleParam articleParam) { + public void add(ArticleCreateValidate createValidate) { Article model = new Article(); - model.setCid(articleParam.getCid()); - model.setTitle(articleParam.getTitle()); - model.setImage(UrlUtil.toRelativeUrl(articleParam.getImage())); - model.setIntro(articleParam.getIntro()); - model.setContent(articleParam.getContent()); - model.setSummary(articleParam.getSummary()); - model.setSort(articleParam.getSort()); - model.setIsShow(articleParam.getIsShow()); - model.setAuthor(articleParam.getAuthor()); - model.setVisit(articleParam.getVisit()); + model.setCid(createValidate.getCid()); + model.setTitle(createValidate.getTitle()); + model.setImage(UrlUtil.toRelativeUrl(createValidate.getImage())); + model.setIntro(createValidate.getIntro()); + model.setContent(createValidate.getContent()); + model.setSummary(createValidate.getSummary()); + model.setSort(createValidate.getSort()); + model.setIsShow(createValidate.getIsShow()); + model.setAuthor(createValidate.getAuthor()); + model.setVisit(createValidate.getVisit()); model.setCreateTime(TimeUtil.timestamp()); model.setUpdateTime(TimeUtil.timestamp()); articleMapper.insert(model); @@ -135,32 +136,32 @@ public class ArticleArchivesServiceImpl implements IArticleArchivesService { * 文章编辑 * * @author fzr - * @param articleParam 文章参数 + * @param updateValidate 文章参数 */ @Override - public void edit(ArticleParam articleParam) { + public void edit(ArticleUpdateValidate updateValidate) { Article model = articleMapper.selectOne( new QueryWrapper
() - .eq("id", articleParam.getId()) + .eq("id", updateValidate.getId()) .eq("is_delete", 0)); Assert.notNull(model, "文章不存在!"); Assert.notNull(articleCategoryMapper.selectOne( new QueryWrapper() - .eq("id", articleParam.getCid()) + .eq("id", updateValidate.getCid()) .eq("is_delete", 0)), "分类不存在"); - model.setCid(articleParam.getCid()); - model.setTitle(articleParam.getTitle()); - model.setImage(UrlUtil.toRelativeUrl(articleParam.getImage())); - model.setIntro(articleParam.getIntro()); - model.setContent(articleParam.getContent()); - model.setSummary(articleParam.getSummary()); - model.setVisit(articleParam.getVisit()); - model.setIsShow(articleParam.getIsShow()); - model.setAuthor(articleParam.getAuthor()); - model.setSort(articleParam.getSort()); + model.setCid(updateValidate.getCid()); + model.setTitle(updateValidate.getTitle()); + model.setImage(UrlUtil.toRelativeUrl(updateValidate.getImage())); + model.setIntro(updateValidate.getIntro()); + model.setContent(updateValidate.getContent()); + model.setSummary(updateValidate.getSummary()); + model.setVisit(updateValidate.getVisit()); + model.setIsShow(updateValidate.getIsShow()); + model.setAuthor(updateValidate.getAuthor()); + model.setSort(updateValidate.getSort()); model.setUpdateTime(TimeUtil.timestamp()); articleMapper.updateById(model); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelH5ServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelH5ConfigServiceImpl.java similarity index 64% rename from server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelH5ServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelH5ConfigServiceImpl.java index a64e52e9..3b770375 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelH5ServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelH5ConfigServiceImpl.java @@ -1,20 +1,18 @@ -package com.mdd.admin.service.channel.impl; +package com.mdd.admin.service.impl; -import com.mdd.admin.service.channel.IChannelH5Service; -import com.mdd.admin.validate.channel.ChannelH5Param; +import com.mdd.admin.service.IChannelH5ConfigService; +import com.mdd.admin.validate.channel.ChannelH5Validate; import com.mdd.admin.vo.channel.ChannelH5Vo; import com.mdd.common.utils.ConfigUtil; -import com.mdd.common.utils.RequestUtil; import org.springframework.stereotype.Service; -import java.util.LinkedHashMap; import java.util.Map; /** * H5渠道设置服务实现类 */ @Service -public class ChannelH5ServiceImpl implements IChannelH5Service { +public class ChannelH5ConfigServiceImpl implements IChannelH5ConfigService { /** * H5渠道配置详情 @@ -36,13 +34,13 @@ public class ChannelH5ServiceImpl implements IChannelH5Service { * H5渠道配置保存 * * @author fzr - * @param channelH5Param 参数 + * @param channelH5Validate 参数 */ @Override - public void save(ChannelH5Param channelH5Param) { - ConfigUtil.set("h5_channel", "status", String.valueOf(channelH5Param.getStatus())); - ConfigUtil.set("h5_channel", "close", String.valueOf(channelH5Param.getClose())); - ConfigUtil.set("h5_channel", "url", channelH5Param.getUrl()); + public void save(ChannelH5Validate channelH5Validate) { + ConfigUtil.set("h5_channel", "status", String.valueOf(channelH5Validate.getStatus())); + ConfigUtil.set("h5_channel", "close", String.valueOf(channelH5Validate.getClose())); + ConfigUtil.set("h5_channel", "url", channelH5Validate.getUrl()); } } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelMpServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelMpConfigServiceImpl.java similarity index 66% rename from server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelMpServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelMpConfigServiceImpl.java index 9f418d62..10cc6807 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelMpServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelMpConfigServiceImpl.java @@ -1,21 +1,20 @@ -package com.mdd.admin.service.channel.impl; +package com.mdd.admin.service.impl; -import com.mdd.admin.service.channel.IChannelMpService; -import com.mdd.admin.validate.channel.ChannelMpParam; +import com.mdd.admin.service.IChannelMpConfigService; +import com.mdd.admin.validate.channel.ChannelMpValidate; import com.mdd.admin.vo.channel.ChannelMpVo; import com.mdd.common.utils.ConfigUtil; import com.mdd.common.utils.RequestUtil; import com.mdd.common.utils.UrlUtil; import org.springframework.stereotype.Service; -import java.util.LinkedHashMap; import java.util.Map; /** * 微信小程序渠道服务实现类 */ @Service -public class ChannelMpServiceImpl implements IChannelMpService { +public class ChannelMpConfigServiceImpl implements IChannelMpConfigService { /** * 微信小程序渠道详情 @@ -51,15 +50,15 @@ public class ChannelMpServiceImpl implements IChannelMpService { * 微信小程序渠道保存 * * @author fzr - * @param channelMpParam 参数 + * @param channelMpValidate 参数 */ @Override - public void save(ChannelMpParam channelMpParam) { - ConfigUtil.set("mp_channel", "name", channelMpParam.getName()); - ConfigUtil.set("mp_channel", "primaryId", channelMpParam.getPrimaryId()); - ConfigUtil.set("mp_channel", "appId", channelMpParam.getAppId()); - ConfigUtil.set("mp_channel", "appSecret", channelMpParam.getAppSecret()); - ConfigUtil.set("mp_channel", "qrCode", UrlUtil.toRelativeUrl(channelMpParam.getQrCode())); + public void save(ChannelMpValidate channelMpValidate) { + ConfigUtil.set("mp_channel", "name", channelMpValidate.getName()); + ConfigUtil.set("mp_channel", "primaryId", channelMpValidate.getPrimaryId()); + ConfigUtil.set("mp_channel", "appId", channelMpValidate.getAppId()); + ConfigUtil.set("mp_channel", "appSecret", channelMpValidate.getAppSecret()); + ConfigUtil.set("mp_channel", "qrCode", UrlUtil.toRelativeUrl(channelMpValidate.getQrCode())); } } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaConfigServiceImpl.java similarity index 63% rename from server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaConfigServiceImpl.java index 513ed85b..56d25a07 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaConfigServiceImpl.java @@ -1,7 +1,7 @@ -package com.mdd.admin.service.channel.impl; +package com.mdd.admin.service.impl; -import com.mdd.admin.service.channel.IChannelOaService; -import com.mdd.admin.validate.channel.ChannelOaParam; +import com.mdd.admin.service.IChannelOaConfigService; +import com.mdd.admin.validate.channel.ChannelOaValidate; import com.mdd.admin.vo.channel.ChannelOaVo; import com.mdd.common.utils.ConfigUtil; import com.mdd.common.utils.RequestUtil; @@ -14,7 +14,7 @@ import java.util.Map; * 公众号渠道设置服务实现类 */ @Service -public class ChannelOaServiceImpl implements IChannelOaService { +public class ChannelOaConfigServiceImpl implements IChannelOaConfigService { /** * 公众号渠道设置详情 @@ -49,19 +49,19 @@ public class ChannelOaServiceImpl implements IChannelOaService { * 公众号渠道设置保存 * * @author fzr - * @param channelOaParam 参数 + * @param channelOaValidate 参数 */ @Override - public void save(ChannelOaParam channelOaParam) { - ConfigUtil.set("oa_channel", "name", channelOaParam.getName()); - ConfigUtil.set("oa_channel", "primaryId", channelOaParam.getPrimaryId()); - ConfigUtil.set("oa_channel", "qrCode", UrlUtil.toRelativeUrl(channelOaParam.getQrCode())); - ConfigUtil.set("oa_channel", "appId", channelOaParam.getAppId()); - ConfigUtil.set("oa_channel", "appSecret", channelOaParam.getAppSecret()); - ConfigUtil.set("oa_channel", "url", channelOaParam.getUrl()); - ConfigUtil.set("oa_channel", "token", channelOaParam.getToken()); - ConfigUtil.set("oa_channel", "encodingAesKey", channelOaParam.getEncodingAesKey()); - ConfigUtil.set("oa_channel", "encryptionType", String.valueOf(channelOaParam.getEncryptionType())); + public void save(ChannelOaValidate channelOaValidate) { + ConfigUtil.set("oa_channel", "name", channelOaValidate.getName()); + ConfigUtil.set("oa_channel", "primaryId", channelOaValidate.getPrimaryId()); + ConfigUtil.set("oa_channel", "qrCode", UrlUtil.toRelativeUrl(channelOaValidate.getQrCode())); + ConfigUtil.set("oa_channel", "appId", channelOaValidate.getAppId()); + ConfigUtil.set("oa_channel", "appSecret", channelOaValidate.getAppSecret()); + ConfigUtil.set("oa_channel", "url", channelOaValidate.getUrl()); + ConfigUtil.set("oa_channel", "token", channelOaValidate.getToken()); + ConfigUtil.set("oa_channel", "encodingAesKey", channelOaValidate.getEncodingAesKey()); + ConfigUtil.set("oa_channel", "encryptionType", String.valueOf(channelOaValidate.getEncryptionType())); } } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaMenuServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaMenusServiceImpl.java similarity index 95% rename from server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaMenuServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaMenusServiceImpl.java index 0200cec5..c28a1c81 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaMenuServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaMenusServiceImpl.java @@ -1,9 +1,9 @@ -package com.mdd.admin.service.channel.impl; +package com.mdd.admin.service.impl; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.mdd.admin.service.channel.IChannelOaMenuService; +import com.mdd.admin.service.IChannelOaMenusService; import com.mdd.common.exception.OperateException; import com.mdd.common.utils.*; import me.chanjar.weixin.common.bean.menu.WxMenu; @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; @Service -public class ChannelOaMenuServiceImpl implements IChannelOaMenuService { +public class ChannelOaMenusServiceImpl implements IChannelOaMenusService { /** * 菜单详情 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaReplyDefaultServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaReplyDefaultServiceImpl.java similarity index 69% rename from server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaReplyDefaultServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaReplyDefaultServiceImpl.java index 682065e5..1a1cc260 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaReplyDefaultServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaReplyDefaultServiceImpl.java @@ -1,13 +1,14 @@ -package com.mdd.admin.service.channel.impl; +package com.mdd.admin.service.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.mdd.admin.service.channel.IChannelOaReplyDefaultService; -import com.mdd.admin.validate.channel.ChannelOaReplyParam; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.vo.channel.ChannelOaReplyVo; +import com.mdd.admin.service.IChannelOaReplyDefaultService; +import com.mdd.admin.validate.channel.ChannelRpDefaultValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.vo.channel.ChannelRpDefaultVo; +import com.mdd.admin.vo.channel.ChannelRpVo; import com.mdd.common.core.PageResult; import com.mdd.common.entity.OfficialReply; import com.mdd.common.mapper.OfficialReplyMapper; @@ -31,24 +32,23 @@ public class ChannelOaReplyDefaultServiceImpl implements IChannelOaReplyDefaultS * 默认回复列表 * * @author fzr - * @param pageParam 分页参数 - * @return PageResult */ @Override - public PageResult list(PageParam pageParam) { - Integer pageNo = pageParam.getPageNo(); - Integer pageSize = pageParam.getPageSize(); + public PageResult list(PageValidate pageValidate) { + Integer pageNo = pageValidate.getPageNo(); + Integer pageSize = pageValidate.getPageSize(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("reply_type", 3) - .eq("is_delete", 0) - .orderByDesc(Arrays.asList("sort", "id")); + IPage iPage = officialReplyMapper.selectPage(new Page<>(pageNo, pageSize), + new QueryWrapper() + .eq("reply_type", 3) + .eq("is_delete", 0) + .orderByDesc(Arrays.asList("sort", "id"))); - IPage iPage = officialReplyMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper); - - List list = new LinkedList<>(); + List list = new LinkedList<>(); for (OfficialReply officialReply : iPage.getRecords()) { - ChannelOaReplyVo vo = new ChannelOaReplyVo(); + ChannelRpDefaultVo vo = new ChannelRpDefaultVo(); BeanUtils.copyProperties(officialReply, vo); list.add(vo); } @@ -64,7 +64,7 @@ public class ChannelOaReplyDefaultServiceImpl implements IChannelOaReplyDefaultS * @return ChannelOaReplyDefaultVo */ @Override - public ChannelOaReplyVo detail(Integer id) { + public ChannelRpDefaultVo detail(Integer id) { OfficialReply officialReply = officialReplyMapper.selectOne(new QueryWrapper() .eq("id", id) .eq("is_delete", 0) @@ -72,7 +72,7 @@ public class ChannelOaReplyDefaultServiceImpl implements IChannelOaReplyDefaultS Assert.notNull(officialReply, "默认数据不存在!"); - ChannelOaReplyVo vo = new ChannelOaReplyVo(); + ChannelRpDefaultVo vo = new ChannelRpDefaultVo(); BeanUtils.copyProperties(officialReply, vo); return vo; } @@ -81,11 +81,11 @@ public class ChannelOaReplyDefaultServiceImpl implements IChannelOaReplyDefaultS * 默认回复新 * * @author fzr - * @param channelOaReplyParam 参数 + * @param defaultValidate 参数 */ @Override - public void add(ChannelOaReplyParam channelOaReplyParam) { - if (channelOaReplyParam.getStatus().equals(1)) { + public void add(ChannelRpDefaultValidate defaultValidate) { + if (defaultValidate.getStatus().equals(1)) { OfficialReply reply = new OfficialReply(); reply.setStatus(0); officialReplyMapper.update(reply, new QueryWrapper().eq("reply_type", 3)); @@ -93,13 +93,13 @@ public class ChannelOaReplyDefaultServiceImpl implements IChannelOaReplyDefaultS OfficialReply officialReply = new OfficialReply(); officialReply.setReplyType(3); - officialReply.setName(channelOaReplyParam.getName()); - officialReply.setContent(channelOaReplyParam.getContent()); - officialReply.setContentType(channelOaReplyParam.getContentType()); - officialReply.setStatus(channelOaReplyParam.getStatus()); - officialReply.setSort(channelOaReplyParam.getSort()); - officialReply.setCreateTime(System.currentTimeMillis() / 1000); + officialReply.setContent(defaultValidate.getContent()); + officialReply.setName(defaultValidate.getName()); + officialReply.setContentType(defaultValidate.getContentType()); + officialReply.setStatus(defaultValidate.getStatus()); + officialReply.setSort(defaultValidate.getSort()); officialReply.setUpdateTime(System.currentTimeMillis() / 1000); + officialReply.setCreateTime(System.currentTimeMillis() / 1000); officialReplyMapper.insert(officialReply); } @@ -107,31 +107,31 @@ public class ChannelOaReplyDefaultServiceImpl implements IChannelOaReplyDefaultS * 默认回复编辑 * * @author fzr - * @param channelOaReplyParam 参数 + * @param defaultValidate 参数 */ @Transactional @Override - public void edit(ChannelOaReplyParam channelOaReplyParam) { + public void edit(ChannelRpDefaultValidate defaultValidate) { OfficialReply officialReply = officialReplyMapper.selectOne(new QueryWrapper() - .eq("id", channelOaReplyParam.getId()) + .eq("id", defaultValidate.getId()) .eq("is_delete", 0) .last("limit 1")); Assert.notNull(officialReply, "默认回复数据不存在!"); - if (channelOaReplyParam.getStatus().equals(1)) { + if (defaultValidate.getStatus().equals(1)) { OfficialReply reply = new OfficialReply(); reply.setStatus(0); officialReplyMapper.update(reply, new QueryWrapper().eq("reply_type", officialReply.getReplyType())); } - officialReply.setId(channelOaReplyParam.getId()); - officialReply.setName(channelOaReplyParam.getName()); officialReply.setReplyType(3); - officialReply.setContent(channelOaReplyParam.getContent()); - officialReply.setContentType(channelOaReplyParam.getContentType()); - officialReply.setStatus(channelOaReplyParam.getStatus()); - officialReply.setSort(channelOaReplyParam.getSort()); + officialReply.setId(defaultValidate.getId()); + officialReply.setName(defaultValidate.getName()); + officialReply.setContent(defaultValidate.getContent()); + officialReply.setContentType(defaultValidate.getContentType()); + officialReply.setStatus(defaultValidate.getStatus()); + officialReply.setSort(defaultValidate.getSort()); officialReply.setCreateTime(System.currentTimeMillis() / 1000); officialReply.setUpdateTime(System.currentTimeMillis() / 1000); officialReplyMapper.updateById(officialReply); diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaReplyFollowServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaReplyFollowServiceImpl.java similarity index 68% rename from server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaReplyFollowServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaReplyFollowServiceImpl.java index a8009901..f35c246f 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaReplyFollowServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaReplyFollowServiceImpl.java @@ -1,13 +1,13 @@ -package com.mdd.admin.service.channel.impl; +package com.mdd.admin.service.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.mdd.admin.service.channel.IChannelOaReplyFollowService; -import com.mdd.admin.validate.channel.ChannelOaReplyParam; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.vo.channel.ChannelOaReplyVo; +import com.mdd.admin.service.IChannelOaReplyFollowService; +import com.mdd.admin.validate.channel.ChannelRpFollowsValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.vo.channel.ChannelRpFollowsVo; import com.mdd.common.core.PageResult; import com.mdd.common.entity.OfficialReply; import com.mdd.common.mapper.OfficialReplyMapper; @@ -33,23 +33,29 @@ public class ChannelOaReplyFollowServiceImpl implements IChannelOaReplyFollowSer * 关注回复列表 * * @author fzr - * @param pageParam 分页参数 - * @return PageResult + * @param pageValidate 分页参数 + * @return PageResult */ @Override - public PageResult list(PageParam pageParam) { - Integer pageNo = pageParam.getPageNo(); - Integer pageSize = pageParam.getPageSize(); + public PageResult list(PageValidate pageValidate) { + Integer pageNo = pageValidate.getPageNo(); + Integer pageSize = pageValidate.getPageSize(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("reply_type", 1); - queryWrapper.eq("is_delete", 0); - queryWrapper.orderByDesc(Arrays.asList("sort", "id")); - IPage iPage = officialReplyMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper); + queryWrapper + .eq("reply_type", 1) + .eq("is_delete", 0) + .orderByDesc(Arrays.asList("sort", "id")); - List list = new LinkedList<>(); + IPage iPage = officialReplyMapper.selectPage(new Page<>(pageNo, pageSize), + new QueryWrapper() + .eq("reply_type", 1) + .eq("is_delete", 0) + .orderByDesc(Arrays.asList("sort", "id"))); + + List list = new LinkedList<>(); for (OfficialReply officialReply : iPage.getRecords()) { - ChannelOaReplyVo vo = new ChannelOaReplyVo(); + ChannelRpFollowsVo vo = new ChannelRpFollowsVo(); BeanUtils.copyProperties(officialReply, vo); list.add(vo); } @@ -65,7 +71,7 @@ public class ChannelOaReplyFollowServiceImpl implements IChannelOaReplyFollowSer * @return ChannelOaReplyDefaultVo */ @Override - public ChannelOaReplyVo detail(Integer id) { + public ChannelRpFollowsVo detail(Integer id) { OfficialReply officialReply = officialReplyMapper.selectOne(new QueryWrapper() .eq("id", id) .eq("is_delete", 0) @@ -73,7 +79,7 @@ public class ChannelOaReplyFollowServiceImpl implements IChannelOaReplyFollowSer Assert.notNull(officialReply, "关注回复数据不存在!"); - ChannelOaReplyVo vo = new ChannelOaReplyVo(); + ChannelRpFollowsVo vo = new ChannelRpFollowsVo(); BeanUtils.copyProperties(officialReply, vo); return vo; } @@ -82,24 +88,24 @@ public class ChannelOaReplyFollowServiceImpl implements IChannelOaReplyFollowSer * 关注回复新 * * @author fzr - * @param channelOaReplyParam 参数 + * @param followsValidate 参数 */ @Override - public void add(ChannelOaReplyParam channelOaReplyParam) { + public void add(ChannelRpFollowsValidate followsValidate) { OfficialReply reply = new OfficialReply(); - if (channelOaReplyParam.getStatus() == 1) { + if (followsValidate.getStatus().equals(1)) { reply.setStatus(1); officialReplyMapper.update(reply, new QueryWrapper().eq("reply_type", 1)); } OfficialReply officialReply = new OfficialReply(); officialReply.setReplyType(1); - officialReply.setName(channelOaReplyParam.getName()); - officialReply.setContent(channelOaReplyParam.getContent()); - officialReply.setContentType(channelOaReplyParam.getContentType()); - officialReply.setStatus(channelOaReplyParam.getStatus()); - officialReply.setSort(channelOaReplyParam.getSort()); + officialReply.setName(followsValidate.getName()); + officialReply.setContent(followsValidate.getContent()); + officialReply.setContentType(followsValidate.getContentType()); + officialReply.setStatus(followsValidate.getStatus()); + officialReply.setSort(followsValidate.getSort()); officialReply.setCreateTime(System.currentTimeMillis() / 1000); officialReply.setUpdateTime(System.currentTimeMillis() / 1000); officialReplyMapper.insert(officialReply); @@ -109,31 +115,31 @@ public class ChannelOaReplyFollowServiceImpl implements IChannelOaReplyFollowSer * 关注回复编辑 * * @author fzr - * @param channelOaReplyParam 参数 + * @param followsValidate 参数 */ @Transactional @Override - public void edit(ChannelOaReplyParam channelOaReplyParam) { + public void edit(ChannelRpFollowsValidate followsValidate) { OfficialReply officialReply = officialReplyMapper.selectOne(new QueryWrapper() - .eq("id", channelOaReplyParam.getId()) + .eq("id", followsValidate.getId()) .eq("is_delete", 0) .last("limit 1")); Assert.notNull(officialReply, "关注回复数据不存在!"); - if (channelOaReplyParam.getStatus() == 1) { + if (followsValidate.getStatus().equals(1)) { OfficialReply reply = new OfficialReply(); reply.setStatus(0); officialReplyMapper.update(reply, new QueryWrapper().eq("reply_type", officialReply.getReplyType())); } - officialReply.setId(channelOaReplyParam.getId()); + officialReply.setId(followsValidate.getId()); officialReply.setReplyType(1); - officialReply.setName(channelOaReplyParam.getName()); - officialReply.setContent(channelOaReplyParam.getContent()); - officialReply.setContentType(channelOaReplyParam.getContentType()); - officialReply.setStatus(channelOaReplyParam.getStatus()); - officialReply.setSort(channelOaReplyParam.getSort()); + officialReply.setName(followsValidate.getName()); + officialReply.setContent(followsValidate.getContent()); + officialReply.setContentType(followsValidate.getContentType()); + officialReply.setStatus(followsValidate.getStatus()); + officialReply.setSort(followsValidate.getSort()); officialReply.setUpdateTime(System.currentTimeMillis() / 1000); officialReplyMapper.updateById(officialReply); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaReplyKeywordServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaReplyKeywordServiceImpl.java similarity index 62% rename from server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaReplyKeywordServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaReplyKeywordServiceImpl.java index 3cf7cb88..1eb6bd67 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaReplyKeywordServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelOaReplyKeywordServiceImpl.java @@ -1,13 +1,13 @@ -package com.mdd.admin.service.channel.impl; +package com.mdd.admin.service.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.mdd.admin.service.channel.IChannelOaReplyKeywordService; -import com.mdd.admin.validate.channel.ChannelOaReplyParam; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.vo.channel.ChannelOaReplyVo; +import com.mdd.admin.service.IChannelOaReplyKeywordService; +import com.mdd.admin.validate.channel.ChannelRpKeywordValidate; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.vo.channel.ChannelRpKeywordVo; import com.mdd.common.core.PageResult; import com.mdd.common.entity.OfficialReply; import com.mdd.common.mapper.OfficialReplyMapper; @@ -33,23 +33,23 @@ public class ChannelOaReplyKeywordServiceImpl implements IChannelOaReplyKeywordS * 关键词回复列表 * * @author fzr - * @param pageParam 分页参数 - * @return List + * @param pageValidate 分页参数 + * @return List */ @Override - public PageResult list(PageParam pageParam) { - Integer pageNo = pageParam.getPageNo(); - Integer pageSize = pageParam.getPageSize(); + public PageResult list(PageValidate pageValidate) { + Integer pageNo = pageValidate.getPageNo(); + Integer pageSize = pageValidate.getPageSize(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("reply_type", 2); - queryWrapper.eq("is_delete", 0); - queryWrapper.orderByDesc(Arrays.asList("sort", "id")); - IPage iPage = officialReplyMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper); + IPage iPage = officialReplyMapper.selectPage(new Page<>(pageNo, pageSize), + new QueryWrapper() + .eq("reply_type", 2) + .eq("is_delete", 0) + .orderByDesc(Arrays.asList("sort", "id"))); - List list = new LinkedList<>(); + List list = new LinkedList<>(); for (OfficialReply officialReply : iPage.getRecords()) { - ChannelOaReplyVo vo = new ChannelOaReplyVo(); + ChannelRpKeywordVo vo = new ChannelRpKeywordVo(); BeanUtils.copyProperties(officialReply, vo); list.add(vo); } @@ -62,10 +62,10 @@ public class ChannelOaReplyKeywordServiceImpl implements IChannelOaReplyKeywordS * * @author fzr * @param id 主键 - * @return ChannelOaReplyKeywordVo + * @return ChannelRpKeywordVo */ @Override - public ChannelOaReplyVo detail(Integer id) { + public ChannelRpKeywordVo detail(Integer id) { OfficialReply officialReply = officialReplyMapper.selectOne(new QueryWrapper() .eq("id", id) .eq("is_delete", 0) @@ -73,7 +73,7 @@ public class ChannelOaReplyKeywordServiceImpl implements IChannelOaReplyKeywordS Assert.notNull(officialReply, "数据不存在!"); - ChannelOaReplyVo vo = new ChannelOaReplyVo(); + ChannelRpKeywordVo vo = new ChannelRpKeywordVo(); BeanUtils.copyProperties(officialReply, vo); return vo; } @@ -82,19 +82,19 @@ public class ChannelOaReplyKeywordServiceImpl implements IChannelOaReplyKeywordS * 关注回复新 * * @author fzr - * @param channelOaReplyParam 参数 + * @param keywordValidate 参数 */ @Override - public void add(ChannelOaReplyParam channelOaReplyParam) { + public void add(ChannelRpKeywordValidate keywordValidate) { OfficialReply officialReply = new OfficialReply(); officialReply.setReplyType(2); - officialReply.setName(channelOaReplyParam.getName()); - officialReply.setContent(channelOaReplyParam.getContent()); - officialReply.setContentType(channelOaReplyParam.getContentType()); - officialReply.setStatus(channelOaReplyParam.getStatus()); - officialReply.setKeyword(channelOaReplyParam.getKeyword()); - officialReply.setMatchingType(channelOaReplyParam.getMatchingType()); - officialReply.setSort(channelOaReplyParam.getSort()); + officialReply.setName(keywordValidate.getName()); + officialReply.setContent(keywordValidate.getContent()); + officialReply.setContentType(keywordValidate.getContentType()); + officialReply.setStatus(keywordValidate.getStatus()); + officialReply.setKeyword(keywordValidate.getKeyword()); + officialReply.setSort(keywordValidate.getSort()); + officialReply.setMatchingType(keywordValidate.getMatchingType()); officialReply.setCreateTime(System.currentTimeMillis() / 1000); officialReply.setUpdateTime(System.currentTimeMillis() / 1000); officialReplyMapper.insert(officialReply); @@ -104,27 +104,27 @@ public class ChannelOaReplyKeywordServiceImpl implements IChannelOaReplyKeywordS * 关注回复编辑 * * @author fzr - * @param channelOaReplyParam 参数 + * @param keywordValidate 参数 */ @Transactional @Override - public void edit(ChannelOaReplyParam channelOaReplyParam) { + public void edit(ChannelRpKeywordValidate keywordValidate) { OfficialReply officialReply = officialReplyMapper.selectOne(new QueryWrapper() - .eq("id", channelOaReplyParam.getId()) + .eq("id", keywordValidate.getId()) .eq("is_delete", 0) .last("limit 1")); Assert.notNull(officialReply, "关键词回复数据不存在!"); officialReply.setReplyType(2); - officialReply.setId(channelOaReplyParam.getId()); - officialReply.setName(channelOaReplyParam.getName()); - officialReply.setContent(channelOaReplyParam.getContent()); - officialReply.setContentType(channelOaReplyParam.getContentType()); - officialReply.setStatus(channelOaReplyParam.getStatus()); - officialReply.setKeyword(channelOaReplyParam.getKeyword()); - officialReply.setMatchingType(channelOaReplyParam.getMatchingType()); - officialReply.setSort(channelOaReplyParam.getSort()); + officialReply.setId(keywordValidate.getId()); + officialReply.setName(keywordValidate.getName()); + officialReply.setContent(keywordValidate.getContent()); + officialReply.setContentType(keywordValidate.getContentType()); + officialReply.setStatus(keywordValidate.getStatus()); + officialReply.setKeyword(keywordValidate.getKeyword()); + officialReply.setMatchingType(keywordValidate.getMatchingType()); + officialReply.setSort(keywordValidate.getSort()); officialReply.setUpdateTime(System.currentTimeMillis() / 1000); officialReplyMapper.updateById(officialReply); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecorateDataServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/DecorateDataServiceImpl.java similarity index 93% rename from server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecorateDataServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/DecorateDataServiceImpl.java index 867930a8..224e779d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecorateDataServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/DecorateDataServiceImpl.java @@ -1,7 +1,7 @@ -package com.mdd.admin.service.decorate.impl; +package com.mdd.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.mdd.admin.service.decorate.IDecorateDataService; +import com.mdd.admin.service.IDecorateDataService; import com.mdd.admin.vo.decorate.DecorateDataArticleVo; import com.mdd.common.entity.article.Article; import com.mdd.common.mapper.article.ArticleMapper; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecoratePageServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/DecoratePageServiceImpl.java similarity index 64% rename from server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecoratePageServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/DecoratePageServiceImpl.java index 720818cb..1771468f 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecoratePageServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/DecoratePageServiceImpl.java @@ -1,18 +1,14 @@ -package com.mdd.admin.service.decorate.impl; +package com.mdd.admin.service.impl; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.mdd.admin.service.decorate.IDecoratePageService; -import com.mdd.admin.validate.decorate.DecoratePageParam; +import com.mdd.admin.service.IDecoratePageService; +import com.mdd.admin.validate.DecoratePageValidate; import com.mdd.admin.vo.decorate.DecoratePageVo; -import com.mdd.common.entity.decorate.DecoratePage; -import com.mdd.common.mapper.decorate.DecoratePageMapper; -import com.mdd.common.utils.ToolsUtil; +import com.mdd.common.entity.DecoratePage; +import com.mdd.common.mapper.DecoratePageMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.LinkedHashMap; -import java.util.Map; @Service public class DecoratePageServiceImpl implements IDecoratePageService { @@ -34,7 +30,7 @@ public class DecoratePageServiceImpl implements IDecoratePageService { DecoratePageVo vo = new DecoratePageVo(); vo.setId(decoratePage.getId()); - vo.setPageType(vo.getPageType()); + vo.setPageType(decoratePage.getPageType()); vo.setPageData(decoratePage.getPageData()); return vo; } @@ -43,14 +39,14 @@ public class DecoratePageServiceImpl implements IDecoratePageService { * 页面装修保存 * * @author fzr - * @param decoratePageParam 参数 + * @param decoratePageValidate 参数 */ @Override - public void save(DecoratePageParam decoratePageParam) { - DecoratePage decoratePage = decoratePageMapper.selectById(decoratePageParam.getId()); + public void save(DecoratePageValidate decoratePageValidate) { + DecoratePage decoratePage = decoratePageMapper.selectById(decoratePageValidate.getId()); Assert.notNull(decoratePage, "数据不存在!"); - decoratePage.setPageData(decoratePageParam.getPageData()); + decoratePage.setPageData(decoratePageValidate.getPageData()); decoratePage.setUpdateTime(System.currentTimeMillis() / 1000); decoratePageMapper.updateById(decoratePage); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecorateTabbarServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/DecorateTabbarServiceImpl.java similarity index 67% rename from server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecorateTabbarServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/DecorateTabbarServiceImpl.java index 9b84da86..cf4fb0b9 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecorateTabbarServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/DecorateTabbarServiceImpl.java @@ -1,21 +1,20 @@ -package com.mdd.admin.service.decorate.impl; +package com.mdd.admin.service.impl; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.mdd.admin.service.decorate.IDecorateTabbarService; -import com.mdd.admin.vo.decorate.DecorateTabObjVo; +import com.mdd.admin.service.IDecorateTabbarService; +import com.mdd.admin.validate.DecorateTabsValidate; +import com.mdd.admin.vo.decorate.DecorateTabsListsVo; import com.mdd.admin.vo.decorate.DecorateTabbarVo; -import com.mdd.common.entity.decorate.DecorateTabbar; -import com.mdd.common.mapper.decorate.DecorateTabbarMapper; +import com.mdd.common.entity.DecorateTabbar; +import com.mdd.common.mapper.DecorateTabbarMapper; import com.mdd.common.utils.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; -import java.util.Map; /** * 底部导航服务实现类 @@ -39,9 +38,9 @@ public class DecorateTabbarServiceImpl implements IDecorateTabbarService { new QueryWrapper() .orderByAsc("id")); - List tabList = new LinkedList<>(); + List tabList = new LinkedList<>(); for (DecorateTabbar tab: list) { - DecorateTabObjVo vo = new DecorateTabObjVo(); + DecorateTabsListsVo vo = new DecorateTabsListsVo(); vo.setId(tab.getId()); vo.setName(tab.getName()); vo.setSelected(UrlUtil.toAbsoluteUrl(tab.getSelected())); @@ -64,29 +63,28 @@ public class DecorateTabbarServiceImpl implements IDecorateTabbarService { * 底部导航保存 * * @author fzr - * @param params 参数 + * @param tabsValidate 参数 */ @Override @Transactional - public void save(Map params) { + public void save(DecorateTabsValidate tabsValidate) { decorateTabbarMapper.delete(new QueryWrapper().gt("id", 0)); - for (String obj : ArrayUtil.objectToListAsStr(params.get("list"))) { - Map item = ToolsUtil.jsonToMap(obj); + for (DecorateTabsListsVo obj : tabsValidate.getList()) { + DecorateTabbar model = new DecorateTabbar(); - model.setName(item.get("name")); - model.setSelected(UrlUtil.toRelativeUrl(item.get("selected"))); - model.setUnselected(UrlUtil.toRelativeUrl(item.get("unselected"))); - model.setLink(item.get("link")); + model.setName(obj.getName()); + model.setLink(obj.getLink()); + model.setSelected(UrlUtil.toRelativeUrl(obj.getSelected())); + model.setUnselected(UrlUtil.toRelativeUrl(obj.getUnselected())); model.setCreateTime(System.currentTimeMillis() / 1000); model.setUpdateTime(System.currentTimeMillis() / 1000); decorateTabbarMapper.insert(model); } - if (StringUtil.isNotNull(params.get("style"))) { - ConfigUtil.set("tabbar", "style", JSON.toJSONString(params.get("style"))); + if (StringUtil.isNotNull(tabsValidate.getStyle())) { + ConfigUtil.set("tabbar", "style", JSON.toJSONString(tabsValidate.getStyle())); } - } } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/common/impl/IndexServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/IndexCommonServiceImpl.java similarity index 87% rename from server/like-admin/src/main/java/com/mdd/admin/service/common/impl/IndexServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/IndexCommonServiceImpl.java index afc8c665..33503143 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/common/impl/IndexServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/IndexCommonServiceImpl.java @@ -1,25 +1,20 @@ -package com.mdd.admin.service.common.impl; +package com.mdd.admin.service.impl; -import com.mdd.admin.service.common.IIndexService; +import com.mdd.admin.service.IIndexCommonService; import com.mdd.common.config.GlobalConfig; -import com.mdd.common.mapper.article.ArticleMapper; import com.mdd.common.utils.ArrayUtil; import com.mdd.common.utils.ConfigUtil; import com.mdd.common.utils.TimeUtil; import com.mdd.common.utils.UrlUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.util.*; /** * 主页服务实现类 */ @Service -public class IndexServiceImpl implements IIndexService { - - @Resource - ArticleMapper articleMapper; +public class IndexCommonServiceImpl implements IIndexCommonService { /** * 控制台数据 @@ -76,8 +71,6 @@ public class IndexServiceImpl implements IIndexService { Map website = ConfigUtil.get("website"); String copyright = ConfigUtil.get("website", "copyright", ""); - System.out.println(UrlUtil.toRelativeUrl("http://127.0.0.1:8082/uploads/image/20220426/8984bec1-57d6-4635-a110-fb4b26335879.png")); - Map map = new LinkedHashMap<>(); map.put("webName", website.getOrDefault("name", "")); map.put("webLogo", UrlUtil.toAbsoluteUrl(website.getOrDefault("logo", ""))); diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingCopyrightServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingCopyrightServiceImpl.java new file mode 100644 index 00000000..a2e83907 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingCopyrightServiceImpl.java @@ -0,0 +1,53 @@ +package com.mdd.admin.service.impl; + +import com.alibaba.fastjson2.JSON; +import com.mdd.admin.service.ISettingCopyrightService; +import com.mdd.admin.validate.setting.SettingCopyrightValidate; +import com.mdd.admin.vo.setting.SettingCopyrightVo; +import com.mdd.common.utils.ArrayUtil; +import com.mdd.common.utils.ConfigUtil; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * 网站备案服务实现类 + */ +@Service +public class SettingCopyrightServiceImpl implements ISettingCopyrightService { + + /** + * 获取网站备案信息 + * + * @author fzr + * @return List + */ + @Override + public List detail() { + String config = ConfigUtil.get("website", "copyright", "[]"); + List> copyright = ArrayUtil.stringToListAsMapStr(config); + + List list = new LinkedList<>(); + for (Map map : copyright) { + SettingCopyrightVo vo = new SettingCopyrightVo(); + vo.setName(map.getOrDefault("name", "")); + vo.setLink(map.getOrDefault("link", "")); + list.add(vo); + } + + return list; + } + + /** + * 保存网站备案信息 + * + * @author fzr + * @param copyrightValidate 参数 + */ + @Override + public void save(SettingCopyrightValidate copyrightValidate) { + String s = JSON.toJSONString(copyrightValidate.getList()); + ConfigUtil.set("website", "copyright", s); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingDictDataServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingDictDataServiceImpl.java similarity index 81% rename from server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingDictDataServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingDictDataServiceImpl.java index b71def96..4e6d51a3 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingDictDataServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingDictDataServiceImpl.java @@ -1,12 +1,13 @@ -package com.mdd.admin.service.setting.impl; +package com.mdd.admin.service.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.mdd.admin.service.setting.ISettingDictDataService; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.validate.setting.DictDataParam; +import com.mdd.admin.service.ISettingDictDataService; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.setting.DictDataCreateValidate; +import com.mdd.admin.validate.setting.DictDataUpdateValidate; import com.mdd.admin.vo.setting.SettingDictDataVo; import com.mdd.common.core.PageResult; import com.mdd.common.entity.setting.DictData; @@ -80,14 +81,14 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService { * 字典数据列表 * * @author fzr - * @param pageParam 分页参数 + * @param pageValidate 分页参数 * @param params 搜索参数 * @return PageResult */ @Override - public PageResult list(PageParam pageParam, Map params) { - Integer page = pageParam.getPageNo(); - Integer limit = pageParam.getPageSize(); + public PageResult list(PageValidate pageValidate, Map params) { + Integer page = pageValidate.getPageNo(); + Integer limit = pageValidate.getPageSize(); DictType dictType = dictTypeMapper.selectOne(new QueryWrapper() .eq("is_delete", 0) @@ -151,23 +152,23 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService { * 字典数据新增 * * @author fzr - * @param dictDataParam 参数 + * @param createValidate 参数 */ @Override - public void add(DictDataParam dictDataParam) { + public void add(DictDataCreateValidate createValidate) { Assert.isNull(dictDataMapper.selectOne(new QueryWrapper() .select("id") - .eq("name", dictDataParam.getName()) + .eq("name", createValidate.getName()) .eq("is_delete", 0) .last("limit 1")), "字典数据已存在！"); DictData model = new DictData(); - model.setTypeId(dictDataParam.getTypeId()); - model.setName(dictDataParam.getName()); - model.setValue(dictDataParam.getValue()); - model.setRemark(dictDataParam.getRemark()); - model.setSort(dictDataParam.getSort()); - model.setStatus(dictDataParam.getStatus()); + model.setTypeId(createValidate.getTypeId()); + model.setName(createValidate.getName()); + model.setValue(createValidate.getValue()); + model.setRemark(createValidate.getRemark()); + model.setSort(createValidate.getSort()); + model.setStatus(createValidate.getStatus()); model.setCreateTime(System.currentTimeMillis() / 1000); model.setUpdateTime(System.currentTimeMillis() / 1000); dictDataMapper.insert(model); @@ -177,12 +178,12 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService { * 字典数据编辑 * * @author fzr - * @param dictDataParam 参数 + * @param updateValidate 参数 */ @Override - public void edit(DictDataParam dictDataParam) { + public void edit(DictDataUpdateValidate updateValidate) { DictData model = dictDataMapper.selectOne(new QueryWrapper() - .eq("id", dictDataParam.getId()) + .eq("id", updateValidate.getId()) .eq("is_delete", 0) .last("limit 1")); @@ -190,16 +191,16 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService { Assert.isNull(dictDataMapper.selectOne(new QueryWrapper() .select("id") - .ne("id", dictDataParam.getId()) - .eq("name", dictDataParam.getName()) + .ne("id", updateValidate.getId()) + .eq("name", updateValidate.getName()) .eq("is_delete", 0) .last("limit 1")), "字典数据已存在！"); - model.setName(dictDataParam.getName()); - model.setValue(dictDataParam.getValue()); - model.setRemark(dictDataParam.getRemark()); - model.setSort(dictDataParam.getSort()); - model.setStatus(dictDataParam.getStatus()); + model.setName(updateValidate.getName()); + model.setValue(updateValidate.getValue()); + model.setRemark(updateValidate.getRemark()); + model.setSort(updateValidate.getSort()); + model.setStatus(updateValidate.getStatus()); model.setUpdateTime(System.currentTimeMillis() / 1000); dictDataMapper.updateById(model); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingDictTypeServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingDictTypeServiceImpl.java similarity index 78% rename from server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingDictTypeServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingDictTypeServiceImpl.java index 94a02695..84b85a86 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingDictTypeServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingDictTypeServiceImpl.java @@ -1,12 +1,13 @@ -package com.mdd.admin.service.setting.impl; +package com.mdd.admin.service.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.mdd.admin.service.setting.ISettingDictTypeService; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.validate.setting.DictTypeParam; +import com.mdd.admin.service.ISettingDictTypeService; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.setting.DictTypeCreateValidate; +import com.mdd.admin.validate.setting.DictTypeUpdateValidate; import com.mdd.admin.vo.setting.SettingDictTypeVo; import com.mdd.common.core.PageResult; import com.mdd.common.entity.setting.DictType; @@ -61,14 +62,14 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService { * 字典类型列表 * * @author fzr - * @param pageParam 分页参数 + * @param pageValidate 分页参数 * @param params 搜索参数 * @return PageResult */ @Override - public PageResult list(PageParam pageParam, Map params) { - Integer page = pageParam.getPageNo(); - Integer limit = pageParam.getPageSize(); + public PageResult list(PageValidate pageValidate, Map params) { + Integer page = pageValidate.getPageNo(); + Integer limit = pageValidate.getPageSize(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select("id,dict_name,dict_type,dict_remark,dict_status,create_time,update_time"); @@ -124,27 +125,27 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService { * 字典类型新增 * * @author fzr - * @param dictTypeParam 参数 + * @param createValidate 参数 */ @Override - public void add(DictTypeParam dictTypeParam) { + public void add(DictTypeCreateValidate createValidate) { Assert.isNull(dictTypeMapper.selectOne(new QueryWrapper() .select("id") - .eq("dict_name", dictTypeParam.getDictName()) + .eq("dict_name", createValidate.getDictName()) .eq("is_delete", 0) .last("limit 1")), "字典名称已存在！"); Assert.isNull(dictTypeMapper.selectOne(new QueryWrapper() .select("id") - .eq("dict_type", dictTypeParam.getDictType()) + .eq("dict_type", createValidate.getDictType()) .eq("is_delete", 0) .last("limit 1")), "字典类型已存在！"); DictType model = new DictType(); - model.setDictName(dictTypeParam.getDictName()); - model.setDictType(dictTypeParam.getDictType()); - model.setDictRemark(dictTypeParam.getDictRemark()); - model.setDictStatus(dictTypeParam.getDictStatus()); + model.setDictName(createValidate.getDictName()); + model.setDictType(createValidate.getDictType()); + model.setDictRemark(createValidate.getDictRemark()); + model.setDictStatus(createValidate.getDictStatus()); model.setCreateTime(System.currentTimeMillis() / 1000); model.setUpdateTime(System.currentTimeMillis() / 1000); dictTypeMapper.insert(model); @@ -154,33 +155,33 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService { * 字典类型编辑 * * @author fzr - * @param dictTypeParam 参数 + * @param updateValidate 参数 */ @Override - public void edit(DictTypeParam dictTypeParam) { + public void edit(DictTypeUpdateValidate updateValidate) { DictType model = dictTypeMapper.selectOne(new QueryWrapper() - .eq("id", dictTypeParam.getId()) + .eq("id", updateValidate.getId()) .eq("is_delete", 0) .last("limit 1")); Assert.notNull(model, "字典类型不存在！"); Assert.isNull(dictTypeMapper.selectOne(new QueryWrapper() - .ne("id", dictTypeParam.getId()) - .eq("dict_name", dictTypeParam.getDictName()) + .ne("id", updateValidate.getId()) + .eq("dict_name", updateValidate.getDictName()) .eq("is_delete", 0) .last("limit 1")), "字典类型已存在！"); Assert.isNull(dictTypeMapper.selectOne(new QueryWrapper() - .ne("id", dictTypeParam.getId()) - .eq("dict_type", dictTypeParam.getDictType()) + .ne("id", updateValidate.getId()) + .eq("dict_type", updateValidate.getDictType()) .eq("is_delete", 0) .last("limit 1")), "字典类型已存在！"); - model.setDictName(dictTypeParam.getDictName()); - model.setDictType(dictTypeParam.getDictType()); - model.setDictRemark(dictTypeParam.getDictRemark()); - model.setDictStatus(dictTypeParam.getDictStatus()); + model.setDictName(updateValidate.getDictName()); + model.setDictType(updateValidate.getDictType()); + model.setDictRemark(updateValidate.getDictRemark()); + model.setDictStatus(updateValidate.getDictStatus()); model.setUpdateTime(System.currentTimeMillis() / 1000); dictTypeMapper.updateById(model); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingLoginServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingLoginServiceImpl.java new file mode 100644 index 00000000..7cc3b976 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingLoginServiceImpl.java @@ -0,0 +1,53 @@ +package com.mdd.admin.service.impl; + +import com.mdd.admin.service.ISettingLoginService; +import com.mdd.admin.validate.setting.SettingLoginValidate; +import com.mdd.admin.vo.setting.SettingLoginVo; +import com.mdd.common.utils.ArrayUtil; +import com.mdd.common.utils.ConfigUtil; +import org.springframework.stereotype.Service; + +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * 登录设置服务接口类 + */ +@Service +public class SettingLoginServiceImpl implements ISettingLoginService { + + /** + * 登录设置详情 + * + * @author fzr + * @return SettingLoginVo + */ + @Override + public SettingLoginVo detail() { + Map config = ConfigUtil.get("login"); + + SettingLoginVo vo = new SettingLoginVo(); + vo.setLoginWay(ArrayUtil.stringToListAsInt(config.getOrDefault("loginWay", ""), ",")); + vo.setForceBindMobile(Integer.parseInt(config.getOrDefault("forceBindMobile", "0"))); + vo.setOpenAgreement(Integer.parseInt(config.getOrDefault("openAgreement", "0"))); + vo.setOpenOtherAuth(Integer.parseInt(config.getOrDefault("openOtherAuth", "0"))); + vo.setAutoLoginAuth(ArrayUtil.stringToListAsInt(config.getOrDefault("autoLoginAuth", ""), ",")); + return vo; + } + + /** + * 登录设置保存 + * + * @author fzr + * @param loginValidate 参数 + */ + @Override + public void save(SettingLoginValidate loginValidate) { + ConfigUtil.set("login", "loginWay", loginValidate.getLoginWay()); + ConfigUtil.set("login", "forceBindMobile", String.valueOf(loginValidate.getForceBindMobile())); + ConfigUtil.set("login", "openAgreement", String.valueOf(loginValidate.getOpenAgreement())); + ConfigUtil.set("login", "openOtherAuth", String.valueOf(loginValidate.getOpenOtherAuth())); + ConfigUtil.set("login", "autoLoginAuth", String.valueOf(loginValidate.getAutoLoginAuth())); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingNoticeServiceImpl.java similarity index 87% rename from server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingNoticeServiceImpl.java index 7355528e..d941ac4f 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingNoticeServiceImpl.java @@ -1,11 +1,11 @@ -package com.mdd.admin.service.setting.impl; +package com.mdd.admin.service.impl; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.mdd.admin.service.setting.ISettingNoticeService; +import com.mdd.admin.service.ISettingNoticeService; import com.mdd.admin.vo.setting.SettingNoticeDetailVo; -import com.mdd.admin.vo.setting.SettingNoticeListVo; +import com.mdd.admin.vo.setting.SettingNoticeListedVo; import com.mdd.common.entity.notice.NoticeSetting; import com.mdd.common.mapper.notice.NoticeSettingMapper; import com.mdd.common.utils.TimeUtil; @@ -35,16 +35,16 @@ public class SettingNoticeServiceImpl implements ISettingNoticeService { * @return List */ @Override - public List list(Integer recipient) { + public List list(Integer recipient) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("recipient", recipient); queryWrapper.eq("is_delete", 0); queryWrapper.orderByAsc("id"); List noticeSettings = noticeSettingMapper.selectList(queryWrapper); - List list = new LinkedList<>(); + List list = new LinkedList<>(); for (NoticeSetting n : noticeSettings) { - SettingNoticeListVo vo = new SettingNoticeListVo(); + SettingNoticeListedVo vo = new SettingNoticeListedVo(); BeanUtils.copyProperties(n, vo); Map systemMap = ToolsUtil.jsonToMap(n.getSystemNotice()); @@ -88,12 +88,12 @@ public class SettingNoticeServiceImpl implements ISettingNoticeService { Map oaMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getOaNotice()); Map mnpMap = ToolsUtil.jsonToMapAsObj(noticeSetting.getMnpNotice()); - systemMap.put("tips", JSONArray.toJSON(systemMap.get("tips"))); - smsMap.put("tips", JSONArray.toJSON(smsMap.get("tips"))); - oaMap.put("tips", JSONArray.toJSON(oaMap.get("tips"))); - oaMap.put("tpl", JSONArray.toJSON(oaMap.get("tpl"))); - mnpMap.put("tips", JSONArray.toJSON(mnpMap.get("tips"))); - mnpMap.put("tpl", JSONArray.toJSON(mnpMap.get("tpl"))); + systemMap.put("tips", JSONArray.toJSONString(systemMap.get("tips"))); + smsMap.put("tips", JSONArray.toJSONString(smsMap.get("tips"))); + oaMap.put("tips", JSONArray.toJSONString(oaMap.get("tips"))); + oaMap.put("tpl", JSONArray.toJSONString(oaMap.get("tpl"))); + mnpMap.put("tips", JSONArray.toJSONString(mnpMap.get("tips"))); + mnpMap.put("tpl", JSONArray.toJSONString(mnpMap.get("tpl"))); vo.setType(noticeSetting.getType()==1?"业务通知":"验证码"); vo.setSystemNotice(systemMap); diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingProtocolServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingProtocolServiceImpl.java new file mode 100644 index 00000000..29467ca3 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingProtocolServiceImpl.java @@ -0,0 +1,59 @@ +package com.mdd.admin.service.impl; + +import com.alibaba.fastjson2.JSON; +import com.mdd.admin.service.ISettingProtocolService; +import com.mdd.admin.validate.setting.SettingProtocolValidate; +import com.mdd.admin.vo.setting.SettingProtocolDetailVo; +import com.mdd.admin.vo.setting.SettingProtocolObjectVo; +import com.mdd.common.utils.ConfigUtil; +import com.mdd.common.utils.ToolsUtil; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 政策接口服务实现类 + */ +@Service +public class SettingProtocolServiceImpl implements ISettingProtocolService { + + /** + * 获取政策协议信息 + * + * @author fzr + * @return SettingProtocolDetailVo + */ + @Override + public SettingProtocolDetailVo detail() { + String service = ConfigUtil.get("protocol", "service", "{\"name\":\"\",\"content\":\"\"}"); + String privacy = ConfigUtil.get("protocol", "privacy", "{\"name\":\"\",\"content\":\"\"}"); + Map serviceMap = ToolsUtil.jsonToMap(service); + Map privacyMap = ToolsUtil.jsonToMap(privacy); + + SettingProtocolObjectVo serviceObj = new SettingProtocolObjectVo(); + serviceObj.setName(serviceMap.getOrDefault("name", "")); + serviceObj.setContent(serviceMap.getOrDefault("content", "")); + + SettingProtocolObjectVo privacyObj = new SettingProtocolObjectVo(); + privacyObj.setName(privacyMap.getOrDefault("name", "")); + privacyObj.setContent(privacyMap.getOrDefault("content", "")); + + SettingProtocolDetailVo vo = new SettingProtocolDetailVo(); + vo.setService(serviceObj); + vo.setPrivacy(privacyObj); + return vo; + } + + /** + * 保存政策协议信息 + * + * @author fzr + * @param protocolValidate 参数 + */ + @Override + public void save(SettingProtocolValidate protocolValidate) { + ConfigUtil.set("protocol","service", JSON.toJSONString(protocolValidate.getService())); + ConfigUtil.set("protocol","privacy", JSON.toJSONString(protocolValidate.getPrivacy())); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingSearchServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingSearchServiceImpl.java similarity index 54% rename from server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingSearchServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingSearchServiceImpl.java index b3c1ee3a..44c8e3a0 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingSearchServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingSearchServiceImpl.java @@ -1,18 +1,17 @@ -package com.mdd.admin.service.setting.impl; +package com.mdd.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.mdd.admin.service.setting.ISettingSearchService; +import com.mdd.admin.service.ISettingSearchService; +import com.mdd.admin.validate.setting.SettingSearchValidate; +import com.mdd.admin.vo.setting.SettingSearchDetailVo; +import com.mdd.admin.vo.setting.SettingSearchObjectVo; import com.mdd.common.entity.setting.HotSearch; import com.mdd.common.mapper.setting.HotSearchMapper; -import com.mdd.common.utils.ArrayUtil; import com.mdd.common.utils.ConfigUtil; -import com.mdd.common.utils.ToolsUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; /** * 热门搜索服务实现类 @@ -27,38 +26,35 @@ public class SettingSearchServiceImpl implements ISettingSearchService { * 热门搜索详情 * * @author fzr - * @return Map + * @return SettingSearchDetailVo */ @Override - public Map detail() { - Map response = new LinkedHashMap<>(); - + public SettingSearchDetailVo detail() { Integer isHotSearch = Integer.parseInt(ConfigUtil.get("search", "isHotSearch", "0")); - response.put("isHotSearch", isHotSearch); - List list = hotSearchMapper.selectList(new QueryWrapper().orderByDesc("sort")); - response.put("list", list); - return response; + SettingSearchDetailVo vo = new SettingSearchDetailVo(); + vo.setIsHotSearch(isHotSearch); + vo.setList(list); + return vo; } /** * 热门搜索新增 * * @author fzr - * @param params 参数 + * @param searchValidate 参数 */ @Override - public void save(Map params) { - String isHotSearch = params.getOrDefault("isHotSearch", "0").toString(); + public void save(SettingSearchValidate searchValidate) { + String isHotSearch = String.valueOf(searchValidate.getIsHotSearch()); ConfigUtil.set("search", "isHotSearch", isHotSearch); hotSearchMapper.delete(new QueryWrapper().ge("id", 0)); - for (String obj : ArrayUtil.objectToListAsStr(params.get("list"))) { - Map item = ToolsUtil.jsonToMap(obj); + for (SettingSearchObjectVo vo : searchValidate.getList()) { HotSearch hotSearch = new HotSearch(); - hotSearch.setName(item.getOrDefault("name", "")); - hotSearch.setSort(Integer.parseInt(item.getOrDefault("sort", "0"))); + hotSearch.setName(vo.getName()); + hotSearch.setSort(vo.getSort()); hotSearchMapper.insert(hotSearch); } } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingSmsServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingSmsServiceImpl.java similarity index 90% rename from server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingSmsServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingSmsServiceImpl.java index 34c75d7c..f09605be 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingSmsServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingSmsServiceImpl.java @@ -1,7 +1,7 @@ -package com.mdd.admin.service.setting.impl; +package com.mdd.admin.service.impl; -import com.alibaba.fastjson.JSON; -import com.mdd.admin.service.setting.ISettingSmsService; +import com.alibaba.fastjson2.JSON; +import com.mdd.admin.service.ISettingSmsService; import com.mdd.common.utils.ConfigUtil; import com.mdd.common.utils.StringUtil; import org.springframework.stereotype.Service; @@ -36,14 +36,6 @@ public class SettingSmsServiceImpl implements ISettingSmsService { tencent.put("alias", "tencent"); tencent.put("status", engine.equals("tencent") ? 1 : 0); list.add(tencent); - - // todo 下个版本再实现 -// Map huawei = new LinkedHashMap<>(); -// huawei.put("name", "华为云短信"); -// huawei.put("alias", "huawei"); -// huawei.put("status", engine.equals("huawei") ? 1 : 0); -// list.add(huawei); - return list; } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingStorageServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingStorageServiceImpl.java similarity index 97% rename from server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingStorageServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingStorageServiceImpl.java index a5c21d74..b72b1933 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingStorageServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingStorageServiceImpl.java @@ -1,8 +1,8 @@ -package com.mdd.admin.service.setting.impl; +package com.mdd.admin.service.impl; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.mdd.admin.service.setting.ISettingStorageService; +import com.mdd.admin.service.ISettingStorageService; import com.mdd.common.utils.ConfigUtil; import com.mdd.common.utils.StringUtil; import org.springframework.stereotype.Service; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingUserServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingUserServiceImpl.java similarity index 51% rename from server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingUserServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingUserServiceImpl.java index 8ed9bf79..75b1ad0c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingUserServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingUserServiceImpl.java @@ -1,13 +1,12 @@ -package com.mdd.admin.service.setting.impl; +package com.mdd.admin.service.impl; -import com.mdd.admin.service.setting.ISettingUserService; +import com.mdd.admin.service.ISettingUserService; +import com.mdd.admin.validate.setting.SettingUserValidate; +import com.mdd.admin.vo.setting.SettingUserVo; import com.mdd.common.utils.ConfigUtil; import com.mdd.common.utils.UrlUtil; import org.springframework.stereotype.Service; -import java.util.LinkedHashMap; -import java.util.Map; - /** * 用户设置服务实现类 */ @@ -18,25 +17,26 @@ public class SettingUserServiceImpl implements ISettingUserService { * 用户设置详情 * * @author fzr - * @return Map + * @return SettingUserVo */ @Override - public Map detail() { + public SettingUserVo detail() { String defaultAvatar = ConfigUtil.get("user", "defaultAvatar", ""); - Map response = new LinkedHashMap<>(); - response.put("defaultAvatar", UrlUtil.toAbsoluteUrl(defaultAvatar)); - return response; + + SettingUserVo vo = new SettingUserVo(); + vo.setDefaultAvatar(UrlUtil.toAbsoluteUrl(defaultAvatar)); + return vo; } /** * 用户设置保存 * * @author fzr - * @param params 参数 + * @param userValidate 参数 */ @Override - public void save(Map params) { - ConfigUtil.set("user", "defaultAvatar", UrlUtil.toRelativeUrl(params.getOrDefault("defaultAvatar", ""))); + public void save(SettingUserValidate userValidate) { + ConfigUtil.set("user", "defaultAvatar", UrlUtil.toRelativeUrl(userValidate.getDefaultAvatar())); } } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingWebsiteServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingWebsiteServiceImpl.java new file mode 100644 index 00000000..f0e9f238 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingWebsiteServiceImpl.java @@ -0,0 +1,55 @@ +package com.mdd.admin.service.impl; + +import com.mdd.admin.service.ISettingWebsiteService; +import com.mdd.admin.validate.setting.SettingWebsiteValidate; +import com.mdd.admin.vo.setting.SettingWebsiteVo; +import com.mdd.common.utils.ConfigUtil; +import com.mdd.common.utils.UrlUtil; +import org.springframework.stereotype.Service; + +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * 网站信息配置服务实现类 + */ +@Service +public class SettingWebsiteServiceImpl implements ISettingWebsiteService { + + /** + * 获取网站信息 + * + * @author fzr + * @return Map + */ + @Override + public SettingWebsiteVo detail() { + Map config = ConfigUtil.get("website"); + + SettingWebsiteVo vo = new SettingWebsiteVo(); + vo.setName(config.getOrDefault("name", "")); + vo.setLogo(UrlUtil.toAbsoluteUrl(config.getOrDefault("logo", ""))); + vo.setFavicon(UrlUtil.toAbsoluteUrl(config.getOrDefault("favicon", ""))); + vo.setBackdrop(UrlUtil.toAbsoluteUrl(config.getOrDefault("backdrop", ""))); + vo.setShopName(config.getOrDefault("shopName", "")); + vo.setShopLogo(UrlUtil.toAbsoluteUrl(config.getOrDefault("shopLogo", ""))); + return vo; + } + + /** + * 保存网站信息 + * + * @author fzr + * @param websiteValidate 参数 + */ + @Override + public void save(SettingWebsiteValidate websiteValidate) { + ConfigUtil.set("website", "name", websiteValidate.getName()); + ConfigUtil.set("website", "logo", UrlUtil.toRelativeUrl(websiteValidate.getLogo())); + ConfigUtil.set("website", "favicon", UrlUtil.toRelativeUrl(websiteValidate.getFavicon())); + ConfigUtil.set("website", "backdrop", UrlUtil.toRelativeUrl(websiteValidate.getBackdrop())); + ConfigUtil.set("website", "shopName", websiteValidate.getShopName()); + ConfigUtil.set("website", "shopLogo", UrlUtil.toRelativeUrl(websiteValidate.getShopLogo())); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthAdminServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthAdminServiceImpl.java similarity index 69% rename from server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthAdminServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthAdminServiceImpl.java index 043bcd4f..502b9862 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthAdminServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthAdminServiceImpl.java @@ -1,6 +1,6 @@ -package com.mdd.admin.service.system.impl; +package com.mdd.admin.service.impl; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; @@ -8,14 +8,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; import com.mdd.admin.LikeAdminThreadLocal; import com.mdd.admin.config.AdminConfig; -import com.mdd.admin.service.system.ISystemAuthAdminService; -import com.mdd.admin.service.system.ISystemAuthPermService; -import com.mdd.admin.service.system.ISystemAuthRoleService; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.validate.system.SystemAuthAdminParam; -import com.mdd.admin.vo.system.SystemAuthAdminVo; -import com.mdd.admin.vo.system.SystemAuthRoleVo; -import com.mdd.admin.vo.system.SystemAuthSelfVo; +import com.mdd.admin.service.ISystemAuthAdminService; +import com.mdd.admin.service.ISystemAuthPermService; +import com.mdd.admin.service.ISystemAuthRoleService; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.system.SystemAdminCreateValidate; +import com.mdd.admin.validate.system.SystemAdminSearchValidate; +import com.mdd.admin.validate.system.SystemAdminUpInfoValidate; +import com.mdd.admin.validate.system.SystemAdminUpdateValidate; +import com.mdd.admin.vo.system.*; import com.mdd.common.config.GlobalConfig; import com.mdd.common.core.PageResult; import com.mdd.common.entity.system.SystemAuthAdmin; @@ -53,7 +54,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { * * @author fzr * @param username 主键ID - * @return SysAdmin + * @return SystemAuthAdmin */ @Override public SystemAuthAdmin findByUsername(String username) { @@ -66,16 +67,17 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { * 管理员列表 * * @author fzr - * @param pageParam 分页参数 - * @return PageResult + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult */ @Override - public PageResult list(PageParam pageParam, Map params) { - Integer page = pageParam.getPageNo(); - Integer limit = pageParam.getPageSize(); + public PageResult list(PageValidate pageValidate, SystemAdminSearchValidate searchValidate) { + Integer page = pageValidate.getPageNo(); + Integer limit = pageValidate.getPageSize(); MPJQueryWrapper mpjQueryWrapper = new MPJQueryWrapper<>(); - mpjQueryWrapper.select("t.id,t.dept_id,t.post_id,t.username,t.nickname,t.avatar," + + mpjQueryWrapper.select("t.id,t.username,t.nickname,t.avatar," + "sd.name as dept,sr.name as role,t.is_multipoint,t.is_disable," + "t.last_login_ip,t.last_login_time,t.create_time,t.update_time") .eq("t.is_delete", 0) @@ -83,19 +85,20 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { .leftJoin("?_system_auth_dept sd ON sd.id=t.dept_id".replace("?_", GlobalConfig.tablePrefix)) .orderByDesc(Arrays.asList("t.id", "t.sort")); - systemAuthAdminMapper.setSearch(mpjQueryWrapper, params, new String[]{ + + systemAuthAdminMapper.setSearch(mpjQueryWrapper, searchValidate, new String[]{ "like:username:str", "like:nickname:str", "=:role:int" }); - IPage iPage = systemAuthAdminMapper.selectJoinPage( + IPage iPage = systemAuthAdminMapper.selectJoinPage( new Page<>(page, limit), - SystemAuthAdminVo.class, + SystemAuthAdminListedVo.class, mpjQueryWrapper); - for (SystemAuthAdminVo vo : iPage.getRecords()) { - if (vo.getId() == 1) { + for (SystemAuthAdminListedVo vo : iPage.getRecords()) { + if (vo.getId().equals(1)) { vo.setRole("系统管理员"); } @@ -116,10 +119,11 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { * 当前管理员 * * @author fzr - * @return SystemSelfVo + * @param adminId 管理员ID + * @return SystemAuthAdminSelvesVo */ @Override - public SystemAuthSelfVo self(Integer adminId) { + public SystemAuthAdminSelvesVo self(Integer adminId) { // 管理员信息 SystemAuthAdmin sysAdmin = systemAuthAdminMapper.selectOne(new QueryWrapper() .select(SystemAuthAdmin.class, info-> @@ -131,14 +135,12 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { .eq("id", adminId) .last("limit 1")); - SystemAuthAdminVo systemAuthAdminVo = new SystemAuthAdminVo(); - BeanUtils.copyProperties(sysAdmin, systemAuthAdminVo); - systemAuthAdminVo.setDept(String.valueOf(sysAdmin.getDeptId())); - systemAuthAdminVo.setRole(String.valueOf(sysAdmin.getRole())); - systemAuthAdminVo.setAvatar(UrlUtil.toAbsoluteUrl(sysAdmin.getAvatar())); - systemAuthAdminVo.setUpdateTime(TimeUtil.timestampToDate(sysAdmin.getUpdateTime())); - systemAuthAdminVo.setCreateTime(TimeUtil.timestampToDate(sysAdmin.getCreateTime())); - systemAuthAdminVo.setLastLoginTime(TimeUtil.timestampToDate(sysAdmin.getLastLoginTime())); + SystemAuthAdminInformVo systemAuthAdminInformVo = new SystemAuthAdminInformVo(); + BeanUtils.copyProperties(sysAdmin, systemAuthAdminInformVo); + systemAuthAdminInformVo.setAvatar(UrlUtil.toAbsoluteUrl(sysAdmin.getAvatar())); + systemAuthAdminInformVo.setUpdateTime(TimeUtil.timestampToDate(sysAdmin.getUpdateTime())); + systemAuthAdminInformVo.setCreateTime(TimeUtil.timestampToDate(sysAdmin.getCreateTime())); + systemAuthAdminInformVo.setLastLoginTime(TimeUtil.timestampToDate(sysAdmin.getLastLoginTime())); // 角色权限 List auths = new LinkedList<>(); @@ -168,8 +170,8 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { } // 返回数据 - SystemAuthSelfVo vo = new SystemAuthSelfVo(); - vo.setUser(systemAuthAdminVo); + SystemAuthAdminSelvesVo vo = new SystemAuthAdminSelvesVo(); + vo.setUser(systemAuthAdminInformVo); vo.setPermissions(auths); return vo; } @@ -179,10 +181,10 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { * * @author fzr * @param id 主键 - * @return SysAdmin + * @return SystemAuthAdminDetailVo */ @Override - public SystemAuthAdminVo detail(Integer id) { + public SystemAuthAdminDetailVo detail(Integer id) { SystemAuthAdmin sysAdmin = systemAuthAdminMapper.selectOne(new QueryWrapper() .select(SystemAuthAdmin.class, info-> !info.getColumn().equals("salt") && @@ -195,16 +197,12 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { Assert.notNull(sysAdmin, "账号已不存在！"); - SystemAuthAdminVo vo = new SystemAuthAdminVo(); + SystemAuthAdminDetailVo vo = new SystemAuthAdminDetailVo(); BeanUtils.copyProperties(sysAdmin, vo); - - vo.setDept(String.valueOf(vo.getDeptId())); - vo.setRole(String.valueOf(sysAdmin.getRole())); vo.setAvatar(UrlUtil.toAbsoluteUrl(sysAdmin.getAvatar())); vo.setCreateTime(TimeUtil.timestampToDate(sysAdmin.getCreateTime())); vo.setUpdateTime(TimeUtil.timestampToDate(sysAdmin.getUpdateTime())); vo.setLastLoginTime(TimeUtil.timestampToDate(sysAdmin.getLastLoginTime())); - return vo; } @@ -212,45 +210,45 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { * 管理员新增 * * @author fzr - * @param systemAuthAdminParam 参数 + * @param createValidate 参数 */ @Override - public void add(SystemAuthAdminParam systemAuthAdminParam) { + public void add(SystemAdminCreateValidate createValidate) { String[] field = {"id", "username", "nickname"}; Assert.isNull(systemAuthAdminMapper.selectOne(new QueryWrapper() .select(field) .eq("is_delete", 0) - .eq("username", systemAuthAdminParam.getUsername()) + .eq("username", createValidate.getUsername()) .last("limit 1")), "账号已存在换一个吧！"); Assert.isNull(systemAuthAdminMapper.selectOne(new QueryWrapper() .select(field) .eq("is_delete", 0) - .eq("nickname", systemAuthAdminParam.getNickname()) + .eq("nickname", createValidate.getNickname()) .last("limit 1")), "昵称已存在换一个吧！"); - SystemAuthRoleVo roleVo = iSystemAuthRoleService.detail(systemAuthAdminParam.getRole()); + SystemAuthRoleVo roleVo = iSystemAuthRoleService.detail(createValidate.getRole()); Assert.notNull(roleVo, "角色不存在!"); Assert.isTrue(roleVo.getIsDisable() <= 0, "当前角色已被禁用!"); String salt = ToolsUtil.randomString(5); - String pwd = ToolsUtil.makeMd5(systemAuthAdminParam.getPassword().trim() + salt); - String avatar = StringUtil.isNotEmpty(systemAuthAdminParam.getAvatar()) ? - UrlUtil.toRelativeUrl(systemAuthAdminParam.getAvatar()) : + String pwd = ToolsUtil.makeMd5(createValidate.getPassword().trim() + salt); + String avatar = StringUtil.isNotEmpty(createValidate.getAvatar()) ? + UrlUtil.toRelativeUrl(createValidate.getAvatar()) : "/api/static/backend_avatar.png"; SystemAuthAdmin model = new SystemAuthAdmin(); - model.setDeptId(systemAuthAdminParam.getDeptId()); - model.setPostId(systemAuthAdminParam.getPostId()); - model.setUsername(systemAuthAdminParam.getUsername()); - model.setNickname(systemAuthAdminParam.getNickname()); - model.setRole(systemAuthAdminParam.getRole()); + model.setDeptId(createValidate.getDeptId()); + model.setPostId(createValidate.getPostId()); + model.setUsername(createValidate.getUsername()); + model.setNickname(createValidate.getNickname()); + model.setRole(createValidate.getRole()); model.setAvatar(avatar); model.setPassword(pwd); model.setSalt(salt); - model.setSort(systemAuthAdminParam.getSort()); - model.setIsMultipoint(systemAuthAdminParam.getIsMultipoint()); - model.setIsDisable(systemAuthAdminParam.getIsDisable()); + model.setSort(createValidate.getSort()); + model.setIsMultipoint(createValidate.getIsMultipoint()); + model.setIsDisable(createValidate.getIsDisable()); model.setCreateTime(System.currentTimeMillis() / 1000); model.setUpdateTime(System.currentTimeMillis() / 1000); systemAuthAdminMapper.insert(model); @@ -260,66 +258,66 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { * 管理员更新 * * @author fzr - * @param systemAuthAdminParam 参数 + * @param updateValidate 参数 */ @Override - public void edit(SystemAuthAdminParam systemAuthAdminParam) { + public void edit(SystemAdminUpdateValidate updateValidate) { String[] field = {"id", "username", "nickname"}; Assert.notNull(systemAuthAdminMapper.selectOne(new QueryWrapper() .select(field) - .eq("id", systemAuthAdminParam.getId()) + .eq("id", updateValidate.getId()) .eq("is_delete", 0) .last("limit 1")), "账号不存在了!"); Assert.isNull(systemAuthAdminMapper.selectOne(new QueryWrapper() .select(field) .eq("is_delete", 0) - .eq("username", systemAuthAdminParam.getUsername()) - .ne("id", systemAuthAdminParam.getId()) + .eq("username", updateValidate.getUsername()) + .ne("id", updateValidate.getId()) .last("limit 1")), "账号已存在换一个吧！"); Assert.isNull(systemAuthAdminMapper.selectOne(new QueryWrapper() .select(field) .eq("is_delete", 0) - .eq("nickname", systemAuthAdminParam.getNickname()) - .ne("id", systemAuthAdminParam.getId()) + .eq("nickname", updateValidate.getNickname()) + .ne("id", updateValidate.getId()) .last("limit 1")), "昵称已存在换一个吧！"); - if (systemAuthAdminParam.getRole() > 0 && systemAuthAdminParam.getId() != 1) { - Assert.notNull(iSystemAuthRoleService.detail(systemAuthAdminParam.getRole()), "角色不存在!"); + if (updateValidate.getRole() > 0 && updateValidate.getId() != 1) { + Assert.notNull(iSystemAuthRoleService.detail(updateValidate.getRole()), "角色不存在!"); } SystemAuthAdmin model = new SystemAuthAdmin(); - model.setId(systemAuthAdminParam.getId()); - model.setDeptId(systemAuthAdminParam.getDeptId()); - model.setPostId(systemAuthAdminParam.getPostId()); - model.setNickname(systemAuthAdminParam.getNickname()); - model.setAvatar(UrlUtil.toRelativeUrl(systemAuthAdminParam.getAvatar())); - model.setRole(systemAuthAdminParam.getId() == 1 ? 0 : systemAuthAdminParam.getRole()); - model.setSort(systemAuthAdminParam.getSort()); - model.setIsMultipoint(systemAuthAdminParam.getIsMultipoint()); - model.setIsDisable(systemAuthAdminParam.getIsDisable()); + model.setId(updateValidate.getId()); + model.setDeptId(updateValidate.getDeptId()); + model.setPostId(updateValidate.getPostId()); + model.setNickname(updateValidate.getNickname()); + model.setAvatar(UrlUtil.toRelativeUrl(updateValidate.getAvatar())); + model.setRole(updateValidate.getId() == 1 ? 0 : updateValidate.getRole()); + model.setSort(updateValidate.getSort()); + model.setIsMultipoint(updateValidate.getIsMultipoint()); + model.setIsDisable(updateValidate.getIsDisable()); model.setUpdateTime(System.currentTimeMillis() / 1000); - if (systemAuthAdminParam.getId() != 1) { - model.setUsername(systemAuthAdminParam.getUsername()); + if (updateValidate.getId() != 1) { + model.setUsername(updateValidate.getUsername()); } - if (StringUtil.isNotEmpty(systemAuthAdminParam.getPassword())) { - if (systemAuthAdminParam.getPassword().length() < 6 || systemAuthAdminParam.getPassword().length() > 20) { + if (StringUtil.isNotEmpty(updateValidate.getPassword())) { + if (updateValidate.getPassword().length() < 6 || updateValidate.getPassword().length() > 20) { throw new OperateException("密码必须在6~20位"); } String salt = ToolsUtil.randomString(5); - String pwd = ToolsUtil.makeMd5( systemAuthAdminParam.getPassword().trim() + salt); + String pwd = ToolsUtil.makeMd5( updateValidate.getPassword().trim() + salt); model.setPassword(pwd); model.setSalt(salt); } systemAuthAdminMapper.updateById(model); - this.cacheAdminUserByUid(systemAuthAdminParam.getId()); + this.cacheAdminUserByUid(updateValidate.getId()); Integer id = LikeAdminThreadLocal.getAdminId(); - if (systemAuthAdminParam.getPassword() != null && systemAuthAdminParam.getId().equals(id)) { + if (updateValidate.getPassword() != null && updateValidate.getId().equals(id)) { String token = Objects.requireNonNull(RequestUtil.handler()).getHeader("token"); RedisUtil.del(AdminConfig.backstageTokenKey + token); @@ -336,10 +334,10 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { * 当前管理员更新 * * @author fzr - * @param systemAuthAdminParam 参数 + * @param upInfoValidate 参数 */ @Override - public void upInfo(SystemAuthAdminParam systemAuthAdminParam, Integer adminId) { + public void upInfo(SystemAdminUpInfoValidate upInfoValidate, Integer adminId) { SystemAuthAdmin model = systemAuthAdminMapper.selectOne(new QueryWrapper() .select("id,username,nickname,password,salt") .eq("id", adminId) @@ -348,26 +346,26 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { Assert.notNull(model, "账号不存在了!"); - String avatar = StringUtil.isNotEmpty(systemAuthAdminParam.getAvatar()) ? - UrlUtil.toRelativeUrl(systemAuthAdminParam.getAvatar()) : + String avatar = StringUtil.isNotEmpty(upInfoValidate.getAvatar()) ? + UrlUtil.toRelativeUrl(upInfoValidate.getAvatar()) : "/api/static/backend_avatar.jpg"; model.setAvatar(avatar); - model.setNickname(systemAuthAdminParam.getNickname()); + model.setNickname(upInfoValidate.getNickname()); model.setUpdateTime(System.currentTimeMillis() / 1000); - if (systemAuthAdminParam.getPassword() != null && !systemAuthAdminParam.getPassword().equals("")) { - String currPassword = ToolsUtil.makeMd5(systemAuthAdminParam.getCurrPassword() + model.getSalt()); + if (upInfoValidate.getPassword() != null && !upInfoValidate.getPassword().equals("")) { + String currPassword = ToolsUtil.makeMd5(upInfoValidate.getCurrPassword() + model.getSalt()); if (!currPassword.equals(model.getPassword())) { throw new OperateException("当前密码不正确!"); } - if (systemAuthAdminParam.getPassword().length() > 20 || systemAuthAdminParam.getPassword().length() < 6) { + if (upInfoValidate.getPassword().length() > 20 || upInfoValidate.getPassword().length() < 6) { throw new OperateException("密码必须在6~20位!"); } String salt = ToolsUtil.randomString(5); - String pwd = ToolsUtil.makeMd5( systemAuthAdminParam.getPassword().trim() + salt); + String pwd = ToolsUtil.makeMd5( upInfoValidate.getPassword().trim() + salt); model.setPassword(pwd); model.setSalt(salt); } @@ -375,7 +373,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { systemAuthAdminMapper.updateById(model); this.cacheAdminUserByUid(adminId); - if (systemAuthAdminParam.getPassword() != null) { + if (upInfoValidate.getPassword() != null) { String token = Objects.requireNonNull(RequestUtil.handler()).getHeader("token"); RedisUtil.del(AdminConfig.backstageTokenKey + token); diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthDeptServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthDeptServiceImpl.java similarity index 80% rename from server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthDeptServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthDeptServiceImpl.java index b9afdde1..10449d41 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthDeptServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthDeptServiceImpl.java @@ -1,10 +1,12 @@ -package com.mdd.admin.service.system.impl; +package com.mdd.admin.service.impl; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.mdd.admin.service.system.ISystemAuthDeptService; -import com.mdd.admin.validate.system.SystemAuthDeptParam; +import com.mdd.admin.service.ISystemAuthDeptService; +import com.mdd.admin.validate.system.SystemDeptCreateValidate; +import com.mdd.admin.validate.system.SystemDeptSearchValidate; +import com.mdd.admin.validate.system.SystemDeptUpdateValidate; import com.mdd.admin.vo.system.SystemAuthDeptVo; import com.mdd.common.entity.system.SystemAuthAdmin; import com.mdd.common.entity.system.SystemAuthDept; @@ -34,7 +36,7 @@ class SystemAuthDeptServiceImpl implements ISystemAuthDeptService { * 岗位所有 * * @author fzr - * @return List + * @return List */ @Override public List all() { @@ -60,11 +62,11 @@ class SystemAuthDeptServiceImpl implements ISystemAuthDeptService { * 部门列表 * * @author fzr - * @param params 搜索参数 + * @param searchValidate 搜索参数 * @return JSONArray */ @Override - public JSONArray list(Map params) { + public JSONArray list(SystemDeptSearchValidate searchValidate) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("is_delete", 0); queryWrapper.orderByDesc(Arrays.asList("sort", "id")); @@ -72,7 +74,7 @@ class SystemAuthDeptServiceImpl implements ISystemAuthDeptService { !info.getColumn().equals("is_delete") && !info.getColumn().equals("delete_time")); - systemAuthDeptMapper.setSearch(queryWrapper, params, new String[]{ + systemAuthDeptMapper.setSearch(queryWrapper, searchValidate, new String[]{ "like:name:str", "=:isStop@is_stop:int" }); @@ -125,11 +127,11 @@ class SystemAuthDeptServiceImpl implements ISystemAuthDeptService { * 部门新增 * * @author fzr - * @param systemAuthDeptParam 参数 + * @param createValidate 参数 */ @Override - public void add(SystemAuthDeptParam systemAuthDeptParam) { - if (systemAuthDeptParam.getPid() == 0) { + public void add(SystemDeptCreateValidate createValidate) { + if (createValidate.getPid().equals(0)) { SystemAuthDept systemAuthDept = systemAuthDeptMapper.selectOne( new QueryWrapper() .select("id,pid,name") @@ -141,13 +143,12 @@ class SystemAuthDeptServiceImpl implements ISystemAuthDeptService { } SystemAuthDept model = new SystemAuthDept(); - model.setPid(systemAuthDeptParam.getPid()); - model.setName(systemAuthDeptParam.getName()); - model.setDuty(systemAuthDeptParam.getDuty()); - model.setMobile(systemAuthDeptParam.getMobile()); - model.setSort(systemAuthDeptParam.getSort()); - model.setIsStop(systemAuthDeptParam.getIsStop()); - model.setIsDelete(0); + model.setPid(createValidate.getPid()); + model.setName(createValidate.getName()); + model.setDuty(createValidate.getDuty()); + model.setMobile(createValidate.getMobile()); + model.setSort(createValidate.getSort()); + model.setIsStop(createValidate.getIsStop()); model.setCreateTime(System.currentTimeMillis() / 1000); model.setUpdateTime(System.currentTimeMillis() / 1000); systemAuthDeptMapper.insert(model); @@ -157,29 +158,29 @@ class SystemAuthDeptServiceImpl implements ISystemAuthDeptService { * 部门编辑 * * @author fzr - * @param systemAuthDeptParam 参数 + * @param updateValidate 参数 */ @Override - public void edit(SystemAuthDeptParam systemAuthDeptParam) { + public void edit(SystemDeptUpdateValidate updateValidate) { SystemAuthDept model = systemAuthDeptMapper.selectOne( new QueryWrapper() .select(SystemAuthDept.class, info -> !info.getColumn().equals("is_delete") && !info.getColumn().equals("delete_time")) - .eq("id", systemAuthDeptParam.getId()) + .eq("id", updateValidate.getId()) .eq("is_delete", 0) .last("limit 1")); Assert.notNull(model, "部门不存在"); - Assert.isFalse((model.getPid() == 0 && systemAuthDeptParam.getPid() > 0), "顶级部门不能修改上级"); - Assert.isFalse(systemAuthDeptParam.getId().equals(systemAuthDeptParam.getPid()), "上级部门不能是自己"); + Assert.isFalse((model.getPid().equals(0) && updateValidate.getPid()>0), "顶级部门不能修改上级"); + Assert.isFalse(updateValidate.getId().equals(updateValidate.getPid()), "上级部门不能是自己"); - model.setPid(systemAuthDeptParam.getPid()); - model.setName(systemAuthDeptParam.getName()); - model.setDuty(systemAuthDeptParam.getDuty()); - model.setMobile(systemAuthDeptParam.getMobile()); - model.setSort(systemAuthDeptParam.getSort()); - model.setIsStop(systemAuthDeptParam.getIsStop()); + model.setPid(updateValidate.getPid()); + model.setName(updateValidate.getName()); + model.setDuty(updateValidate.getDuty()); + model.setMobile(updateValidate.getMobile()); + model.setSort(updateValidate.getSort()); + model.setIsStop(updateValidate.getIsStop()); model.setUpdateTime(System.currentTimeMillis() / 1000); systemAuthDeptMapper.updateById(model); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthMenuServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthMenuServiceImpl.java similarity index 72% rename from server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthMenuServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthMenuServiceImpl.java index b45f9f9d..a0163aeb 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthMenuServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthMenuServiceImpl.java @@ -1,13 +1,14 @@ -package com.mdd.admin.service.system.impl; +package com.mdd.admin.service.impl; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.mdd.admin.LikeAdminThreadLocal; import com.mdd.admin.config.AdminConfig; -import com.mdd.admin.service.system.ISystemAuthMenuService; -import com.mdd.admin.service.system.ISystemAuthPermService; -import com.mdd.admin.validate.system.SystemAuthMenuParam; +import com.mdd.admin.service.ISystemAuthMenuService; +import com.mdd.admin.service.ISystemAuthPermService; +import com.mdd.admin.validate.system.SystemMenuCreateValidate; +import com.mdd.admin.validate.system.SystemMenuUpdateValidate; import com.mdd.admin.vo.system.SystemAuthMenuVo; import com.mdd.common.entity.system.SystemAuthMenu; import com.mdd.common.mapper.system.SystemAuthMenuMapper; @@ -126,24 +127,24 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService { * 新增菜单 * * @author fzr - * @param systemAuthMenuParam 参数 + * @param createValidate 参数 */ @Override - public void add(SystemAuthMenuParam systemAuthMenuParam) { + public void add(SystemMenuCreateValidate createValidate) { SystemAuthMenu model = new SystemAuthMenu(); - model.setPid(systemAuthMenuParam.getPid()); - model.setMenuType(systemAuthMenuParam.getMenuType()); - model.setMenuName(systemAuthMenuParam.getMenuName()); - model.setMenuIcon(systemAuthMenuParam.getMenuIcon()); - model.setMenuSort(systemAuthMenuParam.getMenuSort()); - model.setPerms(systemAuthMenuParam.getPerms()); - model.setPaths(systemAuthMenuParam.getPaths()); - model.setComponent(systemAuthMenuParam.getComponent()); - model.setSelected(systemAuthMenuParam.getSelected()); - model.setParams(systemAuthMenuParam.getParams()); - model.setIsCache(systemAuthMenuParam.getIsCache()); - model.setIsShow(systemAuthMenuParam.getIsShow()); - model.setIsDisable(systemAuthMenuParam.getIsDisable()); + model.setPid(createValidate.getPid()); + model.setMenuType(createValidate.getMenuType()); + model.setMenuName(createValidate.getMenuName()); + model.setMenuIcon(createValidate.getMenuIcon()); + model.setMenuSort(createValidate.getMenuSort()); + model.setPerms(createValidate.getPerms()); + model.setPaths(createValidate.getPaths()); + model.setComponent(createValidate.getComponent()); + model.setSelected(createValidate.getSelected()); + model.setParams(createValidate.getParams()); + model.setIsCache(createValidate.getIsCache()); + model.setIsShow(createValidate.getIsShow()); + model.setIsDisable(createValidate.getIsDisable()); model.setCreateTime(System.currentTimeMillis() / 1000); model.setUpdateTime(System.currentTimeMillis() / 1000); systemAuthMenuMapper.insert(model); @@ -155,26 +156,26 @@ public class SystemAuthMenuServiceImpl implements ISystemAuthMenuService { * 编辑菜单 * * @author fzr - * @param systemAuthMenuParam 菜单 + * @param updateValidate 菜单 */ @Override - public void edit(SystemAuthMenuParam systemAuthMenuParam) { - SystemAuthMenu model = systemAuthMenuMapper.selectOne(new QueryWrapper().eq("id", systemAuthMenuParam.getId())); + public void edit(SystemMenuUpdateValidate updateValidate) { + SystemAuthMenu model = systemAuthMenuMapper.selectOne(new QueryWrapper().eq("id", updateValidate.getId())); Assert.notNull(model, "菜单已不存在!"); - model.setMenuType(systemAuthMenuParam.getMenuType()); - model.setMenuName(systemAuthMenuParam.getMenuName()); - model.setMenuIcon(systemAuthMenuParam.getMenuIcon()); - model.setMenuSort(systemAuthMenuParam.getMenuSort()); - model.setPaths(systemAuthMenuParam.getPaths()); - model.setPerms(systemAuthMenuParam.getPerms()); - model.setComponent(systemAuthMenuParam.getComponent()); - model.setPid(systemAuthMenuParam.getPid()); - model.setSelected(systemAuthMenuParam.getSelected()); - model.setParams(systemAuthMenuParam.getParams()); - model.setIsCache(systemAuthMenuParam.getIsCache()); - model.setIsShow(systemAuthMenuParam.getIsShow()); - model.setIsDisable(systemAuthMenuParam.getIsDisable()); + model.setMenuType(updateValidate.getMenuType()); + model.setMenuName(updateValidate.getMenuName()); + model.setMenuIcon(updateValidate.getMenuIcon()); + model.setMenuSort(updateValidate.getMenuSort()); + model.setPaths(updateValidate.getPaths()); + model.setPerms(updateValidate.getPerms()); + model.setComponent(updateValidate.getComponent()); + model.setPid(updateValidate.getPid()); + model.setSelected(updateValidate.getSelected()); + model.setParams(updateValidate.getParams()); + model.setIsCache(updateValidate.getIsCache()); + model.setIsShow(updateValidate.getIsShow()); + model.setIsDisable(updateValidate.getIsDisable()); model.setUpdateTime(System.currentTimeMillis() / 1000); systemAuthMenuMapper.updateById(model); diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthPermServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthPermServiceImpl.java similarity index 97% rename from server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthPermServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthPermServiceImpl.java index c2e78d31..1027f2f9 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthPermServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthPermServiceImpl.java @@ -1,8 +1,8 @@ -package com.mdd.admin.service.system.impl; +package com.mdd.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mdd.admin.config.AdminConfig; -import com.mdd.admin.service.system.ISystemAuthPermService; +import com.mdd.admin.service.ISystemAuthPermService; import com.mdd.common.entity.system.SystemAuthMenu; import com.mdd.common.entity.system.SystemAuthPerm; import com.mdd.common.entity.system.SystemAuthRole; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthPostServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthPostServiceImpl.java similarity index 77% rename from server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthPostServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthPostServiceImpl.java index 3b1ee98f..9e8a03b2 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthPostServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthPostServiceImpl.java @@ -1,13 +1,14 @@ -package com.mdd.admin.service.system.impl; +package com.mdd.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.mdd.admin.service.system.ISystemAuthPostService; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.validate.system.SystemAuthPostParam; +import com.mdd.admin.service.ISystemAuthPostService; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.system.SystemPostCreateValidate; +import com.mdd.admin.validate.system.SystemPostSearchValidate; +import com.mdd.admin.validate.system.SystemPostUpdateValidate; import com.mdd.admin.vo.system.SystemAuthPostVo; import com.mdd.common.core.PageResult; import com.mdd.common.entity.system.SystemAuthAdmin; @@ -22,7 +23,6 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Map; /** * 系统岗位服务实现类 @@ -65,14 +65,14 @@ public class SystemAuthPostServiceImpl implements ISystemAuthPostService { * 岗位列表 * * @author fzr - * @param pageParam 分页参数 - * @param params 搜索参数 + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 * @return PageResult */ @Override - public PageResult list(PageParam pageParam, Map params) { - Integer page = pageParam.getPageNo(); - Integer limit = pageParam.getPageSize(); + public PageResult list(PageValidate pageValidate, SystemPostSearchValidate searchValidate) { + Integer page = pageValidate.getPageNo(); + Integer limit = pageValidate.getPageSize(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select(SystemAuthPost.class, info-> @@ -81,14 +81,12 @@ public class SystemAuthPostServiceImpl implements ISystemAuthPostService { .eq("is_delete", 0) .orderByDesc(Arrays.asList("sort", "id")); - systemAuthPostMapper.setSearch(queryWrapper, params, new String[]{ + systemAuthPostMapper.setSearch(queryWrapper, searchValidate, new String[]{ "like:code:str", "like:name:str", "=:isStop@is_stop:int" }); -// Page objectPage = new Page<>(page, limit); -// objectPage.addOrder(OrderItem.asc("sort")); IPage iPage = systemAuthPostMapper.selectPage(new Page<>(page, limit), queryWrapper); List list = new ArrayList<>(); @@ -135,27 +133,26 @@ public class SystemAuthPostServiceImpl implements ISystemAuthPostService { * 岗位新增 * * @author fzr - * @param systemAuthPostParam 参数 + * @param createValidate 参数 */ @Override - public void add(SystemAuthPostParam systemAuthPostParam) { + public void add(SystemPostCreateValidate createValidate) { Assert.isNull(systemAuthPostMapper.selectOne(new QueryWrapper() .select("id,code,name") .nested( - wq->wq.eq("code", systemAuthPostParam.getCode()) + wq->wq.eq("code", createValidate.getCode()) .or() - .eq("name", systemAuthPostParam.getName()) + .eq("name", createValidate.getName()) ) .eq("is_delete", 0) .last("limit 1")), "该岗位已存在"); SystemAuthPost model = new SystemAuthPost(); - model.setCode(systemAuthPostParam.getCode()); - model.setName(systemAuthPostParam.getName()); - model.setSort(systemAuthPostParam.getSort()); - model.setRemarks(systemAuthPostParam.getRemarks()); - model.setIsStop(systemAuthPostParam.getIsStop()); - model.setIsDelete(0); + model.setCode(createValidate.getCode()); + model.setName(createValidate.getName()); + model.setSort(createValidate.getSort()); + model.setRemarks(createValidate.getRemarks()); + model.setIsStop(createValidate.getIsStop()); model.setCreateTime(System.currentTimeMillis() / 1000); model.setUpdateTime(System.currentTimeMillis() / 1000); systemAuthPostMapper.insert(model); @@ -165,15 +162,15 @@ public class SystemAuthPostServiceImpl implements ISystemAuthPostService { * 岗位编辑 * * @author fzr - * @param systemAuthPostParam 参数 + * @param updateValidate 参数 */ @Override - public void edit(SystemAuthPostParam systemAuthPostParam) { + public void edit(SystemPostUpdateValidate updateValidate) { SystemAuthPost model = systemAuthPostMapper.selectOne(new QueryWrapper() .select(SystemAuthPost.class, info -> !info.getColumn().equals("is_delete") && !info.getColumn().equals("delete_time")) - .eq("id", systemAuthPostParam.getId()) + .eq("id", updateValidate.getId()) .eq("is_delete", 0) .last("limit 1")); @@ -181,20 +178,20 @@ public class SystemAuthPostServiceImpl implements ISystemAuthPostService { Assert.isNull(systemAuthPostMapper.selectOne(new QueryWrapper() .select("id,code,name") - .ne("id", systemAuthPostParam.getId()) + .ne("id", updateValidate.getId()) .nested( - wq->wq.eq("code", systemAuthPostParam.getCode()) + wq->wq.eq("code", updateValidate.getCode()) .or() - .eq("name", systemAuthPostParam.getName()) + .eq("name", updateValidate.getName()) ) .eq("is_delete", 0) .last("limit 1")), "该岗位已存在"); - model.setCode(systemAuthPostParam.getCode()); - model.setName(systemAuthPostParam.getName()); - model.setSort(systemAuthPostParam.getSort()); - model.setRemarks(systemAuthPostParam.getRemarks()); - model.setIsStop(systemAuthPostParam.getIsStop()); + model.setCode(updateValidate.getCode()); + model.setName(updateValidate.getName()); + model.setSort(updateValidate.getSort()); + model.setRemarks(updateValidate.getRemarks()); + model.setIsStop(updateValidate.getIsStop()); model.setUpdateTime(System.currentTimeMillis() / 1000); systemAuthPostMapper.updateById(model); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthRoleServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthRoleServiceImpl.java similarity index 68% rename from server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthRoleServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthRoleServiceImpl.java index 14e791a6..8050552d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthRoleServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthRoleServiceImpl.java @@ -1,14 +1,15 @@ -package com.mdd.admin.service.system.impl; +package com.mdd.admin.service.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.mdd.admin.config.AdminConfig; -import com.mdd.admin.service.system.ISystemAuthPermService; -import com.mdd.admin.service.system.ISystemAuthRoleService; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.validate.system.SystemAuthRoleParam; +import com.mdd.admin.service.ISystemAuthPermService; +import com.mdd.admin.service.ISystemAuthRoleService; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.system.SystemRoleCreateValidate; +import com.mdd.admin.validate.system.SystemRoleUpdateValidate; import com.mdd.admin.vo.system.SystemAuthRoleVo; import com.mdd.common.core.PageResult; import com.mdd.common.entity.system.SystemAuthAdmin; @@ -47,20 +48,26 @@ public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService { * @return List */ @Override - public List> all() { + public List all() { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("id,name,create_time,update_time"); + queryWrapper.select("id,name,sort,is_disable,create_time,update_time"); queryWrapper.orderByDesc(Arrays.asList("sort", "id")); List systemAuthRoles = systemAuthRoleMapper.selectList(queryWrapper); - List> list = new ArrayList<>(); + List list = new ArrayList<>(); for (SystemAuthRole systemAuthRole : systemAuthRoles) { - Map map = new LinkedHashMap<>(); - map.put("id", systemAuthRole.getId()); - map.put("name", systemAuthRole.getName()); - map.put("createTime", TimeUtil.timestampToDate(systemAuthRole.getCreateTime())); - map.put("updateTime", TimeUtil.timestampToDate(systemAuthRole.getUpdateTime())); - list.add(map); + SystemAuthRoleVo vo = new SystemAuthRoleVo(); + + vo.setId(systemAuthRole.getId()); + vo.setName(systemAuthRole.getName()); + vo.setSort(systemAuthRole.getSort()); + vo.setIsDisable(systemAuthRole.getIsDisable()); + vo.setCreateTime(TimeUtil.timestampToDate(systemAuthRole.getCreateTime())); + vo.setUpdateTime(TimeUtil.timestampToDate(systemAuthRole.getUpdateTime())); + vo.setMember(0L); + vo.setRemark(""); + vo.setMenus(Collections.EMPTY_LIST); + list.add(vo); } return list; @@ -70,13 +77,13 @@ public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService { * 角色列表 * * @author fzr - * @param pageParam 参数 + * @param pageValidate 参数 * @return PageResult */ @Override - public PageResult list(@Validated PageParam pageParam) { - Integer page = pageParam.getPageNo(); - Integer limit = pageParam.getPageSize(); + public PageResult list(@Validated PageValidate pageValidate) { + Integer page = pageValidate.getPageNo(); + Integer limit = pageValidate.getPageSize(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.orderByDesc(Arrays.asList("sort", "id")); @@ -88,7 +95,7 @@ public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService { SystemAuthRoleVo vo = new SystemAuthRoleVo(); BeanUtils.copyProperties(systemAuthRole, vo); - Integer member = systemAuthAdminMapper.selectCount(new QueryWrapper() + Long member = systemAuthAdminMapper.selectCount(new QueryWrapper() .eq("is_delete", 0) .eq("role", systemAuthRole.getId())); @@ -117,7 +124,7 @@ public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService { Assert.notNull(systemAuthRole, "角色已不存在!"); - Integer member = systemAuthAdminMapper.selectCount(new QueryWrapper() + Long member = systemAuthAdminMapper.selectCount(new QueryWrapper() .eq("is_delete", 0) .eq("role", systemAuthRole.getId())); @@ -135,59 +142,59 @@ public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService { * 新增角色 * * @author fzr - * @param systemAuthRoleParam 参数 + * @param createValidate 参数 */ @Override @Transactional - public void add(SystemAuthRoleParam systemAuthRoleParam) { + public void add(SystemRoleCreateValidate createValidate) { Assert.isNull(systemAuthRoleMapper.selectOne(new QueryWrapper() .select("id,name") - .eq("name", systemAuthRoleParam.getName().trim()) + .eq("name", createValidate.getName().trim()) .last("limit 1")), "角色名称已存在!"); SystemAuthRole model = new SystemAuthRole(); - model.setName(systemAuthRoleParam.getName().trim()); - model.setRemark(systemAuthRoleParam.getRemark()); - model.setSort(systemAuthRoleParam.getSort()); - model.setIsDisable(systemAuthRoleParam.getIsDisable()); + model.setName(createValidate.getName().trim()); + model.setRemark(createValidate.getRemark()); + model.setSort(createValidate.getSort()); + model.setIsDisable(createValidate.getIsDisable()); model.setCreateTime(System.currentTimeMillis() / 1000); model.setUpdateTime(System.currentTimeMillis() / 1000); systemAuthRoleMapper.insert(model); - iSystemAuthPermService.batchSaveByMenuIds(model.getId(), systemAuthRoleParam.getMenuIds()); + iSystemAuthPermService.batchSaveByMenuIds(model.getId(), createValidate.getMenuIds()); } /** * 编辑角色 * * @author fzr - * @param systemAuthRoleParam 参数 + * @param updateValidate 参数 */ @Override @Transactional - public void edit(SystemAuthRoleParam systemAuthRoleParam) { + public void edit(SystemRoleUpdateValidate updateValidate) { Assert.notNull(systemAuthRoleMapper.selectOne(new QueryWrapper() .select("id,name") - .eq("id", systemAuthRoleParam.getId()) + .eq("id", updateValidate.getId()) .last("limit 1")), "角色已不存在!"); Assert.isNull(systemAuthRoleMapper.selectOne(new QueryWrapper() .select("id,name") - .ne("id", systemAuthRoleParam.getId()) - .eq("name", systemAuthRoleParam.getName().trim()) + .ne("id", updateValidate.getId()) + .eq("name", updateValidate.getName().trim()) .last("limit 1")), "角色名称已存在!"); SystemAuthRole model = new SystemAuthRole(); - model.setId(systemAuthRoleParam.getId()); - model.setName(systemAuthRoleParam.getName().trim()); - model.setRemark(systemAuthRoleParam.getRemark()); - model.setSort(systemAuthRoleParam.getSort()); - model.setIsDisable(systemAuthRoleParam.getIsDisable()); + model.setId(updateValidate.getId()); + model.setName(updateValidate.getName().trim()); + model.setRemark(updateValidate.getRemark()); + model.setSort(updateValidate.getSort()); + model.setIsDisable(updateValidate.getIsDisable()); model.setUpdateTime(System.currentTimeMillis() / 1000); systemAuthRoleMapper.updateById(model); - iSystemAuthPermService.batchDeleteByRoleId(systemAuthRoleParam.getId()); - iSystemAuthPermService.batchSaveByMenuIds(systemAuthRoleParam.getId(), systemAuthRoleParam.getMenuIds()); - iSystemAuthPermService.cacheRoleMenusByRoleId(systemAuthRoleParam.getId()); + iSystemAuthPermService.batchDeleteByRoleId(updateValidate.getId()); + iSystemAuthPermService.batchSaveByMenuIds(updateValidate.getId(), updateValidate.getMenuIds()); + iSystemAuthPermService.cacheRoleMenusByRoleId(updateValidate.getId()); } /** diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemLoginServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemLoginServiceImpl.java similarity index 82% rename from server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemLoginServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemLoginServiceImpl.java index ef521582..1826e43e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemLoginServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemLoginServiceImpl.java @@ -1,9 +1,9 @@ -package com.mdd.admin.service.system.impl; +package com.mdd.admin.service.impl; import com.mdd.admin.config.AdminConfig; -import com.mdd.admin.service.system.ISystemAuthAdminService; -import com.mdd.admin.service.system.ISystemLoginService; -import com.mdd.admin.validate.system.SystemLoginParam; +import com.mdd.admin.service.ISystemAuthAdminService; +import com.mdd.admin.service.ISystemLoginService; +import com.mdd.admin.validate.system.SystemAdminLoginsValidate; import com.mdd.common.entity.system.SystemAuthAdmin; import com.mdd.common.entity.system.SystemLogLogin; import com.mdd.common.enums.HttpEnum; @@ -43,29 +43,29 @@ public class SystemLoginServiceImpl implements ISystemLoginService { * 登录 * * @author fzr - * @param systemLoginParam 登录参数 + * @param loginsValidate 登录参数 * @return token */ @Override - public Map login(SystemLoginParam systemLoginParam) { - String username = systemLoginParam.getUsername(); - String password = systemLoginParam.getPassword(); + public Map login(SystemAdminLoginsValidate loginsValidate) { + String username = loginsValidate.getUsername(); + String password = loginsValidate.getPassword(); SystemAuthAdmin sysAdmin = iSystemAuthAdminService.findByUsername(username); if (sysAdmin == null || sysAdmin.getIsDelete() == 1) { - this.recordLoginLog(0, systemLoginParam.getUsername(), HttpEnum.LOGIN_ACCOUNT_ERROR.getMsg()); + this.recordLoginLog(0, loginsValidate.getUsername(), HttpEnum.LOGIN_ACCOUNT_ERROR.getMsg()); throw new LoginException(HttpEnum.LOGIN_ACCOUNT_ERROR.getCode(), HttpEnum.LOGIN_ACCOUNT_ERROR.getMsg()); } if (sysAdmin.getIsDisable() == 1) { - this.recordLoginLog(sysAdmin.getId(), systemLoginParam.getUsername(), HttpEnum.LOGIN_DISABLE_ERROR.getMsg()); + this.recordLoginLog(sysAdmin.getId(), loginsValidate.getUsername(), HttpEnum.LOGIN_DISABLE_ERROR.getMsg()); throw new LoginException(HttpEnum.LOGIN_DISABLE_ERROR.getCode(), HttpEnum.LOGIN_DISABLE_ERROR.getMsg()); } String newPWd = password + sysAdmin.getSalt(); String md5Pwd = ToolsUtil.makeMd5(newPWd); if (!md5Pwd.equals(sysAdmin.getPassword())) { - this.recordLoginLog(sysAdmin.getId(), systemLoginParam.getUsername(), HttpEnum.LOGIN_ACCOUNT_ERROR.getMsg()); + this.recordLoginLog(sysAdmin.getId(), loginsValidate.getUsername(), HttpEnum.LOGIN_ACCOUNT_ERROR.getMsg()); throw new LoginException(HttpEnum.LOGIN_ACCOUNT_ERROR.getCode(), HttpEnum.LOGIN_ACCOUNT_ERROR.getMsg()); } @@ -95,13 +95,13 @@ public class SystemLoginServiceImpl implements ISystemLoginService { systemAuthAdminMapper.updateById(sysAdmin); // 记录登录日志 - this.recordLoginLog(sysAdmin.getId(), systemLoginParam.getUsername(), ""); + this.recordLoginLog(sysAdmin.getId(), loginsValidate.getUsername(), ""); return response; } catch (Exception e) { Integer adminId = StringUtil.isNotNull(sysAdmin.getId()) ? sysAdmin.getId() : 0; String error = StringUtil.isEmpty(e.getMessage()) ? "未知错误" : e.getMessage(); - this.recordLoginLog(adminId, systemLoginParam.getUsername(), error); + this.recordLoginLog(adminId, loginsValidate.getUsername(), error); throw new OperateException(e.getMessage()); } } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemLogsServerImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemLogsServerImpl.java similarity index 68% rename from server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemLogsServerImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemLogsServerImpl.java index 02269971..d691c06d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemLogsServerImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemLogsServerImpl.java @@ -1,13 +1,15 @@ -package com.mdd.admin.service.system.impl; +package com.mdd.admin.service.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.mdd.admin.service.system.ISystemLogsServer; -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.vo.system.LogLoginVo; -import com.mdd.admin.vo.system.LogOperateVo; +import com.mdd.admin.service.ISystemLogsServer; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.system.SystemSearchLoginsValidate; +import com.mdd.admin.validate.system.SystemSearchOperateValidate; +import com.mdd.admin.vo.system.SystemLogLoginVo; +import com.mdd.admin.vo.system.SystemLogOperateVo; import com.mdd.common.config.GlobalConfig; import com.mdd.common.core.PageResult; import com.mdd.common.entity.system.SystemLogLogin; @@ -22,7 +24,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.LinkedList; import java.util.List; -import java.util.Map; /** * 系统日志服务实现类 @@ -40,14 +41,14 @@ public class SystemLogsServerImpl implements ISystemLogsServer { * 系统操作日志 * * @author fzr - * @param pageParam 分页参数 - * @param params 搜索参数 + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 * @return PageResult */ @Override - public PageResult operate(PageParam pageParam, Map params) { - Integer pageNo = pageParam.getPageNo(); - Integer pageSize = pageParam.getPageSize(); + public PageResult operate(PageValidate pageValidate, SystemSearchOperateValidate searchValidate) { + Integer pageNo = pageValidate.getPageNo(); + Integer pageSize = pageValidate.getPageSize(); MPJQueryWrapper mpjQueryWrapper = new MPJQueryWrapper() .selectAll(SystemLogOperate.class) @@ -55,7 +56,7 @@ public class SystemLogsServerImpl implements ISystemLogsServer { .leftJoin("?_system_auth_admin sa ON sa.id=t.admin_id".replace("?_", GlobalConfig.tablePrefix)) .orderByDesc("id"); - logOperateMapper.setSearch(mpjQueryWrapper, params, new String[]{ + logOperateMapper.setSearch(mpjQueryWrapper, searchValidate, new String[]{ "like:title:str", "like:username@sa.username:str", "like:ip:str", @@ -65,12 +66,12 @@ public class SystemLogsServerImpl implements ISystemLogsServer { "datetime:startTime-endTime@t.create_time:str" }); - IPage iPage = logOperateMapper.selectJoinPage( + IPage iPage = logOperateMapper.selectJoinPage( new Page<>(pageNo, pageSize), - LogOperateVo.class, + SystemLogOperateVo.class, mpjQueryWrapper); - for (LogOperateVo vo : iPage.getRecords()) { + for (SystemLogOperateVo vo : iPage.getRecords()) { vo.setTaskTime(vo.getTaskTime()); vo.setStartTime(TimeUtil.timestampToDate(vo.getStartTime())); vo.setEndTime(TimeUtil.timestampToDate(vo.getEndTime())); @@ -85,18 +86,18 @@ public class SystemLogsServerImpl implements ISystemLogsServer { * 系统登录日志 * * @author fzr - * @param pageParam 分页参数 - * @param params 搜索参数 + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 * @return PageResult */ @Override - public PageResult login(PageParam pageParam, Map params) { - Integer pageNo = pageParam.getPageNo(); - Integer pageSize = pageParam.getPageSize(); + public PageResult login(PageValidate pageValidate, SystemSearchLoginsValidate searchValidate) { + Integer pageNo = pageValidate.getPageNo(); + Integer pageSize = pageValidate.getPageSize(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.orderByDesc("id"); - logLoginMapper.setSearch(queryWrapper, params, new String[]{ + logLoginMapper.setSearch(queryWrapper, searchValidate, new String[]{ "like:username:str", "=:status:int", "datetime:startTime-endTime@create_time:str" @@ -104,9 +105,9 @@ public class SystemLogsServerImpl implements ISystemLogsServer { IPage iPage = logLoginMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper); - List list = new LinkedList<>(); + List list = new LinkedList<>(); for (SystemLogLogin item : iPage.getRecords()) { - LogLoginVo vo = new LogLoginVo(); + SystemLogLoginVo vo = new SystemLogLoginVo(); BeanUtils.copyProperties(item, vo); vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/user/impl/UserServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/UsersServiceImpl.java similarity index 84% rename from server/like-admin/src/main/java/com/mdd/admin/service/user/impl/UserServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/UsersServiceImpl.java index 7f823929..1b4d6e28 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/user/impl/UserServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/UsersServiceImpl.java @@ -1,11 +1,13 @@ -package com.mdd.admin.service.user.impl; +package com.mdd.admin.service.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.mdd.admin.service.user.IUserService; -import com.mdd.admin.validate.common.PageParam; +import com.mdd.admin.service.IUsersService; +import com.mdd.admin.validate.UsersSearchValidate; +import com.mdd.admin.validate.UsersUpdateValidate; +import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.user.UserVo; import com.mdd.common.core.PageResult; import com.mdd.common.entity.user.User; @@ -28,7 +30,7 @@ import java.util.regex.Pattern; * 用户服务实现类 */ @Service -public class UserServiceImpl implements IUserService { +public class UsersServiceImpl implements IUsersService { @Resource UserMapper userMapper; @@ -37,14 +39,14 @@ public class UserServiceImpl implements IUserService { * 用户列表 * * @author fzr - * @param pageParam (分页参数) - * @param params (搜索参数) + * @param pageValidate (分页参数) + * @param searchValidate (搜索参数) * @return PageResult */ @Override - public PageResult list(PageParam pageParam, Map params) { - Integer pageNo = pageParam.getPageNo(); - Integer pageSize = pageParam.getPageSize(); + public PageResult list(PageValidate pageValidate, UsersSearchValidate searchValidate) { + Integer pageNo = pageValidate.getPageNo(); + Integer pageSize = pageValidate.getPageSize(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("is_delete", 0); @@ -57,15 +59,15 @@ public class UserServiceImpl implements IUserService { !info.getColumn().equals("salt") ); - if (StringUtil.isNotEmpty(params.get("keyword"))) { - String keyword = params.get("keyword"); + if (StringUtil.isNotNull(searchValidate.getKeyword()) && StringUtil.isNotEmpty(searchValidate.getKeyword())) { + String keyword = searchValidate.getKeyword(); queryWrapper.nested(wq->wq .like("sn", keyword).or() .like("nickname", keyword).or() .like("mobile", keyword)); } - userMapper.setSearch(queryWrapper, params, new String[]{ + userMapper.setSearch(queryWrapper, searchValidate, new String[]{ "=:channel:int", "datetime:startTime-endTime@create_time:str" }); @@ -137,13 +139,13 @@ public class UserServiceImpl implements IUserService { * 用户编辑 * * @author fzr - * @param params 参数 + * @param updateValidate 参数 */ @Override - public void edit(Map params) { - Integer id = Integer.parseInt(params.get("id")); - String field = params.get("field").trim(); - String value = params.get("value").trim(); + public void edit(UsersUpdateValidate updateValidate) { + Integer id = updateValidate.getId(); + String field = updateValidate.getField(); + String value = updateValidate.getValue(); User user = userMapper.selectOne(new QueryWrapper() .eq("id", id) diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingCopyrightService.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingCopyrightService.java deleted file mode 100644 index 2a58487c..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingCopyrightService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mdd.admin.service.setting; - -import java.util.List; -import java.util.Map; - -/** - * 网站备案服务接口类 - */ -public interface ISettingCopyrightService { - - /** - * 获取网站备案信息 - * - * @author fzr - * @return Map - */ - List> detail(); - - /** - * 保存网站备案信息 - * - * @author fzr - * @param params 参数 - */ - void save(List> params); - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingLoginService.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingLoginService.java deleted file mode 100644 index f1d52c85..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingLoginService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.mdd.admin.service.setting; - -import java.util.Map; - -/** - * 登录设置服务接口类 - */ -public interface ISettingLoginService { - - /** - * 登录设置详情 - * - * @author fzr - * @return Map - */ - Map detail(); - - /** - * 登录设置保存 - * - * @author fzr - * @param params 参数 - */ - void save(Map params); - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingProtocolService.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingProtocolService.java deleted file mode 100644 index 4d717ad9..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingProtocolService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.mdd.admin.service.setting; - -import java.util.Map; - -/** - * 政策协议服务接口类 - */ -public interface ISettingProtocolService { - - /** - * 获取政策协议信息 - * - * @author fzr - * @return Map - */ - Map> detail(); - - /** - * 保存政策协议信息 - * - * @author fzr - * @param params 参数 - */ - void save(Map params); - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingSearchService.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingSearchService.java deleted file mode 100644 index 2891e733..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingSearchService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mdd.admin.service.setting; - -import java.util.Map; - -/** - * 热门搜索服务接口类 - */ -public interface ISettingSearchService { - - /** - * 热门搜索详情 - * - * @author fzr - * @return Map - */ - Map detail(); - - /** - * 热门搜索新增 - * - * @author fzr - * @param params 参数 - */ - void save(Map params); - - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingUserService.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingUserService.java deleted file mode 100644 index ea8d9d87..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingUserService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.mdd.admin.service.setting; - -import java.util.Map; - -/** - * 用户设置服务接口类 - */ -public interface ISettingUserService { - - /** - * 用户设置详情 - * - * @author fzr - * @return Map - */ - Map detail(); - - /** - * 用户设置保存 - * - * @author fzr - * @param params 参数 - */ - void save(Map params); - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingWebsiteService.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingWebsiteService.java deleted file mode 100644 index a239c990..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingWebsiteService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.mdd.admin.service.setting; - -import java.util.Map; - -/** - * 网站信息服务接口类 - */ -public interface ISettingWebsiteService { - - /** - * 获取网站信息 - * - * @author fzr - * @return Map - */ - Map detail(); - - /** - * 保存网站信息 - * - * @author fzr - * @param params 参数 - */ - void save(Map params); - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingCopyrightServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingCopyrightServiceImpl.java deleted file mode 100644 index 3caed730..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingCopyrightServiceImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.mdd.admin.service.setting.impl; - -import com.alibaba.fastjson.JSON; -import com.mdd.admin.service.setting.ISettingCopyrightService; -import com.mdd.common.utils.ArrayUtil; -import com.mdd.common.utils.ConfigUtil; -import com.mdd.common.utils.StringUtil; -import org.springframework.stereotype.Service; - -import java.util.*; - -/** - * 网站备案服务实现类 - */ -@Service -public class SettingCopyrightServiceImpl implements ISettingCopyrightService { - - /** - * 获取网站备案信息 - * - * @author fzr - * @return List> - */ - @Override - public List> detail() { - String config = ConfigUtil.get("website", "copyright", "[]"); - return ArrayUtil.stringToListAsMapStr(config); - } - - /** - * 保存网站备案信息 - * - * @author fzr - * @param params 参数 - */ - @Override - public void save(List> params) { - List> list = new LinkedList<>(); - for (Map item : params) { - Map map = new LinkedHashMap<>(); - if (StringUtil.isNotEmpty(item.get("name")) || StringUtil.isNotEmpty(item.get("link"))) { - map.put("name", item.get("name")); - map.put("link", item.get("link")); - list.add(map); - } - } - ConfigUtil.set("website", "copyright", JSON.toJSONString(list)); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingLoginServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingLoginServiceImpl.java deleted file mode 100644 index 993b81a3..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingLoginServiceImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.mdd.admin.service.setting.impl; - -import com.mdd.admin.service.setting.ISettingLoginService; -import com.mdd.common.utils.ArrayUtil; -import com.mdd.common.utils.ConfigUtil; -import org.springframework.stereotype.Service; - -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * 登录设置服务接口类 - */ -@Service -public class SettingLoginServiceImpl implements ISettingLoginService { - - /** - * 登录设置详情 - * - * @author fzr - * @return Map - */ - @Override - public Map detail() { - Map config = ConfigUtil.get("login"); - Map response = new LinkedHashMap<>(); - // 登录方式 - response.put("loginWay", ArrayUtil.stringToListAsInt(config.getOrDefault("loginWay", ""), ",")); - // 强制绑定手机 - response.put("forceBindMobile", Integer.parseInt(config.getOrDefault("forceBindMobile", "0"))); - // 是否开启协议 - response.put("openAgreement", Integer.parseInt(config.getOrDefault("openAgreement", "0"))); - // 第三方的登录 - response.put("openOtherAuth", Integer.parseInt(config.getOrDefault("openOtherAuth", "0"))); - // 自动登录授权 - response.put("autoLoginAuth", ArrayUtil.stringToListAsInt(config.getOrDefault("autoLoginAuth", ""), ",")); - return response; - } - - /** - * 登录设置保存 - * - * @author fzr - * @param params 参数 - */ - @Override - public void save(Map params) { - ConfigUtil.set("login", "loginWay", params.getOrDefault("loginWay", "")); - ConfigUtil.set("login", "forceBindMobile", params.getOrDefault("forceBindMobile", "0")); - ConfigUtil.set("login", "openAgreement", params.getOrDefault("openAgreement", "0")); - ConfigUtil.set("login", "openOtherAuth", params.getOrDefault("openOtherAuth", "0")); - ConfigUtil.set("login", "autoLoginAuth", params.getOrDefault("autoLoginAuth", "")); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingProtocolServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingProtocolServiceImpl.java deleted file mode 100644 index 6a162bf3..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingProtocolServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.mdd.admin.service.setting.impl; - -import com.alibaba.fastjson.JSON; -import com.mdd.admin.service.setting.ISettingProtocolService; -import com.mdd.common.utils.ConfigUtil; -import com.mdd.common.utils.ToolsUtil; -import org.springframework.stereotype.Service; - -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * 政策接口服务实现类 - */ -@Service -public class SettingProtocolServiceImpl implements ISettingProtocolService { - - /** - * 获取政策协议信息 - * - * @author fzr - * @return Map> - */ - @Override - public Map> detail() { - String service = ConfigUtil.get("protocol", "service", "{\"name\":\"\",\"content\":\"\"}"); - String privacy = ConfigUtil.get("protocol", "privacy", "{\"name\":\"\",\"content\":\"\"}"); - - Map> map = new LinkedHashMap<>(); - map.put("service", ToolsUtil.jsonToMap(service)); - map.put("privacy", ToolsUtil.jsonToMap(privacy)); - return map; - } - - /** - * 保存政策协议信息 - * - * @author fzr - * @param params 参数 - */ - @Override - public void save(Map params) { - ConfigUtil.set("protocol","service", JSON.toJSONString(params.get("service"))); - ConfigUtil.set("protocol","privacy", JSON.toJSONString(params.get("privacy"))); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingWebsiteServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingWebsiteServiceImpl.java deleted file mode 100644 index 199b4dc8..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingWebsiteServiceImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.mdd.admin.service.setting.impl; - -import com.mdd.admin.service.setting.ISettingWebsiteService; -import com.mdd.common.utils.ConfigUtil; -import com.mdd.common.utils.UrlUtil; -import org.springframework.stereotype.Service; - -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * 网站信息配置服务实现类 - */ -@Service -public class SettingWebsiteServiceImpl implements ISettingWebsiteService { - - /** - * 获取网站信息 - * - * @author fzr - * @return Map - */ - @Override - public Map detail() { - Map config = ConfigUtil.get("website"); - - Map map = new LinkedHashMap<>(); - map.put("name", config.getOrDefault("name", "")); - map.put("logo", UrlUtil.toAbsoluteUrl(config.getOrDefault("logo", ""))); - map.put("favicon", UrlUtil.toAbsoluteUrl(config.getOrDefault("favicon", ""))); - map.put("backdrop", UrlUtil.toAbsoluteUrl(config.getOrDefault("backdrop", ""))); - - map.put("shopName", config.getOrDefault("shopName", "")); - map.put("shopLogo", UrlUtil.toAbsoluteUrl(config.getOrDefault("shopLogo", ""))); - - return map; - } - - /** - * 保存网站信息 - * - * @author fzr - * @param params 参数 - */ - @Override - public void save(Map params) { - ConfigUtil.set("website", "name", params.getOrDefault("name", "")); - ConfigUtil.set("website", "logo", UrlUtil.toRelativeUrl(params.getOrDefault("logo", ""))); - ConfigUtil.set("website", "favicon", UrlUtil.toRelativeUrl(params.getOrDefault("favicon", ""))); - ConfigUtil.set("website", "backdrop", UrlUtil.toRelativeUrl(params.getOrDefault("backdrop", ""))); - - ConfigUtil.set("website", "shopName", params.getOrDefault("shopName", "")); - ConfigUtil.set("website", "shopLogo", UrlUtil.toRelativeUrl(params.getOrDefault("shopLogo", ""))); - } - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthAdminService.java b/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthAdminService.java deleted file mode 100644 index 660a9131..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemAuthAdminService.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.mdd.admin.service.system; - -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.validate.system.SystemAuthAdminParam; -import com.mdd.admin.vo.system.SystemAuthAdminVo; -import com.mdd.admin.vo.system.SystemAuthSelfVo; -import com.mdd.common.core.PageResult; -import com.mdd.common.entity.system.SystemAuthAdmin; - -import java.util.Map; - -/** - * 系统管理员服务接口类 - */ -public interface ISystemAuthAdminService { - - /** - * 根据账号查找管理员 - * - * @author fzr - * @param username 主键ID - * @return SysAdmin - */ - SystemAuthAdmin findByUsername(String username); - - /** - * 管理员列表 - * - * @author fzr - * @param pageParam 分页参数 - * @return PageResult - */ - PageResult list(PageParam pageParam, Map params); - - /** - * 当前管理员 - * - * @author fzr - * @return SystemSelfVo - */ - SystemAuthSelfVo self(Integer adminId); - - /** - * 管理员详情 - * - * @author fzr - * @param id 主键参数 - * @return SysAdmin - */ - SystemAuthAdminVo detail(Integer id); - - /** - * 管理员新增 - * - * @author fzr - * @param systemAuthAdminParam 参数 - */ - void add(SystemAuthAdminParam systemAuthAdminParam); - - /** - * 管理员编辑 - * - * @author fzr - * @param systemAuthAdminParam 参数 - */ - void edit(SystemAuthAdminParam systemAuthAdminParam); - - /** - * 当前管理员更新 - * - * @author fzr - * @param systemAuthAdminParam 参数 - */ - void upInfo(SystemAuthAdminParam systemAuthAdminParam, 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/mdd/admin/service/system/ISystemLogsServer.java b/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemLogsServer.java deleted file mode 100644 index 4f8cae60..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/ISystemLogsServer.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.mdd.admin.service.system; - -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.vo.system.LogLoginVo; -import com.mdd.admin.vo.system.LogOperateVo; -import com.mdd.common.core.PageResult; - -import java.util.Map; - -/** - * 系统日志服务类接口类 - */ -public interface ISystemLogsServer { - - /** - * 系统操作日志 - * - * @author fzr - * @param pageParam 分页参数 - * @param params 搜索参数 - * @return PageResult - */ - PageResult operate(PageParam pageParam, Map params); - - /** - * 系统登录日志 - * - * @param pageParam 分页参数 - * @param params 搜索参数 - * @return PageResult - */ - PageResult login(PageParam pageParam, Map params); - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/user/IUserService.java b/server/like-admin/src/main/java/com/mdd/admin/service/user/IUserService.java deleted file mode 100644 index 3e6c4bec..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/service/user/IUserService.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.mdd.admin.service.user; - -import com.mdd.admin.validate.common.PageParam; -import com.mdd.admin.vo.user.UserVo; -import com.mdd.common.core.PageResult; - -import java.util.Map; - -/** - * 用户服务接口类 - */ -public interface IUserService { - - /** - * 用户列表 - * - * @author fzr - * @param pageParam (分页参数) - * @param params (搜索参数) - * @return PageResult - */ - PageResult list(PageParam pageParam, Map params); - - /** - * 用户详情 - * - * @author fzr - * @param id 主键 - * @return UserVo - */ - UserVo detail(Integer id); - - /** - * 用户编辑 - * - * @author fzr - * @param params 参数 - */ - void edit(Map params); - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumCateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumCateValidate.java new file mode 100644 index 00000000..74afec55 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumCateValidate.java @@ -0,0 +1,32 @@ +package com.mdd.admin.validate; + +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 附件分类参数 + */ +@Data +public class AlbumCateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "缺少pid参数") + @Min(value = 0, message = "pid参数必须为数字") + private Integer pid; + + @NotNull(message = "缺少type参数") + @IntegerContains(values = {10, 20, 30}, message = "type不在合法值内") + private Integer type; + + @NotEmpty(message = "名称不能为空") + @Length(min = 1, max = 30, message = "名称不能大于30个字符") + private String name; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumMoveValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumMoveValidate.java new file mode 100644 index 00000000..11d50f1d --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumMoveValidate.java @@ -0,0 +1,23 @@ +package com.mdd.admin.validate; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * 附件移动参数 + */ +@Data +public class AlbumMoveValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "ids参数缺失") + private List ids; + + @NotNull(message = "cid参数缺失") + private Integer cid; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumRenameValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumRenameValidate.java new file mode 100644 index 00000000..2a7c39f8 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumRenameValidate.java @@ -0,0 +1,24 @@ +package com.mdd.admin.validate; + +import com.mdd.common.validator.annotation.IDMust; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; + +/** + * 附件重命名参数 + */ +@Data +public class AlbumRenameValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @IDMust(message = "id参数必传且需大于0") + private Integer id; + + @NotEmpty(message = "名称不能为空") + @Length(min = 1, max = 30, message = "名称不能大于30个字符") + private String name; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumSearchValidate.java new file mode 100644 index 00000000..12deeac2 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumSearchValidate.java @@ -0,0 +1,21 @@ +package com.mdd.admin.validate; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 附件搜索参数 + */ +@Data +public class AlbumSearchValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer cid; + + private Integer type; + + private String keyword; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/ArtCateCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/ArtCateCreateValidate.java new file mode 100644 index 00000000..342f0ecf --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/ArtCateCreateValidate.java @@ -0,0 +1,32 @@ +package com.mdd.admin.validate; + +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 文章分类创建参数 + */ +@Data +public class ArtCateCreateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotEmpty(message = "分类名称不能为空") + @Length(min = 1, max = 60, message = "分类名称不能大于60个字符") + private String name; + + @NotNull(message = "排序号不能为空") + @DecimalMin(value = "0", message = "排序号值不能少于0") + private Integer sort; + + @NotNull(message = "缺少isShow参数") + @IntegerContains(values = {0, 1}, message = "isShow不是合法值") + private Integer isShow; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/ArtCateSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/ArtCateSearchValidate.java new file mode 100644 index 00000000..5b7be1e5 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/ArtCateSearchValidate.java @@ -0,0 +1,19 @@ +package com.mdd.admin.validate; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 文章分类搜索参数 + */ +@Data +public class ArtCateSearchValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private String name; + + private Integer isShow; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/ArtCateUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/ArtCateUpdateValidate.java new file mode 100644 index 00000000..feb4ddd9 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/ArtCateUpdateValidate.java @@ -0,0 +1,36 @@ +package com.mdd.admin.validate; + +import com.mdd.common.validator.annotation.IDMust; +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 文章分类更新参数 + */ +@Data +public class ArtCateUpdateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @IDMust(message = "id参数必传且需大于0") + private Integer id; + + @NotEmpty(message = "分类名称不能为空") + @Length(min = 1, max = 60, message = "分类名称不能大于60个字符") + private String name; + + @NotNull(message = "排序号不能为空") + @DecimalMin(value = "0", message = "排序号值不能少于0") + private Integer sort; + + @NotNull(message = "缺少isShow参数") + @IntegerContains(values = {0, 1}, message = "isShow不是合法值") + private Integer isShow; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/ArticleCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/ArticleCreateValidate.java new file mode 100644 index 00000000..c1a3d77f --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/ArticleCreateValidate.java @@ -0,0 +1,51 @@ +package com.mdd.admin.validate; + +import com.mdd.common.validator.annotation.IDMust; +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 文章创建参数 + */ +@Data +public class ArticleCreateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @IDMust(message = "cid参数必传且需大于0") + private Integer cid; + + @NotEmpty(message = "文章标题不能为空") + @Length(min = 1, max = 200, message = "文章标题不能大于200个字符") + private String title; + + @Length(max = 200, message = "简介不能超出200个字符") + private String intro = ""; + + @Length(max = 200, message = "图片链接过长不能超200个字符") + private String image = ""; + + @Length(max = 32, message = "作者名称不能超32个字符") + private String author = ""; + + @NotNull(message = "排序号不能为空") + @DecimalMin(value = "0", message = "排序号值不能少于0") + private Integer sort; + + @NotNull(message = "缺少isShow参数") + @IntegerContains(values = {0, 1}, message = "isShow不是合法值") + private Integer isShow; + + private String content = ""; + + private String summary = ""; + + private Integer visit = 0; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/ArticleSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/ArticleSearchValidate.java new file mode 100644 index 00000000..16d06a51 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/ArticleSearchValidate.java @@ -0,0 +1,25 @@ +package com.mdd.admin.validate; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 文章搜索参数 + */ +@Data +public class ArticleSearchValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private String title; + + private Integer cid; + + private Integer isShow; + + private String startTime; + + private String endTime; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/ArticleUpdateValidate.java similarity index 50% rename from server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleParam.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/ArticleUpdateValidate.java index f4564d49..d6051b77 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/ArticleUpdateValidate.java @@ -1,50 +1,48 @@ -package com.mdd.admin.validate.article; +package com.mdd.admin.validate; -import com.mdd.admin.validate.BaseParam; import com.mdd.common.validator.annotation.IDMust; import com.mdd.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.NotEmpty; import javax.validation.constraints.NotNull; +import java.io.Serializable; /** - * 文章参数 + * 文章更新参数 */ @Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class ArticleParam extends BaseParam { +public class ArticleUpdateValidate implements Serializable { - @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class, change.class}) + private static final long serialVersionUID = 1L; + + @IDMust(message = "id参数必传且需大于0") private Integer id; - @IDMust(message = "cid参数必传且需大于0", groups = {create.class, update.class}) + @IDMust(message = "cid参数必传且需大于0") private Integer cid; - @NotEmpty(message = "文章标题不能为空", groups = {create.class, update.class}) - @Length(min = 1, max = 200, message = "文章标题不能大于200个字符", groups = {create.class, update.class}) + @NotEmpty(message = "文章标题不能为空") + @Length(min = 1, max = 200, message = "文章标题不能大于200个字符") private String title; - @Length(max = 200, message = "简介不能超出200个字符", groups = {create.class, update.class}) + @Length(max = 200, message = "简介不能超出200个字符") private String intro = ""; - @Length(max = 200, message = "图片链接过长不能超200个字符", groups = {create.class, update.class}) + @Length(max = 200, message = "图片链接过长不能超200个字符") private String image = ""; - @Length(max = 32, message = "作者名称不能超32个字符", groups = {create.class, update.class}) + @Length(max = 32, message = "作者名称不能超32个字符") private String author = ""; - @NotNull(message = "排序号不能为空", groups = {create.class, update.class}) - @DecimalMin(value = "0", message = "排序号值不能少于0", groups = {create.class, update.class}) + @NotNull(message = "排序号不能为空") + @DecimalMin(value = "0", message = "排序号值不能少于0") private Integer sort; - @NotNull(message = "缺少isShow参数", groups = {create.class, update.class}) - @IntegerContains(values = {0, 1}, message = "isShow不是合法值", groups = {create.class, update.class}) + @NotNull(message = "缺少isShow参数") + @IntegerContains(values = {0, 1}, message = "isShow不是合法值") private Integer isShow; private String content = ""; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/BaseParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/BaseParam.java deleted file mode 100644 index 788d1592..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/BaseParam.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.mdd.admin.validate; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class BaseParam implements Serializable { - - private static final long serialVersionUID = 1L; - - public interface create{} - public interface update{} - public interface delete{} - public interface change{} - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/decorate/DecoratePageParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/DecoratePageValidate.java similarity index 54% rename from server/like-admin/src/main/java/com/mdd/admin/validate/decorate/DecoratePageParam.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/DecoratePageValidate.java index 3c3a7f4d..168508e9 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/decorate/DecoratePageParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/DecoratePageValidate.java @@ -1,20 +1,19 @@ -package com.mdd.admin.validate.decorate; +package com.mdd.admin.validate; + -import com.mdd.admin.validate.BaseParam; import com.mdd.common.validator.annotation.IDMust; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; +import java.io.Serializable; /** * 页面装修参数类 */ @Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class DecoratePageParam extends BaseParam { +public class DecoratePageValidate implements Serializable { + + private static final long serialVersionUID = 1L; @IDMust(message = "id参数必传且需大于0") private Integer id; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/DecorateTabsValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/DecorateTabsValidate.java new file mode 100644 index 00000000..2401828e --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/DecorateTabsValidate.java @@ -0,0 +1,23 @@ +package com.mdd.admin.validate; + + +import com.mdd.admin.vo.decorate.DecorateTabsListsVo; +import com.mdd.admin.vo.decorate.DecorateTabsStyleVo; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 底部导航装修参数 + */ +@Data +public class DecorateTabsValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private DecorateTabsStyleVo style; + + private List list; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/UsersSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/UsersSearchValidate.java new file mode 100644 index 00000000..0fac6665 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/UsersSearchValidate.java @@ -0,0 +1,23 @@ +package com.mdd.admin.validate; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 用户搜索参数 + */ +@Data +public class UsersSearchValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer channel; + + private String keyword; + + private String startTime; + + private String endTime; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/UsersUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/UsersUpdateValidate.java new file mode 100644 index 00000000..25c6da81 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/UsersUpdateValidate.java @@ -0,0 +1,21 @@ +package com.mdd.admin.validate; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 用户更新参数 + */ +@Data +public class UsersUpdateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; + + private String field; + + private String value; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/article/CategoryParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/article/CategoryParam.java deleted file mode 100644 index aa7e5b7d..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/article/CategoryParam.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.mdd.admin.validate.article; - -import com.mdd.admin.validate.BaseParam; -import com.mdd.common.validator.annotation.IDMust; -import com.mdd.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.NotEmpty; -import javax.validation.constraints.NotNull; - -/** - * 文章分类参数 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class CategoryParam extends BaseParam { - - @IDMust(message = "id参数必传且需大于0", groups = {delete.class, change.class}) - private Integer id; - - @NotEmpty(message = "分类名称不能为空", groups = {create.class, update.class}) - @Length(min = 1, max = 60, message = "分类名称不能大于60个字符", groups = {create.class, update.class}) - private String name; - - @NotNull(message = "排序号不能为空", groups = {create.class, update.class}) - @DecimalMin(value = "0", message = "排序号值不能少于0", groups = {create.class, update.class}) - private Integer sort; - - @NotNull(message = "缺少isShow参数", groups = {create.class, update.class}) - @IntegerContains(values = {0, 1}, message = "isShow不是合法值", groups = {create.class, update.class}) - private Integer isShow; - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelH5Param.java b/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelH5Validate.java similarity index 73% rename from server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelH5Param.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelH5Validate.java index d69090c9..f7e0a432 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelH5Param.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelH5Validate.java @@ -1,21 +1,19 @@ package com.mdd.admin.validate.channel; -import com.mdd.admin.validate.BaseParam; import com.mdd.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; /** * H5渠道参数 */ @Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class ChannelH5Param extends BaseParam { +public class ChannelH5Validate implements Serializable { + + private static final long serialVersionUID = 1L; @NotNull(message = "status参数缺失") @IntegerContains(values = {0, 1}, message = "status不是合法值") diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelMpParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelMpValidate.java similarity index 74% rename from server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelMpParam.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelMpValidate.java index 3f5cb97c..a38eb557 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelMpParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelMpValidate.java @@ -1,18 +1,17 @@ package com.mdd.admin.validate.channel; -import com.mdd.admin.validate.BaseParam; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; +import java.io.Serializable; + /** * 小程序渠道参数 */ @Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class ChannelMpParam extends BaseParam { +public class ChannelMpValidate implements Serializable { + + private static final long serialVersionUID = 1L; @Length(max = 100, message = "小程序名称不能超100个字符") private String name = ""; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelOaReplyParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelOaReplyParam.java deleted file mode 100644 index 49d10870..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelOaReplyParam.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.mdd.admin.validate.channel; - -import com.mdd.admin.validate.BaseParam; -import com.mdd.common.validator.annotation.IntegerContains; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - -/** - * 渠道公众号回复管理参数 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class ChannelOaReplyParam extends BaseParam { - - public interface defaults{} - public interface keywords{} - public interface follow{} - - private Integer id; - - @NotNull(message = "name参数缺失", groups = {defaults.class, keywords.class, follow.class}) - @NotEmpty(message = "规则名称不能为空", groups = {defaults.class, keywords.class, follow.class}) - private String name; - - @NotNull(message = "content参数缺失", groups = {defaults.class, keywords.class, follow.class}) - @NotEmpty(message = "回复内容不能为空", groups = {defaults.class, keywords.class, follow.class}) - private String content; - - @NotNull(message = "contentType参数缺失", groups = {defaults.class, keywords.class, follow.class}) - @IntegerContains(values = {1, 2}, message = "contentType值不符合规范", groups = {defaults.class, keywords.class, follow.class}) - private Integer contentType; - - @NotNull(message = "status参数缺失", groups = {defaults.class, keywords.class, follow.class}) - @IntegerContains(values = {0, 1}, message = "状态选择异常", groups = {defaults.class, keywords.class, follow.class}) - private Integer status; - - @NotNull(message = "keyword参数缺失", groups = {keywords.class}) - @NotEmpty(message = "关键词不能为空", groups = {keywords.class}) - private String keyword; - - @NotNull(message = "matchingType参数缺失", groups = {keywords.class}) - @IntegerContains(values = {1, 2}, message = "匹配方式异常", groups = {defaults.class, keywords.class, follow.class}) - private Integer matchingType; - - @NotNull(message = "sort参数缺失", groups = {follow.class}) - private Integer sort; - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelOaParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelOaValidate.java similarity index 83% rename from server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelOaParam.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelOaValidate.java index fbe60baf..1a3d1913 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelOaParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelOaValidate.java @@ -1,19 +1,18 @@ package com.mdd.admin.validate.channel; -import com.mdd.admin.validate.BaseParam; import com.mdd.common.validator.annotation.IntegerContains; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; +import java.io.Serializable; + /** * 公众号渠道参数 */ @Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class ChannelOaParam extends BaseParam { +public class ChannelOaValidate implements Serializable { + + private static final long serialVersionUID = 1L; @Length(max = 100, message = "小程序名称不能超100个字符") private String name = ""; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelRpDefaultValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelRpDefaultValidate.java new file mode 100644 index 00000000..300d8d4e --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelRpDefaultValidate.java @@ -0,0 +1,39 @@ +package com.mdd.admin.validate.channel; + +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 公众号默认回复 + */ +@Data +public class ChannelRpDefaultValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; + + @NotNull(message = "name参数缺失") + @NotEmpty(message = "规则名称不能为空") + private String name; + + @NotNull(message = "content参数缺失") + @NotEmpty(message = "回复内容不能为空") + private String content; + + @NotNull(message = "contentType参数缺失") + @IntegerContains(values = {1, 2}, message = "contentType值不符合规范") + private Integer contentType; + + @NotNull(message = "status参数缺失") + @IntegerContains(values = {0, 1}, message = "状态选择异常") + private Integer status; + + @NotNull(message = "sort参数缺失") + private Integer sort; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelRpFollowsValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelRpFollowsValidate.java new file mode 100644 index 00000000..175fb0f0 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelRpFollowsValidate.java @@ -0,0 +1,39 @@ +package com.mdd.admin.validate.channel; + +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 公众号关注回复 + */ +@Data +public class ChannelRpFollowsValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; + + @NotNull(message = "name参数缺失") + @NotEmpty(message = "规则名称不能为空") + private String name; + + @NotNull(message = "content参数缺失") + @NotEmpty(message = "回复内容不能为空") + private String content; + + @NotNull(message = "contentType参数缺失") + @IntegerContains(values = {1, 2}, message = "contentType值不符合规范") + private Integer contentType; + + @NotNull(message = "status参数缺失") + @IntegerContains(values = {0, 1}, message = "状态选择异常") + private Integer status; + + @NotNull(message = "sort参数缺失") + private Integer sort; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelRpKeywordValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelRpKeywordValidate.java new file mode 100644 index 00000000..9cdeccfe --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelRpKeywordValidate.java @@ -0,0 +1,47 @@ +package com.mdd.admin.validate.channel; + +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 公众号关键词回复 + */ +@Data +public class ChannelRpKeywordValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; + + @NotNull(message = "name参数缺失") + @NotEmpty(message = "规则名称不能为空") + private String name; + + @NotNull(message = "content参数缺失") + @NotEmpty(message = "回复内容不能为空") + private String content; + + @NotNull(message = "contentType参数缺失") + @IntegerContains(values = {1, 2}) + private Integer contentType; + + @NotNull(message = "status参数缺失") + @IntegerContains(values = {0, 1}, message = "状态选择异常") + private Integer status; + + @NotNull(message = "keyword参数缺失") + @NotEmpty(message = "关键词不能为空") + private String keyword; + + @NotNull(message = "matchingType参数缺失") + @IntegerContains(values = {1, 2}) + private Integer matchingType; + + @NotNull(message = "sort参数缺失") + private Integer sort; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelWxParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelWxParam.java deleted file mode 100644 index 921c4e69..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/channel/ChannelWxParam.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.mdd.admin.validate.channel; - -import com.mdd.admin.validate.BaseParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.hibernate.validator.constraints.Length; - -/** - * 开放平台渠道参数 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class ChannelWxParam extends BaseParam { - - @Length(max = 100, message = "appId不能超100个字符") - private String appId = ""; - - @Length(max = 200, message = "appSecret不能超100个字符") - private String appSecret = ""; - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/common/AlbumParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/common/AlbumParam.java deleted file mode 100644 index fc9c66f4..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/common/AlbumParam.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.mdd.admin.validate.common; - -import com.mdd.admin.validate.BaseParam; -import com.mdd.common.validator.annotation.IDMust; -import com.mdd.common.validator.annotation.IntegerContains; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.hibernate.validator.constraints.Length; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - -/** - * 相册参数 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class AlbumParam extends BaseParam { - - public interface rename{} - public interface cateAdd{} - public interface albumMove{} - - @IDMust(message = "id参数必传且需大于0", groups = {rename.class, albumMove.class, delete.class}) - private Integer id; - - @IDMust(message = "id参数必传且需大于0", groups = {albumMove.class}) - private Integer cid; - - @NotNull(message = "缺少pid参数", groups = {cateAdd.class}) - @Min(value = 0, message = "pid参数必须为数字", groups = {cateAdd.class}) - private Integer pid; - - @NotNull(message = "缺少type参数", groups = {cateAdd.class}) - @IntegerContains(values = {10, 20, 30}, message = "type不在合法值内", groups = {cateAdd.class}) - private Integer type; - - @NotEmpty(message = "名称不能为空", groups = {rename.class}) - @Length(min = 1, max = 30, message = "名称不能大于30个字符", groups = {rename.class}) - private String name; - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/common/IDParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/common/IDParam.java deleted file mode 100644 index 0296eaa7..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/common/IDParam.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mdd.admin.validate.common; - -import com.mdd.common.validator.annotation.IDMust; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * ID参数 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class IDParam { - - @IDMust(message = "id参数必传且需大于0") - private Integer id; - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/commons/IdValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/commons/IdValidate.java new file mode 100644 index 00000000..5451fc1f --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/commons/IdValidate.java @@ -0,0 +1,19 @@ +package com.mdd.admin.validate.commons; + +import com.mdd.common.validator.annotation.IDMust; +import lombok.Data; + +import java.io.Serializable; + +/** + * ID参数 + */ +@Data +public class IdValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @IDMust(message = "id参数必传且需大于0") + private Integer id; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/commons/IdsValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/commons/IdsValidate.java new file mode 100644 index 00000000..9e9d20bd --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/commons/IdsValidate.java @@ -0,0 +1,20 @@ +package com.mdd.admin.validate.commons; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * IDS参数 + */ +@Data +public class IdsValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "ids参数缺失") + private List ids; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/common/PageParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/commons/PageValidate.java similarity index 66% rename from server/like-admin/src/main/java/com/mdd/admin/validate/common/PageParam.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/commons/PageValidate.java index 3a0b9633..a80c739e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/common/PageParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/commons/PageValidate.java @@ -1,20 +1,18 @@ -package com.mdd.admin.validate.common; +package com.mdd.admin.validate.commons; -import com.mdd.admin.validate.BaseParam; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; import javax.validation.constraints.DecimalMax; import javax.validation.constraints.DecimalMin; +import java.io.Serializable; /** * 分页参数 */ @Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class PageParam extends BaseParam { +public class PageValidate implements Serializable { + + private static final long serialVersionUID = 1L; // 当前分页 @DecimalMin(value = "1", message = "pageNo参数必须大于0的数字") diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/decorate/DecorateTabbarParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/decorate/DecorateTabbarParam.java deleted file mode 100644 index bd15954a..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/decorate/DecorateTabbarParam.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.mdd.admin.validate.decorate; - -import com.mdd.admin.validate.BaseParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class DecorateTabbarParam extends BaseParam { - - - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictDataCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictDataCreateValidate.java new file mode 100644 index 00000000..362f31b9 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictDataCreateValidate.java @@ -0,0 +1,40 @@ +package com.mdd.admin.validate.setting; + +import com.mdd.common.validator.annotation.IDMust; +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 字典数据创建参数 + */ +@Data +public class DictDataCreateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @IDMust(message = "typeId参数必传且需大于0") + private Integer typeId; + + @NotNull(message = "name参数缺失") + private String name; + + @NotNull(message = "value参数缺失") + @Length(max = 100, message = "键名不能超出100个字符") + private String value; + + @Length(max = 200, message = "数值不能超出200个字符") + private String remark; + + @DecimalMin(value = "0", message = "排序号值不能少于0") + private Integer sort; + + @NotNull(message = "status参数缺失") + @IntegerContains(values = {0, 1}, message = "status参数不在合法值内") + private Integer status; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictDataParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictDataParam.java deleted file mode 100644 index 2117c06c..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictDataParam.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.mdd.admin.validate.setting; - -import com.mdd.admin.validate.BaseParam; -import com.mdd.common.validator.annotation.IDMust; -import com.mdd.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.util.List; - -/** - * 字典数据参数 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class DictDataParam extends BaseParam { - - @IDMust(message = "id参数必传且需大于0", groups = {update.class}) - private Integer id; - - @NotNull(message = "ids参数缺失", groups = {delete.class}) - private List ids; - - @IDMust(message = "typeId参数必传且需大于0", groups = {create.class, update.class}) - private Integer typeId; - - @NotNull(message = "name参数缺失", groups = {create.class, update.class}) - private String name; - - @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/mdd/admin/validate/setting/DictDataUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictDataUpdateValidate.java new file mode 100644 index 00000000..fc11d7d5 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictDataUpdateValidate.java @@ -0,0 +1,43 @@ +package com.mdd.admin.validate.setting; + +import com.mdd.common.validator.annotation.IDMust; +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 字典数据更新参数 + */ +@Data +public class DictDataUpdateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @IDMust(message = "id参数必传且需大于0") + private Integer id; + + @IDMust(message = "typeId参数必传且需大于0") + private Integer typeId; + + @NotNull(message = "name参数缺失") + private String name; + + @NotNull(message = "value参数缺失") + @Length(max = 100, message = "键名不能超出100个字符") + private String value; + + @Length(max = 200, message = "数值不能超出200个字符") + private String remark; + + @DecimalMin(value = "0", message = "排序号值不能少于0") + private Integer sort; + + @NotNull(message = "status参数缺失") + @IntegerContains(values = {0, 1}, message = "status参数不在合法值内") + private Integer status; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictTypeCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictTypeCreateValidate.java new file mode 100644 index 00000000..e7917a4f --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictTypeCreateValidate.java @@ -0,0 +1,33 @@ +package com.mdd.admin.validate.setting; + +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 字典类型创建参数 + */ +@Data +public class DictTypeCreateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "dictName参数缺失") + @Length(max = 200, message = "名称不能超出200个字符") + private String dictName; + + @NotNull(message = "dictType参数缺失") + @Length(max = 200, message = "类型不能超出200个字符") + private String dictType; + + @Length(max = 200, message = "备注不能超出200个字符") + private String dictRemark; + + @NotNull(message = "dictStatus参数缺失") + @IntegerContains(values = {0, 1}, message = "dictStatus参数不在合法值内") + private Integer dictStatus; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictTypeParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictTypeParam.java deleted file mode 100644 index 0031ead1..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictTypeParam.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.mdd.admin.validate.setting; - -import com.mdd.admin.validate.BaseParam; -import com.mdd.common.validator.annotation.IDMust; -import com.mdd.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.util.List; - -/** - * 字典类型参数 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class DictTypeParam extends BaseParam { - - @IDMust(message = "id参数必传且需大于0", groups = {update.class}) - private Integer id; - - @NotNull(message = "ids参数缺失", groups = {delete.class}) - private List ids; - - @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 Integer dictStatus; - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictTypeUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictTypeUpdateValidate.java new file mode 100644 index 00000000..9eed1c78 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/DictTypeUpdateValidate.java @@ -0,0 +1,37 @@ +package com.mdd.admin.validate.setting; + +import com.mdd.common.validator.annotation.IDMust; +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 字典类型更新参数 + */ +@Data +public class DictTypeUpdateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @IDMust(message = "id参数必传且需大于0") + private Integer id; + + @NotNull(message = "dictName参数缺失") + @Length(max = 200, message = "名称不能超出200个字符") + private String dictName; + + @NotNull(message = "dictType参数缺失") + @Length(max = 200, message = "类型不能超出200个字符") + private String dictType; + + @Length(max = 200, message = "备注不能超出200个字符") + private String dictRemark; + + @NotNull(message = "dictStatus参数缺失") + @IntegerContains(values = {0, 1}, message = "dictStatus参数不在合法值内") + private Integer dictStatus; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingCopyrightValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingCopyrightValidate.java new file mode 100644 index 00000000..470d43cc --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingCopyrightValidate.java @@ -0,0 +1,19 @@ +package com.mdd.admin.validate.setting; + +import com.mdd.admin.vo.setting.SettingCopyrightVo; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 版权信息设置参数 + */ +@Data +public class SettingCopyrightValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private List list; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingLoginValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingLoginValidate.java new file mode 100644 index 00000000..f1364512 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingLoginValidate.java @@ -0,0 +1,26 @@ +package com.mdd.admin.validate.setting; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 登录信息设置参数 + */ +@Data +public class SettingLoginValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private String loginWay = ""; + + private Integer forceBindMobile = 0; + + private Integer openAgreement = 0; + + private Integer openOtherAuth = 0; + + private String autoLoginAuth = ""; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingProtocolValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingProtocolValidate.java new file mode 100644 index 00000000..53c5fe5d --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingProtocolValidate.java @@ -0,0 +1,20 @@ +package com.mdd.admin.validate.setting; + +import com.mdd.admin.vo.setting.SettingProtocolObjectVo; +import lombok.Data; + +import java.io.Serializable; + +/** + * 政策协议设置参数 + */ +@Data +public class SettingProtocolValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private SettingProtocolObjectVo service; + + private SettingProtocolObjectVo privacy; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingSearchValidate.java new file mode 100644 index 00000000..71dca0ba --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingSearchValidate.java @@ -0,0 +1,21 @@ +package com.mdd.admin.validate.setting; + +import com.mdd.admin.vo.setting.SettingSearchObjectVo; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 热门搜索设置参数 + */ +@Data +public class SettingSearchValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer isHotSearch; + + private List list; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingUserValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingUserValidate.java new file mode 100644 index 00000000..6139d405 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingUserValidate.java @@ -0,0 +1,17 @@ +package com.mdd.admin.validate.setting; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 用户设置参数 + */ +@Data +public class SettingUserValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private String defaultAvatar = ""; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingWebsiteValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingWebsiteValidate.java new file mode 100644 index 00000000..eefae6b9 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingWebsiteValidate.java @@ -0,0 +1,22 @@ +package com.mdd.admin.validate.setting; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 基础设置参数 + */ +@Data +public class SettingWebsiteValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private String name = ""; + private String logo = ""; + private String favicon = ""; + private String backdrop = ""; + private String shopName = ""; + private String shopLogo = ""; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminCreateValidate.java new file mode 100644 index 00000000..73dbf0ab --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminCreateValidate.java @@ -0,0 +1,58 @@ +package com.mdd.admin.validate.system; + +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 系统管理员创建参数 + */ +@Data +public class SystemAdminCreateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "请选择角色") + @Min(value = 0, message = "role参数异常") + private Integer role; + + @NotEmpty(message = "账号不能为空") + @Length(min = 2, max = 20, message = "账号必须在2~20个字符内") + private String username; + + @NotEmpty(message = "昵称不能为空") + @Length(min = 2, max = 30, message = "昵称必须在2~30个字符内") + private String nickname; + + @NotEmpty(message = "密码不能为空") + @Length(min = 6, max = 32, message = "密码必须在6~32个字符内") + private String password; + + @NotNull(message = "请选择是否禁用") + @IntegerContains(values = {0, 1}) + private Integer isDisable; + + @NotNull(message = "请选择是否支持多端登录") + @IntegerContains(values = {0, 1}) + private Integer isMultipoint; + + @NotNull(message = "排序号不能为空") + @DecimalMin(value = "0", message = "排序号值不能少于0") + private Integer sort = 0; + + @DecimalMin(value = "0", message = "部门ID值不能少于0") + private Integer deptId = 0; + + @DecimalMin(value = "0", message = "岗位ID值不能少于0") + private Integer postId = 0; + + @Length(max = 200, message = "头像不能超出200个字符") + private String avatar = ""; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemLoginParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminLoginsValidate.java similarity index 68% rename from server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemLoginParam.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminLoginsValidate.java index 006fbc29..bbacd8e1 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemLoginParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminLoginsValidate.java @@ -1,20 +1,18 @@ package com.mdd.admin.validate.system; -import com.mdd.admin.validate.BaseParam; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotEmpty; +import java.io.Serializable; /** * 系统登录参数 */ @Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class SystemLoginParam extends BaseParam { +public class SystemAdminLoginsValidate implements Serializable { + + private static final long serialVersionUID = 1L; @NotEmpty(message = "账号不能为空") @Length(min = 2, max = 20, message = "账号或密码错误") diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminSearchValidate.java new file mode 100644 index 00000000..e975644b --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminSearchValidate.java @@ -0,0 +1,21 @@ +package com.mdd.admin.validate.system; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 系统管理员搜索参数 + */ +@Data +public class SystemAdminSearchValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private String username; + + private String nickname; + + private Integer role; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminUpInfoValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminUpInfoValidate.java new file mode 100644 index 00000000..42a8ac2c --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminUpInfoValidate.java @@ -0,0 +1,37 @@ +package com.mdd.admin.validate.system; + +import com.mdd.common.validator.annotation.IDMust; +import org.hibernate.validator.constraints.Length; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; + +/** + * 系统管理员自更新参数 + */ +@Data +public class SystemAdminUpInfoValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @IDMust(message = "id参数必传且需大于0") + private Integer id; + + @NotEmpty(message = "昵称不能为空") + @Length(min = 2, max = 30, message = "昵称必须在2~30个字符内") + private String nickname; + + @Length(min = 6, max = 32, message = "密码必须在6~32个字符内") + private String password; + + @Length(min = 6, max = 32, message = "当前密码错误") + private String currPassword; + + @Length(min = 6, max = 32, message = "旧密码错误") + private String oldPassword; + + @Length(max = 200, message = "头像不能超出200个字符") + private String avatar = ""; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminUpdateValidate.java new file mode 100644 index 00000000..b233b306 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAdminUpdateValidate.java @@ -0,0 +1,62 @@ +package com.mdd.admin.validate.system; + +import com.mdd.common.validator.annotation.IDMust; +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 系统管理员更新参数 + */ +@Data +public class SystemAdminUpdateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @IDMust(message = "id参数必传且需大于0") + private Integer id; + + @NotNull(message = "请选择角色") + @Min(value = 0, message = "role参数异常") + private Integer role; + + @NotEmpty(message = "账号不能为空") + @Length(min = 2, max = 20, message = "账号必须在2~20个字符内") + private String username; + + @NotEmpty(message = "昵称不能为空") + @Length(min = 2, max = 30, message = "昵称必须在2~30个字符内") + private String nickname; + + @NotEmpty(message = "密码不能为空") + @Length(min = 6, max = 32, message = "密码必须在6~32个字符内") + private String password; + + @NotNull(message = "请选择是否禁用") + @IntegerContains(values = {0, 1}) + private Integer isDisable; + + @NotNull(message = "请选择是否支持多端登录") + @IntegerContains(values = {0, 1}) + private Integer isMultipoint; + + @NotNull(message = "排序号不能为空") + @DecimalMin(value = "0", message = "排序号值不能少于0") + private Integer sort = 0; + + @DecimalMin(value = "0", message = "部门ID值不能少于0") + private Integer deptId = 0; + + @DecimalMin(value = "0", message = "岗位ID值不能少于0") + private Integer postId = 0; + + @Length(max = 200, message = "头像不能超出200个字符") + private String avatar = ""; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthAdminParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthAdminParam.java deleted file mode 100644 index 4042569c..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthAdminParam.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.mdd.admin.validate.system; - -import com.mdd.admin.validate.BaseParam; -import com.mdd.common.validator.annotation.IDMust; -import com.mdd.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.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - -/** - * 系统管理员参数 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class SystemAuthAdminParam extends BaseParam { - - public interface upInfo{} - - @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class}) - private Integer id; - - @NotNull(message = "请选择角色", groups = {create.class, update.class}) - @Min(value = 0, message = "role参数异常", groups = {create.class, update.class}) - private Integer role; - - @NotEmpty(message = "账号不能为空", groups = {create.class, update.class}) - @Length(min = 2, max = 20, message = "账号必须在2~20个字符内", groups = {create.class, update.class}) - private String username; - - @NotEmpty(message = "昵称不能为空", groups = {create.class, update.class, upInfo.class}) - @Length(min = 2, max = 30, message = "昵称必须在2~30个字符内", groups = {create.class, update.class, upInfo.class}) - private String nickname; - - @NotEmpty(message = "密码不能为空", groups = {create.class}) - @Length(min = 6, max = 32, message = "密码必须在6~32个字符内", groups = {create.class}) - private String password; - - @Length(min = 6, max = 32, message = "当前密码错误", groups = {upInfo.class}) - private String currPassword; - - @NotNull(message = "请选择状态", groups = {create.class, update.class}) - @IntegerContains(values = {0, 1}, message = "isDisable参数不在合法值内", groups = {create.class, update.class}) - private Integer isDisable; - - @NotNull(message = "请选择是否支持多端登录", groups = {create.class, update.class}) - @IntegerContains(values = {0, 1}, message = "isMultipoint参数不在合法值内", groups = {create.class, update.class}) - private Integer isMultipoint; - - @NotNull(message = "排序号不能为空", groups = {create.class, update.class}) - @DecimalMin(value = "0", message = "排序号值不能少于0", groups = {create.class, update.class}) - private Integer sort = 0; - - private Integer deptId = 0; - - private Integer postId = 0; - - private String avatar = ""; - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthDeptParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthDeptParam.java deleted file mode 100644 index af87611b..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthDeptParam.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.mdd.admin.validate.system; - -import com.mdd.admin.validate.BaseParam; -import com.mdd.common.validator.annotation.IDMust; -import com.mdd.common.validator.annotation.IntegerContains; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.hibernate.validator.constraints.Length; - -import javax.validation.constraints.DecimalMax; -import javax.validation.constraints.DecimalMin; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; - -/** - * 系统部门参数 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class SystemAuthDeptParam extends BaseParam { - - @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class}) - private Integer id; - - @NotNull(message = "pid参数缺失", groups = {create.class, update.class}) - @DecimalMin(value = "0", message = "上级值不能少于0", groups = {create.class, update.class}) - private Integer pid; - - @NotNull(message = "name参数缺失", groups = {create.class, update.class}) - @Length(min = 1, max = 100, message = "部门名称必须在1~100个字符内", groups = {create.class, update.class}) - private String name; - - @Length(min = 1, max = 30, message = "负责人名称必须在1~30个字符内", groups = {create.class, update.class}) - private String duty = ""; - - @Length(min = 11, max = 11, message = "手机号只能为11位", groups = {create.class, update.class}) - @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "手机号格式有误", groups = {create.class, update.class}) - private String mobile = ""; - - @NotNull(message = "请选择状态", groups = {create.class, update.class}) - @IntegerContains(values = {0, 1}, groups = {create.class, update.class}) - private Integer isStop = 0; - - @NotNull(message = "排序号不能为空", groups = {create.class, update.class}) - @DecimalMin(value = "0", message = "排序号值不能少于0", groups = {create.class, update.class}) - @DecimalMax(value = "9999", message = "排序号值不能大于9999", groups = {create.class, update.class}) - private Integer sort = 0; -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthMenuParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthMenuParam.java deleted file mode 100644 index e21027d6..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthMenuParam.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.mdd.admin.validate.system; - -import com.mdd.admin.validate.BaseParam; -import com.mdd.common.validator.annotation.IDMust; -import com.mdd.common.validator.annotation.IntegerContains; -import com.mdd.common.validator.annotation.StringContains; -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; - -/** - * 系统菜单参数 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class SystemAuthMenuParam extends BaseParam { - - @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class}) - private Integer id; - - @NotNull(message = "上级菜单不能为空", groups = {create.class, update.class}) - @DecimalMin(value = "0", message = "上级菜单值不能少于0", groups = {create.class, update.class}) - private Integer pid; - - @NotNull(message = "缺少参数menuType", groups = {create.class, update.class}) - @StringContains(values = {"M", "C", "A"}, message = "菜单类型不是合法值(M,C,A)", groups = {create.class, update.class}) - private String menuType; - - @NotNull(message = "缺少参数menuName", groups = {create.class, update.class}) - @Length(min = 1, max = 30, message = "菜单名称必须在1~30个字符内", groups = {create.class, update.class}) - private String menuName; - - @Length(max = 100, message = "图标名称不能超过100个字符", groups = {create.class, update.class}) - private String menuIcon; - - @NotNull(message = "排序号不能为空", groups = {create.class, update.class}) - @DecimalMin(value = "0", message = "排序号值不能少于0", groups = {create.class, update.class}) - private Integer menuSort; - - @Length(max = 100, message = "权限字符不能超过100个字符", groups = {create.class, update.class}) - private String perms; - - @Length(max = 200, message = "路由地址不能超过200个字符", groups = {create.class, update.class}) - private String paths; - - @Length(max = 200, message = "前端组件不能超过200个字符", groups = {create.class, update.class}) - private String component; - - @Length(max = 200, message = "选中菜单路径不能超过200个字符", groups = {create.class, update.class}) - private String selected; - - @Length(max = 200, message = "路由参数不能超过200个字符", groups = {create.class, update.class}) - private String params; - - @NotNull(message = "请选择缓存状态", groups = {create.class, update.class}) - @IntegerContains(values = {0, 1}, groups = {create.class, update.class}) - private Integer isCache; - - @NotNull(message = "请选择显示状态", groups = {create.class, update.class}) - @IntegerContains(values = {0, 1}, groups = {create.class, update.class}) - private Integer isShow; - - @NotNull(message = "请选择菜单状态", groups = {create.class, update.class}) - @IntegerContains(values = {0, 1}, groups = {create.class, update.class}) - private Integer isDisable; - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthPostParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthPostParam.java deleted file mode 100644 index df72fc50..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthPostParam.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.mdd.admin.validate.system; - -import com.mdd.admin.validate.BaseParam; -import com.mdd.common.validator.annotation.IDMust; -import com.mdd.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; - -/** - * 系统岗位Vo - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class SystemAuthPostParam extends BaseParam { - - @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class}) - private Integer id; - - @NotNull(message = "code参数缺失", groups = {create.class, update.class}) - @Length(min = 1, max = 30, message = "岗位编码必须在1~30个字符内", groups = {create.class, update.class}) - private String code; - - @NotNull(message = "name参数缺失", groups = {create.class, update.class}) - @Length(min = 1, max = 30, message = "岗位名称必须在1~30个字符内", groups = {create.class, update.class}) - private String name; - - @NotNull(message = "请选择状态", groups = {create.class, update.class}) - @IntegerContains(values = {0, 1}, groups = {create.class, update.class}) - private Integer isStop = 0; - - @Length( max = 250, message = "岗位备注不能大于250个字符内", groups = {create.class, update.class}) - private String remarks = ""; - @NotNull(message = "排序号不能为空", groups = {create.class, update.class}) - @DecimalMin(value = "0", message = "排序号值不能少于0", groups = {create.class, update.class}) - private Integer sort = 0; - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemDeptCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemDeptCreateValidate.java new file mode 100644 index 00000000..0ebdbb0f --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemDeptCreateValidate.java @@ -0,0 +1,45 @@ +package com.mdd.admin.validate.system; + +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.DecimalMax; +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import java.io.Serializable; + +/** + * 系统部门创建参数 + */ +@Data +public class SystemDeptCreateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "pid参数缺失") + @DecimalMin(value = "0", message = "上级值不能少于0") + private Integer pid; + + @NotNull(message = "name参数缺失") + @Length(min = 1, max = 100, message = "部门名称必须在1~100个字符内") + private String name; + + @Length(min = 1, max = 30, message = "负责人名称必须在1~30个字符内") + private String duty = ""; + + @Length(min = 11, max = 11, message = "手机号只能为11位") + @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "手机号格式有误") + private String mobile; + + @NotNull(message = "请选择状态") + @IntegerContains(values = {0, 1}) + private Integer isStop; + + @NotNull(message = "排序号不能为空") + @DecimalMin(value = "0", message = "排序号值不能少于0") + @DecimalMax(value = "9999", message = "排序号值不能大于9999") + private Integer sort; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemDeptSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemDeptSearchValidate.java new file mode 100644 index 00000000..28d1a749 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemDeptSearchValidate.java @@ -0,0 +1,19 @@ +package com.mdd.admin.validate.system; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 系统部门搜索参数 + */ +@Data +public class SystemDeptSearchValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private String name; + + private Integer isStop; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemDeptUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemDeptUpdateValidate.java new file mode 100644 index 00000000..6efc2eb1 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemDeptUpdateValidate.java @@ -0,0 +1,48 @@ +package com.mdd.admin.validate.system; + +import com.mdd.common.validator.annotation.IDMust; +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.DecimalMax; +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import java.io.Serializable; + +/** + * 系统部门更新参数 + */ +@Data +public class SystemDeptUpdateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @IDMust(message = "id参数必传且需大于0") + private Integer id; + + @NotNull(message = "pid参数缺失") + @DecimalMin(value = "0", message = "上级值不能少于0") + private Integer pid; + + @NotNull(message = "name参数缺失") + @Length(min = 1, max = 100, message = "部门名称必须在1~100个字符内") + private String name; + + @Length(min = 1, max = 30, message = "负责人名称必须在1~30个字符内") + private String duty = ""; + + @Length(min = 11, max = 11, message = "手机号只能为11位") + @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "手机号格式有误") + private String mobile; + + @NotNull(message = "请选择状态") + @IntegerContains(values = {0, 1}) + private Integer isStop; + + @DecimalMin(value = "0", message = "排序号值不能少于0") + @DecimalMax(value = "9999", message = "排序号值不能大于9999") + private Integer sort; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemMenuCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemMenuCreateValidate.java new file mode 100644 index 00000000..45a7805c --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemMenuCreateValidate.java @@ -0,0 +1,66 @@ +package com.mdd.admin.validate.system; + +import com.mdd.common.validator.annotation.IntegerContains; +import com.mdd.common.validator.annotation.StringContains; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 系统菜单创建参数 + */ +@Data +public class SystemMenuCreateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "上级菜单不能为空") + @DecimalMin(value = "0", message = "上级菜单值不能少于0") + private Integer pid; + + @NotNull(message = "menuType参数缺失") + @StringContains(values = {"M", "C", "A"}, message = "菜单类型不是合法值(M,C,A)") + private String menuType; + + @NotNull(message = "缺少参数menuName") + @Length(min = 1, max = 30, message = "菜单名称必须在1~30个字符内") + private String menuName; + + @Length(max = 100, message = "图标名称不能超过100个字符") + private String menuIcon; + + @NotNull(message = "排序号不能为空") + @DecimalMin(value = "0", message = "排序号值不能少于0") + private Integer menuSort; + + @Length(max = 100, message = "权限字符不能超过100个字符") + private String perms; + + @Length(max = 200, message = "路由地址不能超过200个字符") + private String paths; + + @Length(max = 200, message = "前端组件不能超过200个字符") + private String component; + + @Length(max = 200, message = "选中菜单路径不能超过200个字符") + private String selected; + + @Length(max = 200, message = "路由参数不能超过200个字符") + private String params; + + @NotNull(message = "请选择缓存状态") + @IntegerContains(values = {0, 1}) + private Integer isCache; + + @NotNull(message = "请选择显示状态") + @IntegerContains(values = {0, 1}) + private Integer isShow; + + @NotNull(message = "请选择菜单状态") + @IntegerContains(values = {0, 1}) + private Integer isDisable; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemMenuUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemMenuUpdateValidate.java new file mode 100644 index 00000000..14195944 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemMenuUpdateValidate.java @@ -0,0 +1,70 @@ +package com.mdd.admin.validate.system; + +import com.mdd.common.validator.annotation.IDMust; +import com.mdd.common.validator.annotation.IntegerContains; +import com.mdd.common.validator.annotation.StringContains; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 系统菜单更新参数 + */ +@Data +public class SystemMenuUpdateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @IDMust(message = "id参数必传且需大于0") + private Integer id; + + @NotNull(message = "上级菜单不能为空") + @DecimalMin(value = "0", message = "上级菜单值不能少于0") + private Integer pid; + + @NotNull(message = "menuType参数缺失") + @StringContains(values = {"M", "C", "A"}, message = "菜单类型不是合法值(M,C,A)") + private String menuType; + + @NotNull(message = "缺少参数menuName") + @Length(min = 1, max = 30, message = "菜单名称必须在1~30个字符内") + private String menuName; + + @Length(max = 100, message = "图标名称不能超过100个字符") + private String menuIcon; + + @NotNull(message = "排序号不能为空") + @DecimalMin(value = "0", message = "排序号值不能少于0") + private Integer menuSort; + + @Length(max = 100, message = "权限字符不能超过100个字符") + private String perms; + + @Length(max = 200, message = "路由地址不能超过200个字符") + private String paths; + + @Length(max = 200, message = "前端组件不能超过200个字符") + private String component; + + @Length(max = 200, message = "选中菜单路径不能超过200个字符") + private String selected; + + @Length(max = 200, message = "路由参数不能超过200个字符") + private String params; + + @NotNull(message = "请选择缓存状态") + @IntegerContains(values = {0, 1}) + private Integer isCache; + + @NotNull(message = "请选择显示状态") + @IntegerContains(values = {0, 1}) + private Integer isShow; + + @NotNull(message = "请选择菜单状态") + @IntegerContains(values = {0, 1}) + private Integer isDisable; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemPostCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemPostCreateValidate.java new file mode 100644 index 00000000..124f4e6f --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemPostCreateValidate.java @@ -0,0 +1,38 @@ +package com.mdd.admin.validate.system; + +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 系统岗位创建参数 + */ +@Data +public class SystemPostCreateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "code参数缺失") + @Length(min = 1, max = 30, message = "岗位编码必须在1~30个字符内") + private String code; + + @NotNull(message = "name参数缺失") + @Length(min = 1, max = 30, message = "岗位名称必须在1~30个字符内") + private String name; + + @NotNull(message = "请选择状态") + @IntegerContains(values = {0, 1}) + private Integer isStop = 0; + + @Length( max = 250, message = "岗位备注不能大于250个字符内") + private String remarks = ""; + + @NotNull(message = "排序号不能为空") + @DecimalMin(value = "0", message = "排序号值不能少于0") + private Integer sort = 0; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemPostSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemPostSearchValidate.java new file mode 100644 index 00000000..77527229 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemPostSearchValidate.java @@ -0,0 +1,21 @@ +package com.mdd.admin.validate.system; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 系统岗位搜索参数 + */ +@Data +public class SystemPostSearchValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private String code; + + private String name; + + private Integer isStop; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemPostUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemPostUpdateValidate.java new file mode 100644 index 00000000..503e9181 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemPostUpdateValidate.java @@ -0,0 +1,42 @@ +package com.mdd.admin.validate.system; + +import com.mdd.common.validator.annotation.IDMust; +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 系统岗位更新参数 + */ +@Data +public class SystemPostUpdateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @IDMust(message = "id参数必传且需大于0") + private Integer id; + + @NotNull(message = "code参数缺失") + @Length(min = 1, max = 30, message = "岗位编码必须在1~30个字符内") + private String code; + + @NotNull(message = "name参数缺失") + @Length(min = 1, max = 30, message = "岗位名称必须在1~30个字符内") + private String name; + + @NotNull(message = "请选择状态") + @IntegerContains(values = {0, 1}) + private Integer isStop = 0; + + @Length( max = 250, message = "岗位备注不能大于250个字符内") + private String remarks = ""; + + @NotNull(message = "排序号不能为空") + @DecimalMin(value = "0", message = "排序号值不能少于0") + private Integer sort = 0; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemRoleCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemRoleCreateValidate.java new file mode 100644 index 00000000..d7436aac --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemRoleCreateValidate.java @@ -0,0 +1,36 @@ +package com.mdd.admin.validate.system; + +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 系统角色创建参数 + */ +@Data +public class SystemRoleCreateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "缺少参数name") + @Length(min = 1, max = 30, message = "角色名称必须在1~30个字符内") + private String name; + + @Length(max = 200, message = "备注信息不能超过200个字符") + private String remark; + + @NotNull(message = "排序号不能为空") + @DecimalMin(value = "0", message = "排序号值不能少于0") + private Integer sort = 0; + + @NotNull(message = "请选择状态") + @IntegerContains(values = {0, 1}) + private Integer isDisable; + + private String menuIds = ""; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthRoleParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemRoleUpdateValidate.java similarity index 50% rename from server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthRoleParam.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemRoleUpdateValidate.java index 06012e04..d2302bcb 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthRoleParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemRoleUpdateValidate.java @@ -1,39 +1,37 @@ package com.mdd.admin.validate.system; -import com.mdd.admin.validate.BaseParam; import com.mdd.common.validator.annotation.IDMust; 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.Max; import javax.validation.constraints.NotNull; +import java.io.Serializable; /** - * 系统角色参数 + * 系统角色更新参数 */ @Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class SystemAuthRoleParam extends BaseParam { +public class SystemRoleUpdateValidate implements Serializable { - @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class}) + private static final long serialVersionUID = 1L; + + @IDMust(message = "id参数必传且需大于0") private Integer id; - @NotNull(message = "缺少参数name", groups = {create.class, update.class}) - @Length(min = 1, max = 30, message = "角色名称必须在1~30个字符内", groups = {create.class, update.class}) + @NotNull(message = "缺少参数name") + @Length(min = 1, max = 30, message = "角色名称必须在1~30个字符内") private String name; @Max(value = 200, message = "备注信息不能超过200个字符") private String remark = ""; - @NotNull(message = "排序号不能为空", groups = {create.class, update.class}) - @DecimalMin(value = "0", message = "排序号值不能少于0", groups = {create.class, update.class}) + @NotNull(message = "排序号不能为空") + @DecimalMin(value = "0", message = "排序号值不能少于0") private Integer sort; - @NotNull(message = "请选择状态", groups = {create.class, update.class}) + @NotNull(message = "请选择状态") private Integer isDisable; private String menuIds = ""; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemSearchLoginsValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemSearchLoginsValidate.java new file mode 100644 index 00000000..545eb5fb --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemSearchLoginsValidate.java @@ -0,0 +1,23 @@ +package com.mdd.admin.validate.system; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 系统登录日志搜索参数 + */ +@Data +public class SystemSearchLoginsValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private String username; + + private Integer status; + + private String startTime; + + private String endTime; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemSearchOperateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemSearchOperateValidate.java new file mode 100644 index 00000000..debcf14d --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemSearchOperateValidate.java @@ -0,0 +1,31 @@ +package com.mdd.admin.validate.system; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 系统操作日志搜索参数 + */ +@Data +public class SystemSearchOperateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + private String title; + + private String username; + + private String ip; + + private String type; + + private String status; + + private String url; + + private String startTime; + + private String endTime; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/article/ArticleCateVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/article/ArticleCateVo.java index ae299312..4d01d75f 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/article/ArticleCateVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/article/ArticleCateVo.java @@ -14,7 +14,7 @@ public class ArticleCateVo implements Serializable { private Integer id; // 主键 private String name; // 分类名称 - private Integer number; // 文章数量 + private Long number; // 文章数量 private Integer sort; // 排序编号 private Integer isShow; // 是否显示 private String createTime; // 创建时间 diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/article/ArticleListVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/article/ArticleListedVo.java similarity index 91% rename from server/like-admin/src/main/java/com/mdd/admin/vo/article/ArticleListVo.java rename to server/like-admin/src/main/java/com/mdd/admin/vo/article/ArticleListedVo.java index 3176f62c..f4c7bef3 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/article/ArticleListVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/article/ArticleListedVo.java @@ -8,7 +8,7 @@ import java.io.Serializable; * 文章列表Vo */ @Data -public class ArticleListVo implements Serializable { +public class ArticleListedVo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelH5Vo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelH5Vo.java index 4deae7f1..fffb414d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelH5Vo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelH5Vo.java @@ -2,11 +2,15 @@ package com.mdd.admin.vo.channel; import lombok.Data; +import java.io.Serializable; + /** * H5渠道Vo */ @Data -public class ChannelH5Vo { +public class ChannelH5Vo implements Serializable { + + private static final long serialVersionUID = 1L; private Integer status; // 是否关闭 private Integer close; // 关闭类型 diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelMpVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelMpVo.java index 6a30217f..5a892083 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelMpVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelMpVo.java @@ -2,11 +2,15 @@ package com.mdd.admin.vo.channel; import lombok.Data; +import java.io.Serializable; + /** * 小程序渠道Vo */ @Data -public class ChannelMpVo { +public class ChannelMpVo implements Serializable { + + private static final long serialVersionUID = 1L; private String name; private String primaryId; diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelOaVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelOaVo.java index 685f448a..4c2f190d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelOaVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelOaVo.java @@ -2,11 +2,15 @@ package com.mdd.admin.vo.channel; import lombok.Data; +import java.io.Serializable; + /** * 公众号渠道Vo */ @Data -public class ChannelOaVo { +public class ChannelOaVo implements Serializable { + + private static final long serialVersionUID = 1L; private String name; private String primaryId; diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelRpDefaultVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelRpDefaultVo.java new file mode 100644 index 00000000..d1da3849 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelRpDefaultVo.java @@ -0,0 +1,22 @@ +package com.mdd.admin.vo.channel; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 公众号默认回复Vo + */ +@Data +public class ChannelRpDefaultVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; + private String name; + private String content; + private Integer contentType; + private Integer sort; + private Integer status; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelRpFollowsVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelRpFollowsVo.java new file mode 100644 index 00000000..ddc3b112 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelRpFollowsVo.java @@ -0,0 +1,22 @@ +package com.mdd.admin.vo.channel; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 公众号关注回复Vo + */ +@Data +public class ChannelRpFollowsVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; + private String name; + private String content; + private Integer contentType; + private Integer sort; + private Integer status; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelRpKeywordVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelRpKeywordVo.java new file mode 100644 index 00000000..00e02be2 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelRpKeywordVo.java @@ -0,0 +1,24 @@ +package com.mdd.admin.vo.channel; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 关键词回复Vo + */ +@Data +public class ChannelRpKeywordVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; + private String name; + private String keyword; + private String content; + private Integer contentType; + private Integer matchingType; + private Integer sort; + private Integer status; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelOaReplyVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelRpVo.java similarity index 66% rename from server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelOaReplyVo.java rename to server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelRpVo.java index b7e72b2f..9382294a 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelOaReplyVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelRpVo.java @@ -2,8 +2,15 @@ package com.mdd.admin.vo.channel; import lombok.Data; +import java.io.Serializable; + +/** + * 公众号回复Vo + */ @Data -public class ChannelOaReplyVo { +public class ChannelRpVo implements Serializable { + + private static final long serialVersionUID = 1L; private Integer id; private String name; diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelWxVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelWxVo.java deleted file mode 100644 index 46925fe1..00000000 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/channel/ChannelWxVo.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mdd.admin.vo.channel; - -import lombok.Data; - -/** - * 开放平台渠道Vo - */ -@Data -public class ChannelWxVo { - - private String appId; - private String appSecret; - -} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateDataArticleVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateDataArticleVo.java index f2fde3cf..6a2b1dda 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateDataArticleVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateDataArticleVo.java @@ -2,8 +2,15 @@ package com.mdd.admin.vo.decorate; import lombok.Data; +import java.io.Serializable; + +/** + * 装修文章数据Vo + */ @Data -public class DecorateDataArticleVo { +public class DecorateDataArticleVo implements Serializable { + + private static final long serialVersionUID = 1L; private Integer id; private String title; diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecoratePageVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecoratePageVo.java index e64028ed..a604c730 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecoratePageVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecoratePageVo.java @@ -2,8 +2,15 @@ package com.mdd.admin.vo.decorate; import lombok.Data; +import java.io.Serializable; + +/** + * 装修页面Vo + */ @Data -public class DecoratePageVo { +public class DecoratePageVo implements Serializable { + + private static final long serialVersionUID = 1L; private Integer id; private Integer pageType; diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabbarVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabbarVo.java index e1fa046a..41c66dc6 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabbarVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabbarVo.java @@ -2,13 +2,19 @@ package com.mdd.admin.vo.decorate; import lombok.Data; +import java.io.Serializable; import java.util.List; import java.util.Map; +/** + * 装修底部导航Vo + */ @Data -public class DecorateTabbarVo { +public class DecorateTabbarVo implements Serializable { + + private static final long serialVersionUID = 1L; private Map style; - private List list; + private List list; } diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabObjVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabsListsVo.java similarity index 63% rename from server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabObjVo.java rename to server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabsListsVo.java index c162344c..b48373d4 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabObjVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabsListsVo.java @@ -2,11 +2,17 @@ package com.mdd.admin.vo.decorate; import lombok.Data; +import java.io.Serializable; import java.util.List; import java.util.Map; +/** + * 装修底部导航列表Vo + */ @Data -public class DecorateTabObjVo { +public class DecorateTabsListsVo implements Serializable { + + private static final long serialVersionUID = 1L; private Integer id; private String name; diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabsStyleVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabsStyleVo.java new file mode 100644 index 00000000..141df838 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabsStyleVo.java @@ -0,0 +1,18 @@ +package com.mdd.admin.vo.decorate; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 装修底部导航样式Vo + */ +@Data +public class DecorateTabsStyleVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private String defaultColor; + private String selectedColor; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingCopyrightVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingCopyrightVo.java new file mode 100644 index 00000000..db928ecd --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingCopyrightVo.java @@ -0,0 +1,18 @@ +package com.mdd.admin.vo.setting; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 版权设置Vo + */ +@Data +public class SettingCopyrightVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private String name; + private String link; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingLoginVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingLoginVo.java new file mode 100644 index 00000000..73d3a903 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingLoginVo.java @@ -0,0 +1,22 @@ +package com.mdd.admin.vo.setting; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 登录设置Vo + */ +@Data +public class SettingLoginVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private List loginWay; // 登录方式 + private Integer forceBindMobile; // 强制绑定手机 + private Integer openAgreement; // 是否开启协议 + private Integer openOtherAuth; // 第三方的登录 + private List autoLoginAuth; // 自动登录授权 + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingNoticeListVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingNoticeListedVo.java similarity index 91% rename from server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingNoticeListVo.java rename to server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingNoticeListedVo.java index b174ecc1..a9e17ac9 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingNoticeListVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingNoticeListedVo.java @@ -8,7 +8,7 @@ import java.io.Serializable; * 通知设置列表Vo */ @Data -public class SettingNoticeListVo implements Serializable { +public class SettingNoticeListedVo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingProtocolDetailVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingProtocolDetailVo.java new file mode 100644 index 00000000..45031f25 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingProtocolDetailVo.java @@ -0,0 +1,18 @@ +package com.mdd.admin.vo.setting; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 政策协议详情Vo + */ +@Data +public class SettingProtocolDetailVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private SettingProtocolObjectVo service; + private SettingProtocolObjectVo privacy; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingProtocolObjectVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingProtocolObjectVo.java new file mode 100644 index 00000000..1bb21a35 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingProtocolObjectVo.java @@ -0,0 +1,19 @@ +package com.mdd.admin.vo.setting; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 政策协议设置对象Vo + */ +@Data +public class SettingProtocolObjectVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private String name; + + private String content; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingSearchDetailVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingSearchDetailVo.java new file mode 100644 index 00000000..b0c8da3f --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingSearchDetailVo.java @@ -0,0 +1,20 @@ +package com.mdd.admin.vo.setting; + +import com.mdd.common.entity.setting.HotSearch; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 热门搜索详情Vo + */ +@Data +public class SettingSearchDetailVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer isHotSearch; + private List list; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingSearchObjectVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingSearchObjectVo.java new file mode 100644 index 00000000..ae12444d --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingSearchObjectVo.java @@ -0,0 +1,18 @@ +package com.mdd.admin.vo.setting; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 热门搜索对象Vo + */ +@Data +public class SettingSearchObjectVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private String name; + private Integer sort; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingUserVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingUserVo.java new file mode 100644 index 00000000..74f149a9 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingUserVo.java @@ -0,0 +1,17 @@ +package com.mdd.admin.vo.setting; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 用户设置Vo + */ +@Data +public class SettingUserVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private String defaultAvatar; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingWebsiteVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingWebsiteVo.java new file mode 100644 index 00000000..6dde13fe --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingWebsiteVo.java @@ -0,0 +1,22 @@ +package com.mdd.admin.vo.setting; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 基础设置Vo + */ +@Data +public class SettingWebsiteVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private String name; + private String logo; + private String favicon; + private String backdrop; + private String shopName; + private String shopLogo; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminDetailVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminDetailVo.java new file mode 100644 index 00000000..7f9d5f42 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminDetailVo.java @@ -0,0 +1,28 @@ +package com.mdd.admin.vo.system; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 管理员详情Vo + */ +@Data +public class SystemAuthAdminDetailVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; // 主键 + private Integer deptId; // 部门ID + private Integer postId; // 岗位ID + private String username; // 账号 + private String nickname; // 昵称 + private String avatar; // 头像 + private Integer isMultipoint; // 多端登录: [0=否, 1=是] + private Integer isDisable; // 是否禁用: [0=否, 1=是] + private String lastLoginIp; // 最后登录IP + private String lastLoginTime; // 最后登录时间 + private String createTime; // 创建时间 + private String updateTime; // 更新时间 + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminInformVo.java similarity index 84% rename from server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminVo.java rename to server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminInformVo.java index 0fb0d29e..edb8a203 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminInformVo.java @@ -8,7 +8,7 @@ import java.io.Serializable; * 管理员Vo */ @Data -public class SystemAuthAdminVo implements Serializable { +public class SystemAuthAdminInformVo implements Serializable { private static final long serialVersionUID = 1L; @@ -18,8 +18,6 @@ public class SystemAuthAdminVo implements Serializable { private String username; // 账号 private String nickname; // 昵称 private String avatar; // 头像 - private String dept; // 部门 - private String role; // 角色 private Integer isMultipoint; // 多端登录: [0=否, 1=是] private Integer isDisable; // 是否禁用: [0=否, 1=是] private String lastLoginIp; // 最后登录IP diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminListedVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminListedVo.java new file mode 100644 index 00000000..4aa9cbec --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminListedVo.java @@ -0,0 +1,28 @@ +package com.mdd.admin.vo.system; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 管理员列表Vo + */ +@Data +public class SystemAuthAdminListedVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; // 主键 + private String username; // 账号 + private String nickname; // 昵称 + private String avatar; // 头像 + private String dept; // 部门 + private String role; // 角色 + private Integer isMultipoint; // 多端登录: [0=否, 1=是] + private Integer isDisable; // 是否禁用: [0=否, 1=是] + private String lastLoginIp; // 最后登录IP + private String lastLoginTime; // 最后登录时间 + private String createTime; // 创建时间 + private String updateTime; // 更新时间 + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthSelfVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminSelvesVo.java similarity index 86% rename from server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthSelfVo.java rename to server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminSelvesVo.java index d0e2cdd4..1db397b9 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthSelfVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthAdminSelvesVo.java @@ -6,7 +6,7 @@ import lombok.Data; * 当前系统管理员Vo */ @Data -public class SystemAuthSelfVo { +public class SystemAuthAdminSelvesVo { private Object user; // 用户信息 private Object permissions; // 权限集合: [[*]=>所有权限, ['article:add']=>部分权限] diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthRoleVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthRoleVo.java index bdd98c50..bd25315f 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthRoleVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemAuthRoleVo.java @@ -16,7 +16,7 @@ public class SystemAuthRoleVo implements Serializable { private String name; // 角色名称 private String remark; // 角色备注 private Object menus; // 关联菜单 - private Integer member; // 成员数量 + private Long member; // 成员数量 private Integer sort; // 角色排序 private Integer isDisable; // 是否禁用: [0=否, 1=是] private String createTime; // 创建时间 diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/system/LogLoginVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemLogLoginVo.java similarity index 90% rename from server/like-admin/src/main/java/com/mdd/admin/vo/system/LogLoginVo.java rename to server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemLogLoginVo.java index 7b1a7307..4f87f5b4 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/system/LogLoginVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemLogLoginVo.java @@ -8,7 +8,7 @@ import java.io.Serializable; * 登录日志Vo */ @Data -public class LogLoginVo implements Serializable { +public class SystemLogLoginVo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/system/LogOperateVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemLogOperateVo.java similarity index 94% rename from server/like-admin/src/main/java/com/mdd/admin/vo/system/LogOperateVo.java rename to server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemLogOperateVo.java index 57f4afdf..ca702dc8 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/system/LogOperateVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/system/SystemLogOperateVo.java @@ -8,7 +8,7 @@ import java.io.Serializable; * 操作日志Vo */ @Data -public class LogOperateVo implements Serializable { +public class SystemLogOperateVo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/server/like-common/pom.xml b/server/like-common/pom.xml index ecf1a5a4..0dd802ac 100644 --- a/server/like-common/pom.xml +++ b/server/like-common/pom.xml @@ -29,16 +29,18 @@ - + org.springframework.boot spring-boot-autoconfigure - + + org.springframework.boot spring-boot-configuration-processor + org.springframework.boot @@ -50,124 +52,145 @@ - + + org.springframework.boot spring-boot-starter-log4j2 - + + org.springframework.boot spring-boot-starter-aop - + + org.springframework.boot spring-boot-starter-validation - + + org.springframework.boot spring-boot-starter-data-redis - + + mysql mysql-connector-java - + + com.baomidou mybatis-plus-boot-starter - + + com.github.yulichang mybatis-plus-join - + + com.github.pagehelper pagehelper-spring-boot-starter - - - org.projectlombok - lombok - - - - com.alibaba - fastjson - - - - org.apache.commons - commons-lang3 - - + + org.apache.commons commons-pool2 - + + + + org.projectlombok + lombok + + + + + com.alibaba.fastjson2 + fastjson2 + + + com.google.code.gson gson - + + nl.bitwalker UserAgentUtils - + + + + org.apache.commons + commons-lang3 + + + commons-io commons-io - + + com.qiniu qiniu-java-sdk + com.qcloud cos_api + com.aliyun.oss aliyun-sdk-oss + com.tencentcloudapi tencentcloud-sdk-java ${tencentcloudapi.version} + com.aliyun aliyun-java-sdk-core ${aliyun-java.version} + com.github.oshi oshi-core + com.github.binarywang weixin-java-miniapp - 4.4.0 + com.github.binarywang weixin-java-mp - 4.4.0 diff --git a/server/like-common/src/main/java/com/mdd/common/core/AjaxResult.java b/server/like-common/src/main/java/com/mdd/common/core/AjaxResult.java index ca984aa1..338e7572 100644 --- a/server/like-common/src/main/java/com/mdd/common/core/AjaxResult.java +++ b/server/like-common/src/main/java/com/mdd/common/core/AjaxResult.java @@ -3,13 +3,10 @@ package com.mdd.common.core; import com.mdd.common.enums.HttpEnum; import lombok.Data; -import java.io.Serializable; import java.util.ArrayList; @Data -public class AjaxResult implements Serializable { - - private static final long serialVersionUID = 1L; +public class AjaxResult { /** 状态码 **/ private Integer code; @@ -18,12 +15,10 @@ public class AjaxResult implements Serializable { private String msg; /** 响应数据 **/ - private Object data; + private T data; - /** - * 无参构造 - */ - public AjaxResult() {} + /** 无参构造 **/ + protected AjaxResult() {} /** * 带参构造 @@ -33,7 +28,7 @@ public class AjaxResult implements Serializable { * @param msg 提示信息 * @param data 响应数据 */ - public AjaxResult(Integer code, String msg, Object data) { + public AjaxResult(Integer code, String msg, T data) { this.code = code; this.msg = msg; this.data = data; @@ -45,8 +40,8 @@ public class AjaxResult implements Serializable { * @author fzr * @return AjaxResult */ - public static AjaxResult success() { - return new AjaxResult(HttpEnum.SUCCESS.getCode(), HttpEnum.SUCCESS.getMsg(), new ArrayList<>()); + public static AjaxResult success() { + return new AjaxResult<>(HttpEnum.SUCCESS.getCode(), HttpEnum.SUCCESS.getMsg(), new ArrayList<>()); } /** @@ -56,8 +51,8 @@ public class AjaxResult implements Serializable { * @param code 状态码 * @return AjaxResult */ - public static AjaxResult success(Integer code) { - return new AjaxResult(code, HttpEnum.FAILED.getMsg(), new ArrayList<>()); + public static AjaxResult success(Integer code) { + return new AjaxResult<>(code, HttpEnum.FAILED.getMsg(), new ArrayList<>()); } /** @@ -67,8 +62,8 @@ public class AjaxResult implements Serializable { * @param msg 提示信息 * @return AjaxResult */ - public static AjaxResult success(String msg) { - return new AjaxResult(HttpEnum.SUCCESS.getCode(), msg, new ArrayList<>()); + public static AjaxResult success(String msg) { + return new AjaxResult<>(HttpEnum.SUCCESS.getCode(), msg, new ArrayList<>()); } /** @@ -78,8 +73,8 @@ public class AjaxResult implements Serializable { * @param data 响应数据 * @return AjaxResult */ - public static AjaxResult success(Object data) { - return new AjaxResult(HttpEnum.SUCCESS.getCode(), HttpEnum.SUCCESS.getMsg(), data); + public static AjaxResult success(T data) { + return new AjaxResult(HttpEnum.SUCCESS.getCode(), HttpEnum.SUCCESS.getMsg(), data); } /** @@ -90,8 +85,8 @@ public class AjaxResult implements Serializable { * @param msg 提示信息 * @return AjaxResult */ - public static AjaxResult success(Integer code, String msg) { - return new AjaxResult(code, msg, new ArrayList<>()); + public static AjaxResult success(Integer code, String msg) { + return new AjaxResult<>(code, msg, new ArrayList<>()); } /** @@ -102,8 +97,8 @@ public class AjaxResult implements Serializable { * @param data 响应数据 * @return AjaxResult */ - public static AjaxResult success(String msg, Object data) { - return new AjaxResult(HttpEnum.SUCCESS.getCode(), msg, data); + public static AjaxResult success(String msg, T data) { + return new AjaxResult(HttpEnum.SUCCESS.getCode(), msg, data); } /** @@ -115,8 +110,8 @@ public class AjaxResult implements Serializable { * @param data 响应数据 * @return AjaxResult */ - public static AjaxResult success(Integer code, String msg, Object data) { - return new AjaxResult(code, msg, data); + public static AjaxResult success(Integer code, String msg, T data) { + return new AjaxResult(code, msg, data); } /** @@ -126,8 +121,8 @@ public class AjaxResult implements Serializable { * @param code 状态码 * @return AjaxResult */ - public static AjaxResult failed(Integer code) { - return new AjaxResult(code, HttpEnum.FAILED.getMsg(), new ArrayList<>()); + public static AjaxResult failed(Integer code) { + return new AjaxResult<>(code, HttpEnum.FAILED.getMsg(), new ArrayList<>()); } /** @@ -137,8 +132,8 @@ public class AjaxResult implements Serializable { * @param msg 提示信息 * @return AjaxResult */ - public static AjaxResult failed(String msg) { - return new AjaxResult(HttpEnum.FAILED.getCode(), msg, new ArrayList<>()); + public static AjaxResult failed(String msg) { + return new AjaxResult<>(HttpEnum.FAILED.getCode(), msg, new ArrayList<>()); } /** @@ -148,8 +143,8 @@ public class AjaxResult implements Serializable { * @param data 响应数据 * @return AjaxResult */ - public static AjaxResult failed(Object data) { - return new AjaxResult(HttpEnum.FAILED.getCode(), HttpEnum.FAILED.getMsg(), data); + public static AjaxResult failed(T data) { + return new AjaxResult(HttpEnum.FAILED.getCode(), HttpEnum.FAILED.getMsg(), data); } /** @@ -160,8 +155,8 @@ public class AjaxResult implements Serializable { * @param msg 提示信息 * @return AjaxResult */ - public static AjaxResult failed(Integer code, String msg) { - return new AjaxResult(code, msg, new ArrayList<>()); + public static AjaxResult failed(Integer code, String msg) { + return new AjaxResult<>(code, msg, new ArrayList<>()); } /** @@ -173,8 +168,8 @@ public class AjaxResult implements Serializable { * @param data 响应数据 * @return AjaxResult */ - public static AjaxResult failed(Integer code, String msg, Object data) { - return new AjaxResult(code, msg, data); + public static AjaxResult failed(Integer code, String msg, T data) { + return new AjaxResult(code, msg, data); } } diff --git a/server/like-common/src/main/java/com/mdd/common/core/basics/IBaseMapper.java b/server/like-common/src/main/java/com/mdd/common/core/basics/IBaseMapper.java index 607cc854..5abf553d 100644 --- a/server/like-common/src/main/java/com/mdd/common/core/basics/IBaseMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/core/basics/IBaseMapper.java @@ -1,11 +1,15 @@ package com.mdd.common.core.basics; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.query.MPJQueryWrapper; +import com.google.gson.reflect.TypeToken; import com.mdd.common.utils.TimeUtil; import org.apache.ibatis.annotations.Mapper; +import java.lang.reflect.Type; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -41,10 +45,12 @@ public interface IBaseMapper extends MPJBaseMapper { * * @author fzr * @param queryWrapper 条件构造器 - * @param params 参数[条件:键@数据库字段:类型] - * @param conditions 条件 + * @param param 参数[条件:键@数据库字段:类型] + * @param conditions 条件[ new String[]{"like:username:str", "=:role:int"} ] */ - default void setSearch(MPJQueryWrapper queryWrapper, Map params, String[] conditions) { + default void setSearch(MPJQueryWrapper queryWrapper, Object param, String[] conditions) { + Type types = new TypeToken>() {}.getType(); + Map params = JSON.parseObject(JSONObject.toJSONString(param), types); for (String condition : conditions) { String[] array = condition.split(":"); @@ -160,7 +166,7 @@ public interface IBaseMapper extends MPJBaseMapper { if (type.equals("long")) { if (!dateEnd.equals("")) { queryWrapper.le(field, Long.parseLong(dateEnd)); } - if (!dateStart.equals("")) { queryWrapper.ge(field, Long.parseLong(dateStart)); }; + if (!dateStart.equals("")) { queryWrapper.ge(field, Long.parseLong(dateStart)); } } else { if (!dateStart.equals("")) { queryWrapper.ge(field, TimeUtil.dateToTimestamp(dateStart)); } if (!dateEnd.equals("")) { queryWrapper.le(field, TimeUtil.dateToTimestamp(dateEnd)); } @@ -176,10 +182,12 @@ public interface IBaseMapper extends MPJBaseMapper { * * @author fzr * @param queryWrapper 条件构造器 - * @param params 参数[条件:键@数据库字段:类型] - * @param conditions 条件 + * @param param 参数[条件:键@数据库字段:类型] + * @param conditions 条件[ new String[]{"like:username:str", "=:role:int"} ] */ - default void setSearch(QueryWrapper queryWrapper, Map params, String[] conditions) { + default void setSearch(QueryWrapper queryWrapper, Object param, String[] conditions) { + Type types = new TypeToken>() {}.getType(); + Map params = JSON.parseObject(JSONObject.toJSONString(param), types); for (String condition : conditions) { String[] array = condition.split(":"); @@ -297,7 +305,7 @@ public interface IBaseMapper extends MPJBaseMapper { if (!dateStart.equals("")) { queryWrapper.ge(field, Long.parseLong(dateStart)); } if (!dateEnd.equals("")) { queryWrapper.le(field, Long.parseLong(dateEnd)); } } else { - if (!dateStart.equals("")) { queryWrapper.ge(field, TimeUtil.dateToTimestamp(dateStart)); }; + if (!dateStart.equals("")) { queryWrapper.ge(field, TimeUtil.dateToTimestamp(dateStart)); } if (!dateEnd.equals("")) { queryWrapper.le(field, TimeUtil.dateToTimestamp(dateEnd)); } } break; diff --git a/server/like-common/src/main/java/com/mdd/common/entity/decorate/DecoratePage.java b/server/like-common/src/main/java/com/mdd/common/entity/DecoratePage.java similarity index 90% rename from server/like-common/src/main/java/com/mdd/common/entity/decorate/DecoratePage.java rename to server/like-common/src/main/java/com/mdd/common/entity/DecoratePage.java index ea15b2ee..23fe3ca8 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/decorate/DecoratePage.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/DecoratePage.java @@ -1,4 +1,4 @@ -package com.mdd.common.entity.decorate; +package com.mdd.common.entity; import lombok.Data; diff --git a/server/like-common/src/main/java/com/mdd/common/entity/decorate/DecorateTabbar.java b/server/like-common/src/main/java/com/mdd/common/entity/DecorateTabbar.java similarity index 93% rename from server/like-common/src/main/java/com/mdd/common/entity/decorate/DecorateTabbar.java rename to server/like-common/src/main/java/com/mdd/common/entity/DecorateTabbar.java index 2d716537..3e20b158 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/decorate/DecorateTabbar.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/DecorateTabbar.java @@ -1,4 +1,4 @@ -package com.mdd.common.entity.decorate; +package com.mdd.common.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecoratePageMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/DecoratePageMapper.java similarity index 69% rename from server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecoratePageMapper.java rename to server/like-common/src/main/java/com/mdd/common/mapper/DecoratePageMapper.java index 9f105932..744ba996 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecoratePageMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/DecoratePageMapper.java @@ -1,7 +1,7 @@ -package com.mdd.common.mapper.decorate; +package com.mdd.common.mapper; import com.mdd.common.core.basics.IBaseMapper; -import com.mdd.common.entity.decorate.DecoratePage; +import com.mdd.common.entity.DecoratePage; import org.apache.ibatis.annotations.Mapper; /** diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecorateTabbarMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/DecorateTabbarMapper.java similarity index 69% rename from server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecorateTabbarMapper.java rename to server/like-common/src/main/java/com/mdd/common/mapper/DecorateTabbarMapper.java index 454701f9..a08c0902 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecorateTabbarMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/DecorateTabbarMapper.java @@ -1,7 +1,7 @@ -package com.mdd.common.mapper.decorate; +package com.mdd.common.mapper; import com.mdd.common.core.basics.IBaseMapper; -import com.mdd.common.entity.decorate.DecorateTabbar; +import com.mdd.common.entity.DecorateTabbar; import org.apache.ibatis.annotations.Mapper; /** diff --git a/server/like-common/src/main/java/com/mdd/common/plugin/sms/SmsDriver.java b/server/like-common/src/main/java/com/mdd/common/plugin/sms/SmsDriver.java index 35078823..55cf7605 100644 --- a/server/like-common/src/main/java/com/mdd/common/plugin/sms/SmsDriver.java +++ b/server/like-common/src/main/java/com/mdd/common/plugin/sms/SmsDriver.java @@ -1,20 +1,14 @@ package com.mdd.common.plugin.sms; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.mdd.common.entity.system.SystemLogSms; import com.mdd.common.exception.OperateException; import com.mdd.common.mapper.system.SystemLogSmsMapper; import com.mdd.common.plugin.sms.engine.AliSms; import com.mdd.common.plugin.sms.engine.TencentSms; -import com.mdd.common.utils.ArrayUtil; import com.mdd.common.utils.ConfigUtil; import com.mdd.common.utils.SpringUtil; -import javax.annotation.Resource; -import javax.management.openmbean.OpenDataException; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; import java.util.Map; public class SmsDriver { diff --git a/server/like-common/src/main/java/com/mdd/common/plugin/sms/engine/AliSms.java b/server/like-common/src/main/java/com/mdd/common/plugin/sms/engine/AliSms.java index fd17fbc2..01cf116c 100644 --- a/server/like-common/src/main/java/com/mdd/common/plugin/sms/engine/AliSms.java +++ b/server/like-common/src/main/java/com/mdd/common/plugin/sms/engine/AliSms.java @@ -1,13 +1,12 @@ package com.mdd.common.plugin.sms.engine; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.aliyuncs.CommonRequest; import com.aliyuncs.CommonResponse; import com.aliyuncs.DefaultAcsClient; import com.aliyuncs.IAcsClient; import com.aliyuncs.http.MethodType; import com.aliyuncs.profile.DefaultProfile; -import com.mdd.common.exception.OperateException; import java.util.Map; diff --git a/server/like-common/src/main/java/com/mdd/common/utils/ArrayUtil.java b/server/like-common/src/main/java/com/mdd/common/utils/ArrayUtil.java index e271c403..9ab6008d 100644 --- a/server/like-common/src/main/java/com/mdd/common/utils/ArrayUtil.java +++ b/server/like-common/src/main/java/com/mdd/common/utils/ArrayUtil.java @@ -1,8 +1,8 @@ package com.mdd.common.utils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; diff --git a/server/like-common/src/main/java/com/mdd/common/utils/IpUtil.java b/server/like-common/src/main/java/com/mdd/common/utils/IpUtil.java index 5c9805db..c5d0bf81 100644 --- a/server/like-common/src/main/java/com/mdd/common/utils/IpUtil.java +++ b/server/like-common/src/main/java/com/mdd/common/utils/IpUtil.java @@ -1,6 +1,6 @@ package com.mdd.common.utils; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.mdd.common.config.GlobalConfig; import org.slf4j.Logger; diff --git a/server/like-common/src/main/java/com/mdd/common/utils/ToolsUtil.java b/server/like-common/src/main/java/com/mdd/common/utils/ToolsUtil.java index a807227e..ecfab166 100644 --- a/server/like-common/src/main/java/com/mdd/common/utils/ToolsUtil.java +++ b/server/like-common/src/main/java/com/mdd/common/utils/ToolsUtil.java @@ -1,7 +1,7 @@ package com.mdd.common.utils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.google.gson.reflect.TypeToken; import com.mdd.common.config.GlobalConfig; diff --git a/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java b/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java index ad0bd310..5e1d3a24 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java @@ -6,7 +6,7 @@ import com.mdd.common.core.PageResult; import com.mdd.common.validator.annotation.IDMust; import com.mdd.front.LikeFrontThreadLocal; import com.mdd.front.service.IArticleService; -import com.mdd.front.validate.PageParam; +import com.mdd.front.validate.PageValidate; import com.mdd.front.vo.article.ArticleCateVo; import com.mdd.front.vo.article.ArticleCollectVo; import com.mdd.front.vo.article.ArticleDetailVo; @@ -32,10 +32,10 @@ public class ArticleController { * 文章分类 * * @author fzr - * @return Object + * @return AjaxResult> */ @GetMapping("/category") - public Object category() { + public AjaxResult> category() { List list = iArticleService.category(); return AjaxResult.success(list); } @@ -44,13 +44,13 @@ public class ArticleController { * 文章列表 * * @author fzr - * @return Object + * @return AjaxResult> */ @GetMapping("/list") - public Object list(@Validated PageParam pageParam, - @RequestParam(value = "cid", defaultValue = "0") Integer cid) { + public AjaxResult> list(@Validated PageValidate pageValidate, + @RequestParam(value = "cid", defaultValue = "0") Integer cid) { Integer userId = LikeFrontThreadLocal.getUserId(); - PageResult list = iArticleService.list(pageParam, cid, userId); + PageResult list = iArticleService.list(pageValidate, cid, userId); return AjaxResult.success(list); } @@ -58,10 +58,10 @@ public class ArticleController { * 文章详情 * * @author fzr - * @return Object + * @return AjaxResult */ @GetMapping("/detail") - public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { + public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { Integer userId = LikeFrontThreadLocal.getUserId(); ArticleDetailVo vo = iArticleService.detail(id, userId); return AjaxResult.success(vo); @@ -71,13 +71,13 @@ public class ArticleController { * 文章收藏 * * @author fzr - * @param pageParam 分页参数 - * @return Object + * @param pageValidate 分页参数 + * @return AjaxResult> */ @GetMapping("/collect") - public Object collect(@Validated PageParam pageParam) { + public AjaxResult> collect(@Validated PageValidate pageValidate) { Integer userId = LikeFrontThreadLocal.getUserId(); - PageResult list = iArticleService.collect(pageParam, userId); + PageResult list = iArticleService.collect(pageValidate, userId); return AjaxResult.success(list); } @@ -86,10 +86,10 @@ public class ArticleController { * * @author fzr * @param params 参数 - * @return Object + * @return AjaxResult */ @PostMapping("/addCollect") - public Object addCollect(@RequestBody Map params) { + public AjaxResult addCollect(@RequestBody Map params) { Assert.notNull(params.get("articleId"), "articleId参数缺失"); Integer articleId = Integer.parseInt(params.get("articleId")); Integer userId = LikeFrontThreadLocal.getUserId(); @@ -102,10 +102,10 @@ public class ArticleController { * * @author fzr * @param params 参数 - * @return Object + * @return AjaxResult */ @PostMapping("/cancelCollect") - public Object cancelCollect(@RequestBody Map params) { + public AjaxResult cancelCollect(@RequestBody Map params) { Assert.notNull(params.get("articleId"), "id参数缺失"); Integer articleId = Integer.parseInt(params.get("articleId")); Integer userId = LikeFrontThreadLocal.getUserId(); diff --git a/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java b/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java index f14b6e5c..1d936193 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java @@ -4,7 +4,7 @@ import com.mdd.common.core.AjaxResult; import com.mdd.common.core.PageResult; import com.mdd.common.validator.annotation.IDMust; import com.mdd.front.service.IIndexService; -import com.mdd.front.validate.PageParam; +import com.mdd.front.validate.PageValidate; import com.mdd.front.vo.article.ArticleListVo; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; @@ -30,10 +30,10 @@ public class IndexController { * 首页 * * @author fzr - * @return Object + * @return AjaxResult> */ @GetMapping("/index") - public Object index() { + public AjaxResult> index() { Map detail = iIndexService.index(); return AjaxResult.success(detail); } @@ -43,10 +43,10 @@ public class IndexController { * * @author fzr * @param id 主键 - * @return Object + * @return AjaxResult> */ @GetMapping("/decorate") - public Object decorate(@Validated @IDMust() @RequestParam("id") Integer id) { + public AjaxResult> decorate(@Validated @IDMust() @RequestParam("id") Integer id) { Map detail = iIndexService.decorate(id); return AjaxResult.success(detail); } @@ -55,10 +55,10 @@ public class IndexController { * 配置 * * @author fzr - * @return Object + * @return AjaxResult> */ @GetMapping("/config") - public Object config() { + public AjaxResult> config() { Map map = iIndexService.config(); return AjaxResult.success(map); } @@ -68,10 +68,10 @@ public class IndexController { * * @author fzr * @param type 类型 service=服务协议,privacy=隐私协议 - * @return Object + * @return AjaxResult> */ @GetMapping("/policy") - public Object policy(@RequestParam String type) { + public AjaxResult> policy(@RequestParam String type) { Map map = iIndexService.policy(type); return AjaxResult.success(map); } @@ -80,10 +80,10 @@ public class IndexController { * 热搜 * * @author fzr - * @return Object + * @return AjaxResult> */ @GetMapping("/hotSearch") - public Object hotSearch() { + public AjaxResult> hotSearch() { List list = iIndexService.hotSearch(); return AjaxResult.success(list); } @@ -92,12 +92,14 @@ public class IndexController { * 搜索 * * @author fzr - * @return Object + * @param pageValidate 分页参数 + * @param params 搜素参数 + * @return AjaxResult> */ @GetMapping("/search") - public Object search(@Validated PageParam pageParam, - @RequestParam Map params) { - PageResult list = iIndexService.search(pageParam, params); + public AjaxResult> search(@Validated PageValidate pageValidate, + @RequestParam Map params) { + PageResult list = iIndexService.search(pageValidate, params); return AjaxResult.success(list); } diff --git a/server/like-front/src/main/java/com/mdd/front/controller/LoginController.java b/server/like-front/src/main/java/com/mdd/front/controller/LoginController.java index 23531527..f165c97c 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/LoginController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/LoginController.java @@ -3,7 +3,7 @@ package com.mdd.front.controller; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.mdd.common.core.AjaxResult; import com.mdd.front.service.ILoginService; -import com.mdd.front.validate.RegParam; +import com.mdd.front.validate.RegValidate; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -27,12 +27,12 @@ public class LoginController { * 注册账号 * * @author fzr - * @param regParam 参数 - * @return Object + * @param regValidate 参数 + * @return AjaxResult */ @PostMapping("/register") - public Object register(@Validated @RequestBody RegParam regParam) { - iLoginService.register(regParam); + public AjaxResult register(@Validated @RequestBody RegValidate regValidate) { + iLoginService.register(regValidate); return AjaxResult.success(); } @@ -41,10 +41,10 @@ public class LoginController { * * @author fzr * @param params 参数 - * @return Object + * @return AjaxResult> */ @PostMapping("/check") - public Object check(@RequestBody Map params) { + public AjaxResult> check(@RequestBody Map params) { Assert.notNull(params.get("scene"), "scene参数缺失!"); Map map = new LinkedHashMap<>(); switch (params.get("scene")) { @@ -66,10 +66,10 @@ public class LoginController { * * @author fzr * @param params 参数 - * @return Object + * @return AjaxResult> */ @GetMapping("/oaLogin") - public Object oaLogin(@RequestParam Map params) { + public AjaxResult> oaLogin(@RequestParam Map params) { Map map = iLoginService.officeLogin(params); return AjaxResult.success(map); } @@ -79,10 +79,10 @@ public class LoginController { * * @author fzr * @param url 连接 - * @return Object + * @return AjaxResult> */ @GetMapping("/codeUrl") - public Object codeUrl(@RequestParam String url) { + public AjaxResult> codeUrl(@RequestParam String url) { Assert.notNull(url, "url参数不能为空"); String uri = iLoginService.codeUrl(url); Map response = new LinkedHashMap<>(); @@ -95,10 +95,10 @@ public class LoginController { * * @author fzr * @param params 参数 - * @return Object + * @return AjaxResult */ @PostMapping("/forgotPassword") - public Object forgotPassword(@RequestBody Map params) { + public AjaxResult forgotPassword(@RequestBody Map params) { iLoginService.forgotPassword(params); return AjaxResult.success(); } diff --git a/server/like-front/src/main/java/com/mdd/front/controller/SmsController.java b/server/like-front/src/main/java/com/mdd/front/controller/SmsController.java index 5fb439c3..fa3a3758 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/SmsController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/SmsController.java @@ -3,7 +3,7 @@ package com.mdd.front.controller; import com.mdd.common.core.AjaxResult; import com.mdd.common.plugin.notice.NoticeDriver; import com.mdd.common.utils.ToolsUtil; -import com.mdd.front.validate.SmsParam; +import com.mdd.front.validate.SmsValidate; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -24,14 +24,14 @@ public class SmsController { * 发送短信 * * @author fzr - * @param smsParam 参数 - * @return Object + * @param smsValidate 参数 + * @return AjaxResult */ @PostMapping("/send") - public Object send(@Validated @RequestBody SmsParam smsParam) { + public AjaxResult send(@Validated @RequestBody SmsValidate smsValidate) { Map config = new LinkedHashMap<>(); - config.put("scene", smsParam.getScene()); - config.put("mobile", smsParam.getMobile()); + config.put("scene", smsValidate.getScene()); + config.put("mobile", smsValidate.getMobile()); Map params = new LinkedHashMap<>(); params.put("code", ToolsUtil.randomInt(4)); (new NoticeDriver()).handle(config, params); diff --git a/server/like-front/src/main/java/com/mdd/front/controller/UploadController.java b/server/like-front/src/main/java/com/mdd/front/controller/UploadController.java index 7040011b..6dd10da2 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/UploadController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/UploadController.java @@ -25,10 +25,10 @@ public class UploadController { * * @author fzr * @param request 请求对象 - * @return Object + * @return AjaxResult */ @PostMapping("/image") - public Object image(HttpServletRequest request) { + public AjaxResult image(HttpServletRequest request) { MultipartFile multipartFile; try { multipartFile = ((MultipartRequest) request).getFile("file"); diff --git a/server/like-front/src/main/java/com/mdd/front/controller/UserController.java b/server/like-front/src/main/java/com/mdd/front/controller/UserController.java index 41193f13..8b1fb71d 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/UserController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/UserController.java @@ -28,10 +28,10 @@ public class UserController { * 个人中心 * * @author fzr - * @return Object + * @return AjaxResult */ @GetMapping("/center") - public Object center() { + public AjaxResult center() { UserCenterVo vo = iUserService.center(LikeFrontThreadLocal.getUserId()); return AjaxResult.success(vo); } @@ -40,10 +40,10 @@ public class UserController { * 个人信息 * * @author fzr - * @return Object + * @return AjaxResult */ @GetMapping("/info") - public Object info() { + public AjaxResult info() { UserInfoVo vo = iUserService.info(LikeFrontThreadLocal.getUserId()); return AjaxResult.success(vo); } @@ -53,10 +53,10 @@ public class UserController { * * @author fzr * @param params 参数 - * @return Object + * @return AjaxResult */ @PostMapping("/edit") - public Object edit(@RequestBody Map params) { + public AjaxResult edit(@RequestBody Map params) { Assert.notNull(params.get("field"), "field参数缺失"); Assert.notNull(params.get("value"), "value参数缺失"); Integer userId = LikeFrontThreadLocal.getUserId(); @@ -69,10 +69,10 @@ public class UserController { * * @author fzr * @param params 参数 - * @return Object + * @return AjaxResult */ @PostMapping("/changePwd") - public Object changePwd(@RequestBody Map params) { + public AjaxResult changePwd(@RequestBody Map params) { Assert.notNull(params.get("password"), "password参数缺失"); if(!Pattern.matches("^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$", params.get("password"))){ throw new OperateException("密码必须是6-20字母+数字组合!"); @@ -86,10 +86,11 @@ public class UserController { * 绑定手机号 * * @author fzr - * @return Object + * @param params 参数 + * @return AjaxResult */ @PostMapping("/bindMobile") - public Object bindMobile(@RequestBody Map params) { + public AjaxResult bindMobile(@RequestBody Map params) { Assert.notNull(params.get("type"), "type参数缺失"); Assert.notNull(params.get("mobile"), "mobile参数缺失"); Assert.notNull(params.get("code"), "code参数缺失"); @@ -108,10 +109,11 @@ public class UserController { * 微信手机号 * * @author fzr - * @return Object + * @param params 参数 + * @return AjaxResult */ @PostMapping("/mnpMobile") - public Object mnpMobile(@RequestBody Map params) { + public AjaxResult mnpMobile(@RequestBody Map params) { Assert.notNull(params.get("code"), "code参数缺失"); iUserService.mnpMobile(params.get("code").trim()); return AjaxResult.success(); diff --git a/server/like-front/src/main/java/com/mdd/front/service/IArticleService.java b/server/like-front/src/main/java/com/mdd/front/service/IArticleService.java index ff68b1e3..3e37cb05 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/IArticleService.java +++ b/server/like-front/src/main/java/com/mdd/front/service/IArticleService.java @@ -1,7 +1,7 @@ package com.mdd.front.service; import com.mdd.common.core.PageResult; -import com.mdd.front.validate.PageParam; +import com.mdd.front.validate.PageValidate; import com.mdd.front.vo.article.ArticleCateVo; import com.mdd.front.vo.article.ArticleCollectVo; import com.mdd.front.vo.article.ArticleDetailVo; @@ -26,12 +26,12 @@ public interface IArticleService { * 文章分类 * * @author fzr - * @param pageParam 分页参数 + * @param pageValidate 分页参数 * @param cid 分类ID * @param userId 用户ID * @return PageResult */ - PageResult list(PageParam pageParam, Integer cid, Integer userId); + PageResult list(PageValidate pageValidate, Integer cid, Integer userId); /** * 文章详情 @@ -47,11 +47,11 @@ public interface IArticleService { * 文章收藏 * * @author fzr - * @param pageParam 分页参数 + * @param pageValidate 分页参数 * @param userId 用户ID * @return PageResult */ - PageResult collect(PageParam pageParam, Integer userId); + PageResult collect(PageValidate pageValidate, Integer userId); /** * 加入收藏 diff --git a/server/like-front/src/main/java/com/mdd/front/service/IIndexService.java b/server/like-front/src/main/java/com/mdd/front/service/IIndexService.java index 6a48c825..f272b930 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/IIndexService.java +++ b/server/like-front/src/main/java/com/mdd/front/service/IIndexService.java @@ -1,7 +1,7 @@ package com.mdd.front.service; import com.mdd.common.core.PageResult; -import com.mdd.front.validate.PageParam; +import com.mdd.front.validate.PageValidate; import com.mdd.front.vo.article.ArticleListVo; import java.util.List; @@ -57,9 +57,9 @@ public interface IIndexService { * 搜索 * * @author fzr - * @param pageParam 分页参数 + * @param pageValidate 分页参数 * @param params 搜索参数 * @return PageResult */ - PageResult search(PageParam pageParam, Map params); + PageResult search(PageValidate pageValidate, Map params); } diff --git a/server/like-front/src/main/java/com/mdd/front/service/ILoginService.java b/server/like-front/src/main/java/com/mdd/front/service/ILoginService.java index 33a0f4de..6a0a31fb 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/ILoginService.java +++ b/server/like-front/src/main/java/com/mdd/front/service/ILoginService.java @@ -1,6 +1,6 @@ package com.mdd.front.service; -import com.mdd.front.validate.RegParam; +import com.mdd.front.validate.RegValidate; import java.util.Map; @@ -13,9 +13,9 @@ public interface ILoginService { * 账号注册 * * @author fzr - * @param regParam 参数 + * @param regValidate 参数 */ - void register(RegParam regParam); + void register(RegValidate regValidate); /** * 微信登录 diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java index 67f00030..e67f3334 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java @@ -10,7 +10,6 @@ import com.mdd.common.core.PageResult; import com.mdd.common.entity.article.Article; import com.mdd.common.entity.article.ArticleCategory; import com.mdd.common.entity.article.ArticleCollect; -import com.mdd.common.entity.server.Sys; import com.mdd.common.mapper.article.ArticleCategoryMapper; import com.mdd.common.mapper.article.ArticleCollectMapper; import com.mdd.common.mapper.article.ArticleMapper; @@ -18,12 +17,11 @@ import com.mdd.common.utils.StringUtil; import com.mdd.common.utils.TimeUtil; import com.mdd.common.utils.UrlUtil; import com.mdd.front.service.IArticleService; -import com.mdd.front.validate.PageParam; +import com.mdd.front.validate.PageValidate; import com.mdd.front.vo.article.ArticleCateVo; import com.mdd.front.vo.article.ArticleCollectVo; import com.mdd.front.vo.article.ArticleDetailVo; import com.mdd.front.vo.article.ArticleListVo; -import net.sf.jsqlparser.statement.create.table.Index; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -76,15 +74,15 @@ public class ArticleServiceImpl implements IArticleService { * 文章列表 * * @author fzr - * @param pageParam 分页参数 + * @param pageValidate 分页参数 * @param cid 分类ID * @param userId 用户ID * @return PageResult */ @Override - public PageResult list(PageParam pageParam, Integer cid, Integer userId) { - Integer pageNo = pageParam.getPageNo(); - Integer pageSize = pageParam.getPageSize(); + public PageResult list(PageValidate pageValidate, Integer cid, Integer userId) { + Integer pageNo = pageValidate.getPageNo(); + Integer pageSize = pageValidate.getPageSize(); QueryWrapper
queryWrapper = new QueryWrapper<>(); queryWrapper.select("id,title,image,intro,visit,create_time"); @@ -171,14 +169,14 @@ public class ArticleServiceImpl implements IArticleService { * 收藏列表 * * @author fzr - * @param pageParam 分页参数 + * @param pageValidate 分页参数 * @param userId 用户ID * @return PageResult */ @Override - public PageResult collect(PageParam pageParam, Integer userId) { - Integer pageNo = pageParam.getPageNo(); - Integer pageSize = pageParam.getPageSize(); + public PageResult collect(PageValidate pageValidate, Integer userId) { + Integer pageNo = pageValidate.getPageNo(); + Integer pageSize = pageValidate.getPageSize(); MPJQueryWrapper mpjQueryWrapper = new MPJQueryWrapper<>(); mpjQueryWrapper.select("t.id,t.article_id,a.title,a.image,a.intro,a.visit,a.create_time") diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java index effc801e..1b8e9fcd 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java @@ -8,16 +8,16 @@ import com.github.yulichang.query.MPJQueryWrapper; import com.mdd.common.config.GlobalConfig; import com.mdd.common.core.PageResult; import com.mdd.common.entity.article.Article; -import com.mdd.common.entity.decorate.DecoratePage; -import com.mdd.common.entity.decorate.DecorateTabbar; +import com.mdd.common.entity.DecoratePage; +import com.mdd.common.entity.DecorateTabbar; import com.mdd.common.entity.setting.HotSearch; import com.mdd.common.mapper.article.ArticleMapper; -import com.mdd.common.mapper.decorate.DecoratePageMapper; -import com.mdd.common.mapper.decorate.DecorateTabbarMapper; +import com.mdd.common.mapper.DecoratePageMapper; +import com.mdd.common.mapper.DecorateTabbarMapper; import com.mdd.common.mapper.setting.HotSearchMapper; import com.mdd.common.utils.*; import com.mdd.front.service.IIndexService; -import com.mdd.front.validate.PageParam; +import com.mdd.front.validate.PageValidate; import com.mdd.front.vo.article.ArticleListVo; import org.springframework.stereotype.Service; @@ -211,13 +211,13 @@ public class IndexServiceImpl implements IIndexService { * 搜索 * * @author fzr - * @param pageParam 分页参数 + * @param pageValidate 分页参数 * @param params 搜索参数 * @return PageResult */ - public PageResult search(PageParam pageParam, Map params) { - Integer pageNo = pageParam.getPageNo(); - Integer pageSize = pageParam.getPageSize(); + public PageResult search(PageValidate pageValidate, Map params) { + Integer pageNo = pageValidate.getPageNo(); + Integer pageSize = pageValidate.getPageSize(); MPJQueryWrapper
mpjQueryWrapper = new MPJQueryWrapper
() .selectAll(Article.class) diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java index 595b35ac..6bb84026 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java @@ -2,7 +2,6 @@ package com.mdd.front.service.impl; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.mdd.common.config.GlobalConfig; @@ -16,7 +15,7 @@ import com.mdd.common.mapper.user.UserMapper; import com.mdd.common.utils.*; import com.mdd.front.config.FrontConfig; import com.mdd.front.service.ILoginService; -import com.mdd.front.validate.RegParam; +import com.mdd.front.validate.RegValidate; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken; @@ -47,13 +46,13 @@ public class LoginServiceImpl implements ILoginService { * 注册账号 * * @author fzr - * @param regParam 参数 + * @param regValidate 参数 */ @Override - public void register(RegParam regParam) { + public void register(RegValidate regValidate) { User model = userMapper.selectOne(new QueryWrapper() .select("id,sn,username") - .eq("username", regParam.getUsername()) + .eq("username", regValidate.getUsername()) .eq("is_delete", 0) .last("limit 1")); @@ -61,16 +60,16 @@ public class LoginServiceImpl implements ILoginService { Integer sn = this.randMakeSn(); String salt = ToolsUtil.randomString(5); - String pwd = ToolsUtil.makeMd5(regParam.getPassword()+salt); + String pwd = ToolsUtil.makeMd5(regValidate.getPassword()+salt); User user = new User(); user.setSn(sn); user.setNickname("用户"+sn); - user.setUsername(regParam.getUsername()); + user.setUsername(regValidate.getUsername()); user.setPassword(pwd); user.setSalt(salt); user.setAvatar("/api/static/default_avatar.png"); - user.setChannel(regParam.getClient()); + user.setChannel(regValidate.getClient()); user.setCreateTime(System.currentTimeMillis() / 1000); user.setUpdateTime(System.currentTimeMillis() / 1000); userMapper.insert(user); diff --git a/server/like-front/src/main/java/com/mdd/front/validate/BaseParam.java b/server/like-front/src/main/java/com/mdd/front/validate/BaseParam.java deleted file mode 100644 index 6269989b..00000000 --- a/server/like-front/src/main/java/com/mdd/front/validate/BaseParam.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.mdd.front.validate; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class BaseParam implements Serializable { - - private static final long serialVersionUID = 1L; - - public interface create{} - public interface update{} - public interface delete{} - public interface change{} - -} diff --git a/server/like-front/src/main/java/com/mdd/front/validate/PageParam.java b/server/like-front/src/main/java/com/mdd/front/validate/PageValidate.java similarity index 76% rename from server/like-front/src/main/java/com/mdd/front/validate/PageParam.java rename to server/like-front/src/main/java/com/mdd/front/validate/PageValidate.java index 21cbaeb0..31bdb2b9 100644 --- a/server/like-front/src/main/java/com/mdd/front/validate/PageParam.java +++ b/server/like-front/src/main/java/com/mdd/front/validate/PageValidate.java @@ -1,8 +1,6 @@ package com.mdd.front.validate; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; import javax.validation.constraints.DecimalMax; import javax.validation.constraints.DecimalMin; @@ -12,9 +10,9 @@ import java.io.Serializable; * 分页参数 */ @Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class PageParam extends BaseParam { +public class PageValidate implements Serializable { + + private static final long serialVersionUID = 1L; // 当前分页 @DecimalMin(value = "1", message = "pageNo参数必须大于0的数字") diff --git a/server/like-front/src/main/java/com/mdd/front/validate/RegParam.java b/server/like-front/src/main/java/com/mdd/front/validate/RegValidate.java similarity index 85% rename from server/like-front/src/main/java/com/mdd/front/validate/RegParam.java rename to server/like-front/src/main/java/com/mdd/front/validate/RegValidate.java index 55200bcf..760a0a4e 100644 --- a/server/like-front/src/main/java/com/mdd/front/validate/RegParam.java +++ b/server/like-front/src/main/java/com/mdd/front/validate/RegValidate.java @@ -2,8 +2,6 @@ package com.mdd.front.validate; import com.mdd.common.validator.annotation.IntegerContains; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotEmpty; @@ -15,9 +13,9 @@ import java.io.Serializable; * 注册参数类 */ @Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class RegParam extends BaseParam { +public class RegValidate implements Serializable { + + private static final long serialVersionUID = 1L; @NotNull(message = "username参数缺失") @NotEmpty(message = "账号不能为空") diff --git a/server/like-front/src/main/java/com/mdd/front/validate/SmsParam.java b/server/like-front/src/main/java/com/mdd/front/validate/SmsValidate.java similarity index 79% rename from server/like-front/src/main/java/com/mdd/front/validate/SmsParam.java rename to server/like-front/src/main/java/com/mdd/front/validate/SmsValidate.java index b3417d18..e6a5a827 100644 --- a/server/like-front/src/main/java/com/mdd/front/validate/SmsParam.java +++ b/server/like-front/src/main/java/com/mdd/front/validate/SmsValidate.java @@ -1,8 +1,6 @@ package com.mdd.front.validate; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotEmpty; @@ -11,9 +9,9 @@ import javax.validation.constraints.Pattern; import java.io.Serializable; @Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class SmsParam extends BaseParam { +public class SmsValidate implements Serializable { + + private static final long serialVersionUID = 1L; @NotNull(message = "scene参数缺失") @NotEmpty(message = "场景不能为空") diff --git a/server/pom.xml b/server/pom.xml index 6554275f..3401b887 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -18,36 +18,44 @@ - 1.0.0 UTF-8 UTF-8 1.8 1.8 + + 1.0.0 1.8 2.16.0 + 5.1.49 - 3.4.3.1 - 1.2.2 - 1.4.0 - 1.18.22 - 2.0.12 - 2.10.0 + 3.5.2 + 1.2.4 + 1.4.5 + + 1.18.24 + 2.0.16 3.12.0 - 2.9.0 - 1.2.4 2.11.0 + 2.11.1 + 2.9.0 + + 1.2.4 + 6.1.2 + 1.31.0 + 7.9.5 5.6.54 3.1.411 3.10.2 4.5.16 - 6.1.2 + + 4.4.0 - + org.springframework.boot spring-boot-dependencies @@ -55,109 +63,148 @@ pom import - + + mysql mysql-connector-java ${mysql-connector.version} - + + com.baomidou mybatis-plus-boot-starter ${mybatis-plus.version} - + + com.github.yulichang mybatis-plus-join ${mybatis-plus-join.version} - + + com.github.pagehelper pagehelper-spring-boot-starter ${pagehelper.version} - + + + + org.apache.commons + commons-pool2 + ${commons-pool2.version} + + + org.projectlombok lombok ${lombok.version} - + + - com.alibaba - fastjson - ${fastJson.version} + com.alibaba.fastjson2 + fastjson2 + ${fastJson2.version} - + + - org.apache.commons - commons-lang3 - ${commons-lang3.version} + cn.dev33 + sa-token-spring-boot-starter + ${sa-token.version} - - - org.apache.commons - commons-pool2 - ${apache-commons.version} - - + + com.google.code.gson gson - ${gson.version} + ${google-gson.version} - + + nl.bitwalker UserAgentUtils ${bitwalker.version} - + + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + commons-io commons-io ${commons.io.version} - + + com.qiniu qiniu-java-sdk ${qiniu.version} + com.qcloud cos_api ${qcloud-version} + com.aliyun.oss aliyun-sdk-oss ${aliyun-oss.version} - + + com.tencentcloudapi tencentcloud-sdk-java ${tencentcloudapi.version} - + + com.aliyun aliyun-java-sdk-core ${aliyun-java.version} - + + com.github.oshi oshi-core ${oshi-core.version} - + + + + com.github.binarywang + weixin-java-miniapp + ${weixin.version} + + + + + com.github.binarywang + weixin-java-mp + ${weixin.version} + + + org.mdd like-common