diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java index 64e0b76..72cb357 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java @@ -118,7 +118,7 @@ public class GenController extends BaseController { @RequiresPermissions("tool:gen:remove") @Log(title = "代码生成", businessType = BusinessType.DELETE) @DeleteMapping("/{tableIds}") - public Result remove (@PathVariable("tableIds") Long[] tableIds) { + public Result remove (@PathVariable("tableIds")List tableIds) { genTableService.deleteGenTableByIds(tableIds); return success(); } diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java index 895b1ed..9a9ac0a 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java @@ -62,7 +62,7 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService { * @return 结果 */ @Override - public int deleteGenTableColumnByIds (String ids) { - return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids)); + public int deleteGenTableColumnByIds (List ids) { + return genTableColumnMapper.deleteGenTableColumnByIds(ids); } } diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java index b60ea57..f1d89af 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java @@ -44,5 +44,5 @@ public interface IGenTableColumnService { * * @return 结果 */ - int deleteGenTableColumnByIds (String ids); + int deleteGenTableColumnByIds (List ids); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java index 24c5852..e18dca0 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java @@ -1,6 +1,5 @@ package com.muyu.system.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.poi.ExcelUtil; @@ -10,7 +9,6 @@ import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; import com.muyu.system.domain.SysConfig; import com.muyu.system.domain.model.SysConfigPageQueryModel; import com.muyu.system.domain.rep.SysConfigAddReq; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java index 0924930..ebc9694 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java @@ -1,9 +1,9 @@ package com.muyu.system.controller; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.enums.SysNormalDisableEnum; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java index 790aa23..ebfc821 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java @@ -1,9 +1,9 @@ package com.muyu.system.controller; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.log.annotation.Log; @@ -15,11 +15,11 @@ import com.muyu.system.domain.model.SysDictDataPageQueryModel; import com.muyu.system.domain.rep.SysDictDataListReq; import com.muyu.system.service.SysDictDataService; import com.muyu.system.service.SysDictTypeService; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; @@ -83,7 +83,7 @@ public class SysDictDataController extends BaseController { @RequiresPermissions("system:dict:add") @Log(title = "字典数据", businessType = BusinessType.INSERT) @PostMapping - public Result add (@Validated @RequestBody SysDictData dict) { + public Result add (@Validated @RequestBody SysDictData dict) { dict.setCreateBy(SecurityUtils.getUsername()); dictDataService.insertDictData(dict); return Result.success(); @@ -95,7 +95,7 @@ public class SysDictDataController extends BaseController { @RequiresPermissions("system:dict:edit") @Log(title = "字典数据", businessType = BusinessType.UPDATE) @PutMapping - public Result edit (@Validated @RequestBody SysDictData dict) { + public Result edit (@Validated @RequestBody SysDictData dict) { dict.setUpdateBy(SecurityUtils.getUsername()); dictDataService.updateDictData(dict); return Result.success(); @@ -107,7 +107,7 @@ public class SysDictDataController extends BaseController { @RequiresPermissions("system:dict:remove") @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping("/{dictCodes}") - public Result remove (@PathVariable("dictCodes") Long[] dictCodes) { + public Result remove (@PathVariable("dictCodes") List dictCodes) { dictDataService.deleteDictDataByIds(dictCodes); return success(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java index 1d66f22..a5b08f5 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java @@ -1,8 +1,8 @@ package com.muyu.system.controller; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; @@ -10,11 +10,11 @@ import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDictType; import com.muyu.system.service.SysDictTypeService; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** @@ -89,7 +89,7 @@ public class SysDictTypeController extends BaseController { @RequiresPermissions("system:dict:remove") @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping("/{dictIds}") - public Result remove (@PathVariable("dictIds") Long[] dictIds) { + public Result remove (@PathVariable("dictIds") List dictIds) { dictTypeService.deleteDictTypeByIds(dictIds); return success(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java index e5f54cb..a4f2916 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java @@ -1,9 +1,9 @@ package com.muyu.system.controller; import com.muyu.common.core.constant.CacheConstants; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.log.annotation.Log; @@ -16,10 +16,10 @@ import com.muyu.system.domain.model.SysLogininforExportModel; import com.muyu.system.domain.model.SysLogininforListModel; import com.muyu.system.domain.rep.SysLogininforListReq; import com.muyu.system.service.SysLogininforService; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java index 256ba61..bca363d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java @@ -1,9 +1,9 @@ package com.muyu.system.controller; import com.muyu.common.core.constant.UserConstants; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java index bfeb03d..d61a49b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java @@ -1,7 +1,7 @@ package com.muyu.system.controller; -import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.log.annotation.Log; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java index c0c5e91..bf825c0 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java @@ -1,19 +1,22 @@ package com.muyu.system.controller; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.DataPageResp; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.InnerAuth; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.system.domain.SysOperLog; +import com.muyu.system.domain.model.SysOperlogPageQueryModel; +import com.muyu.system.domain.rep.SysOperlogListReq; import com.muyu.system.service.SysOperLogService; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** @@ -29,38 +32,45 @@ public class SysOperlogController extends BaseController { @RequiresPermissions("system:operlog:list") @PostMapping("/list") - public Result> list (@RequestBody SysOperLog operLog) { - List list = operLogService.selectOperLogList(operLog); - return Result.success(new DataPageResp<>(0,list)); + public Result> list (@RequestBody SysOperlogListReq sysOperlogListReq) { + PageQueryModel sysOperLogPageQueryModel = operLogService.pageQuery( + SysOperlogPageQueryModel.reqBuild(sysOperlogListReq) + ); + return Result.success(DataPageResp.of(sysOperLogPageQueryModel)); } @Log(title = "操作日志", businessType = BusinessType.EXPORT) @RequiresPermissions("system:operlog:export") @PostMapping("/export") - public void export (HttpServletResponse response, SysOperLog operLog) { - List list = operLogService.selectOperLogList(operLog); + public void export (HttpServletResponse response, SysOperlogListReq sysOperlogListReq) { + // TODO 导出需要重新编写 + PageQueryModel sysOperLogPageQueryModel = operLogService.pageQuery( + SysOperlogPageQueryModel.reqBuild(sysOperlogListReq) + ); ExcelUtil util = new ExcelUtil(SysOperLog.class); - util.exportExcel(response, list, "操作日志"); + util.exportExcel(response, sysOperLogPageQueryModel.getDataList(), "操作日志"); } @Log(title = "操作日志", businessType = BusinessType.DELETE) @RequiresPermissions("system:operlog:remove") @DeleteMapping("/{operIds}") - public Result remove (@PathVariable("operIds") Long[] operIds) { - return toAjax(operLogService.deleteOperLogByIds(operIds)); + public Result remove (@PathVariable("operIds") List operIds) { + operLogService.deleteOperLogByIds(operIds); + return Result.success(); } @RequiresPermissions("system:operlog:remove") @Log(title = "操作日志", businessType = BusinessType.CLEAN) @DeleteMapping("/clean") - public Result clean () { + public Result clean () { operLogService.cleanOperLog(); return success(); } @InnerAuth @PostMapping - public Result add (@RequestBody SysOperLog operLog) { - return toAjax(operLogService.insertOperlog(operLog)); + public Result add (@RequestBody SysOperLog operLog) { + operLogService.insertOperlog(operLog); + return Result.success(); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java index 1888eb7..9121c77 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java @@ -1,20 +1,23 @@ package com.muyu.system.controller; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.DataPageResp; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.system.domain.SysPost; +import com.muyu.system.domain.model.SysPostPageQueryModel; +import com.muyu.system.domain.rep.SysPostListReq; import com.muyu.system.service.SysPostService; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** @@ -33,18 +36,23 @@ public class SysPostController extends BaseController { */ @RequiresPermissions("system:post:list") @PostMapping("/list") - public Result> list (@RequestBody SysPost post) { - List list = postService.selectPostList(post); - return Result.success(new DataPageResp<>(0,list)); + public Result> list (@RequestBody SysPostListReq postListReq) { + PageQueryModel sysPostPageQueryModel = postService.pageQuery( + SysPostPageQueryModel.reqBuild(postListReq) + ); + return Result.success(DataPageResp.of(sysPostPageQueryModel)); } @Log(title = "岗位管理", businessType = BusinessType.EXPORT) @RequiresPermissions("system:post:export") @PostMapping("/export") - public void export (HttpServletResponse response, SysPost post) { - List list = postService.selectPostList(post); + public void export (HttpServletResponse response, SysPostListReq postListReq) { + // TODO 导出重写 + PageQueryModel sysPostPageQueryModel = postService.pageQuery( + SysPostPageQueryModel.reqBuild(postListReq) + ); ExcelUtil util = new ExcelUtil(SysPost.class); - util.exportExcel(response, list, "岗位数据"); + util.exportExcel(response, sysPostPageQueryModel.getDataList(), "岗位数据"); } /** @@ -52,7 +60,7 @@ public class SysPostController extends BaseController { */ @RequiresPermissions("system:post:query") @GetMapping(value = "/{postId}") - public Result getInfo (@PathVariable("postId") Long postId) { + public Result getInfo (@PathVariable("postId") Long postId) { return success(postService.selectPostById(postId)); } @@ -62,14 +70,15 @@ public class SysPostController extends BaseController { @RequiresPermissions("system:post:add") @Log(title = "岗位管理", businessType = BusinessType.INSERT) @PostMapping - public Result add (@Validated @RequestBody SysPost post) { + public Result add (@Validated @RequestBody SysPost post) { if (!postService.checkPostNameUnique(post)) { return error("新增岗位'" + post.getPostName() + "'失败,岗位名称已存在"); } else if (!postService.checkPostCodeUnique(post)) { return error("新增岗位'" + post.getPostName() + "'失败,岗位编码已存在"); } post.setCreateBy(SecurityUtils.getUsername()); - return toAjax(postService.insertPost(post)); + postService.insertPost(post); + return Result.success(); } /** @@ -78,14 +87,15 @@ public class SysPostController extends BaseController { @RequiresPermissions("system:post:edit") @Log(title = "岗位管理", businessType = BusinessType.UPDATE) @PutMapping - public Result edit (@Validated @RequestBody SysPost post) { + public Result edit (@Validated @RequestBody SysPost post) { if (!postService.checkPostNameUnique(post)) { return error("修改岗位'" + post.getPostName() + "'失败,岗位名称已存在"); } else if (!postService.checkPostCodeUnique(post)) { return error("修改岗位'" + post.getPostName() + "'失败,岗位编码已存在"); } post.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(postService.updatePost(post)); + postService.updatePost(post); + return Result.success(); } /** @@ -94,15 +104,16 @@ public class SysPostController extends BaseController { @RequiresPermissions("system:post:remove") @Log(title = "岗位管理", businessType = BusinessType.DELETE) @DeleteMapping("/{postIds}") - public Result remove (@PathVariable("postIds") Long[] postIds) { - return toAjax(postService.deletePostByIds(postIds)); + public Result remove (@PathVariable("postIds")List postIds) { + postService.deletePostByIds(postIds); + return Result.success(); } /** * 获取岗位选择框列表 */ @GetMapping("/optionselect") - public Result optionselect () { + public Result> optionselect () { List posts = postService.selectPostAll(); return success(posts); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java index fbc5987..0960c6d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java @@ -9,10 +9,10 @@ import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.service.TokenService; import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.remote.RemoteFileService; +import com.muyu.common.system.domain.LoginUser; import com.muyu.common.system.domain.SysFile; import com.muyu.common.system.domain.SysUser; -import com.muyu.common.system.domain.LoginUser; +import com.muyu.common.system.remote.RemoteFileService; import com.muyu.system.domain.resp.ProfileResp; import com.muyu.system.service.SysUserService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java index 4f7e1fa..0ce451a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java @@ -1,8 +1,8 @@ package com.muyu.system.controller; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; @@ -15,11 +15,11 @@ import com.muyu.system.domain.resp.DeptTreeResp; import com.muyu.system.service.SysDeptService; import com.muyu.system.service.SysRoleService; import com.muyu.system.service.SysUserService; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java index 14c9cf4..2e5d44a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java @@ -10,20 +10,20 @@ import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.InnerAuth; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.LoginUser; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; -import com.muyu.common.system.domain.LoginUser; import com.muyu.system.domain.resp.AuthRoleResp; import com.muyu.system.domain.resp.UserDetailInfoResp; import com.muyu.system.domain.resp.UserInfoResp; import com.muyu.system.domain.vo.TreeSelect; import com.muyu.system.service.*; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; import java.util.Set; import java.util.stream.Collectors; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java index 99a2325..d87eac8 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java @@ -1,9 +1,9 @@ package com.muyu.system.controller; import com.muyu.common.core.constant.CacheConstants; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java index 3ff99b0..6c531b7 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java @@ -9,15 +9,14 @@ import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.system.domain.rep.SysConfigAddReq; import com.muyu.system.domain.rep.SysConfigUpdReq; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; - /** * 参数配置表 sys_config * diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java index 9252b3b..736e81b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java @@ -5,12 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.SuperBuilder; - import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; +import lombok.*; +import lombok.experimental.SuperBuilder; + import java.util.ArrayList; import java.util.List; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java index f574890..9774297 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java @@ -5,15 +5,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.common.core.xss.Xss; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; - /** * 通知公告表 sys_notice * diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java index d82919b..8b6f665 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java @@ -6,12 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.SuperBuilder; - import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; +import lombok.*; +import lombok.experimental.SuperBuilder; /** * 岗位表 sys_post diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java index 49e5170..059dd7f 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java @@ -1,7 +1,5 @@ package com.muyu.system.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java index c548b8a..9a9268f 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java @@ -1,8 +1,6 @@ package com.muyu.system.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserOnline.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserOnline.java index 5a4c364..abe13ec 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserOnline.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserOnline.java @@ -1,7 +1,5 @@ package com.muyu.system.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserPost.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserPost.java index f83249d..43ff48b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserPost.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserPost.java @@ -1,7 +1,5 @@ package com.muyu.system.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserRole.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserRole.java index 1bead41..3ae2b70 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserRole.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserRole.java @@ -1,7 +1,5 @@ package com.muyu.system.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictDataPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictDataPageQueryModel.java index 733351b..e3ac07b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictDataPageQueryModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictDataPageQueryModel.java @@ -2,15 +2,12 @@ package com.muyu.system.domain.model; import com.muyu.common.core.web.model.QueryModel; import com.muyu.system.domain.rep.SysDictDataListReq; -import com.muyu.system.domain.rep.SysDictTypeListReq; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import java.util.Date; - /** * 参数配置 分页 模型 */ diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypePageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypePageQueryModel.java index ab6ae4b..75f11e0 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypePageQueryModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypePageQueryModel.java @@ -1,9 +1,6 @@ package com.muyu.system.domain.model; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.model.QueryModel; -import com.muyu.system.domain.rep.SysDeptListReq; import com.muyu.system.domain.rep.SysDictTypeListReq; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforExportModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforExportModel.java index 4a55bda..02aa43e 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforExportModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforExportModel.java @@ -1,6 +1,5 @@ package com.muyu.system.domain.model; -import com.muyu.common.core.web.model.QueryModel; import com.muyu.system.domain.rep.SysLogininforListReq; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforListModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforListModel.java index 6b0d3bf..eb86184 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforListModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforListModel.java @@ -1,8 +1,6 @@ package com.muyu.system.domain.model; import com.muyu.common.core.web.model.QueryModel; -import com.muyu.common.core.web.page.PageQueryModel; -import com.muyu.common.core.web.page.PageReq; import com.muyu.system.domain.rep.SysLogininforListReq; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforPageQueryModel.java index e8f0f5c..0385706 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforPageQueryModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforPageQueryModel.java @@ -1,13 +1,12 @@ package com.muyu.system.domain.model; import com.muyu.common.core.web.model.QueryModel; -import com.muyu.system.domain.rep.SysDictTypeListReq; import com.muyu.system.domain.rep.SysLogininforListReq; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import lombok.EqualsAndHashCode; import java.util.Date; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuPageQueryModel.java index ce4410c..cbc9860 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuPageQueryModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuPageQueryModel.java @@ -1,7 +1,6 @@ package com.muyu.system.domain.model; import com.muyu.common.core.web.model.QueryModel; -import com.muyu.system.domain.rep.SysLogininforListReq; import com.muyu.system.domain.rep.SysMenuListReq; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticePageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticePageQueryModel.java index 7038148..f2fc800 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticePageQueryModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticePageQueryModel.java @@ -1,7 +1,6 @@ package com.muyu.system.domain.model; import com.muyu.common.core.web.model.QueryModel; -import com.muyu.system.domain.rep.SysMenuListReq; import com.muyu.system.domain.rep.SysNoticeListReq; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysOperlogPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysOperlogPageQueryModel.java index a87b94d..3589c05 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysOperlogPageQueryModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysOperlogPageQueryModel.java @@ -1,7 +1,6 @@ package com.muyu.system.domain.model; import com.muyu.common.core.web.model.QueryModel; -import com.muyu.system.domain.rep.SysNoticeListReq; import com.muyu.system.domain.rep.SysOperlogListReq; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostPageQueryModel.java index 44339d4..4ab654c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostPageQueryModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostPageQueryModel.java @@ -1,7 +1,6 @@ package com.muyu.system.domain.model; import com.muyu.common.core.web.model.QueryModel; -import com.muyu.system.domain.rep.SysOperlogListReq; import com.muyu.system.domain.rep.SysPostListReq; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysRolePageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysRolePageQueryModel.java index 1604b04..15d23bc 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysRolePageQueryModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysRolePageQueryModel.java @@ -8,7 +8,6 @@ package com.muyu.system.domain.model; import com.muyu.common.core.web.model.QueryModel; -import com.muyu.system.domain.rep.SysPostListReq; import com.muyu.system.domain.rep.SysRoleListReq; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysUserPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysUserPageQueryModel.java index b8e8417..d08c98a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysUserPageQueryModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysUserPageQueryModel.java @@ -2,7 +2,6 @@ package com.muyu.system.domain.model; import com.muyu.common.core.web.model.QueryModel; -import com.muyu.system.domain.rep.SysPostListReq; import com.muyu.system.domain.rep.SysUserListReq; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigListReq.java index 88bd617..683c45b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigListReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigListReq.java @@ -1,7 +1,10 @@ package com.muyu.system.domain.rep; import com.muyu.common.core.web.page.PageReq; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import java.util.Date; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictTypeListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictTypeListReq.java index 886216a..7d2e63b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictTypeListReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictTypeListReq.java @@ -1,7 +1,5 @@ package com.muyu.system.domain.rep; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.page.PageReq; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforListReq.java index eefc8a8..da808f9 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforListReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforListReq.java @@ -1,9 +1,7 @@ package com.muyu.system.domain.rep; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.muyu.common.core.web.page.PageReq; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostListReq.java index 3ad620e..c5b4170 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostListReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostListReq.java @@ -6,7 +6,6 @@ package com.muyu.system.domain.rep; * @Date 2024/12/16 11:32 */ -import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.page.PageReq; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysRoleListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysRoleListReq.java index 4d90125..5ac4d75 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysRoleListReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysRoleListReq.java @@ -1,6 +1,5 @@ package com.muyu.system.domain.rep; -import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.page.PageReq; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysUserListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysUserListReq.java index db9480f..0d44850 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysUserListReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysUserListReq.java @@ -6,7 +6,6 @@ package com.muyu.system.domain.rep; * @Date 2024/12/16 12:30 */ -import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.page.PageReq; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java index 6ea8d3f..5f680d0 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java @@ -2,7 +2,6 @@ package com.muyu.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; -import lombok.Setter; import java.util.List; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java index 193ffdc..27c9adc 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java @@ -1,6 +1,5 @@ package com.muyu.system.mapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysDept; import org.apache.ibatis.annotations.Param; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java index 308a1f3..ed3407a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java @@ -2,9 +2,6 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysDictData; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** * 字典表 数据层 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java index 69cbeed..9dcc527 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java @@ -3,8 +3,6 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysDictType; -import java.util.List; - /** * 字典表 数据层 * diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java index 60a9c6f..a7ab3f2 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java @@ -3,8 +3,6 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysLogininfor; -import java.util.List; - /** * 系统访问日志情况信息 数据层 * diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java index 9d5475d..e5191a9 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java @@ -3,8 +3,6 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.system.domain.SysNotice; -import java.util.List; - /** * 通知公告表 数据层 * diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java index 347e67e..fa0b290 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java @@ -3,8 +3,6 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysOperLog; -import java.util.List; - /** * 操作日志 数据层 * diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java index 24ee529..9ce8005 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java @@ -4,8 +4,6 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.system.domain.SysRoleDept; -import java.util.List; - /** * 角色与部门关联表 数据层 * diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java index 7f5bd67..935ec94 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java @@ -3,9 +3,6 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.system.domain.SysRoleMenu; -import feign.Param; - -import java.util.List; /** * 角色与菜单关联表 数据层 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java index a40483a..b4dec78 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java @@ -2,7 +2,6 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysUser; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java index 121c307..ba4dc2d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java @@ -3,8 +3,6 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.system.domain.SysUserPost; -import java.util.List; - /** * 用户与岗位关联表 数据层 * diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java index 42f75e0..0b1492a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java @@ -2,9 +2,6 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.system.domain.SysUserRole; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** * 用户与角色关联表 数据层 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java index 791711f..3c64aa7 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java @@ -5,7 +5,6 @@ import com.muyu.system.domain.SysConfig; import jakarta.annotation.PostConstruct; import lombok.extern.log4j.Log4j2; import org.springframework.amqp.core.Queue; -import org.springframework.amqp.rabbit.annotation.RabbitHandler; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java index bb3ada7..8e6cb95 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java @@ -1,13 +1,10 @@ package com.muyu.system.service; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.system.domain.SysConfig; import com.muyu.system.domain.model.SysConfigPageQueryModel; -import java.util.List; - /** * 系统配置业务层 * @author DongZl diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java index 45234ea..b6aaec4 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java @@ -1,11 +1,7 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.common.core.web.page.PageQueryModel; -import com.muyu.common.system.domain.SysLogininfor; import com.muyu.system.domain.SysMenu; -import com.muyu.system.domain.model.SysLogininforPageQueryModel; -import com.muyu.system.domain.model.SysMenuPageQueryModel; import com.muyu.system.domain.vo.RouterVo; import com.muyu.system.domain.vo.TreeSelect; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java index 531735b..bf3622b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java @@ -1,6 +1,5 @@ package com.muyu.system.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.system.domain.LoginUser; import com.muyu.system.domain.SysUserOnline; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserRoleService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserRoleService.java index 409f3e2..bb2b9e1 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserRoleService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserRoleService.java @@ -2,7 +2,6 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.system.domain.SysUserRole; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java index a614e05..637193e 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java @@ -16,7 +16,6 @@ import org.springframework.stereotype.Service; import org.springframework.util.Assert; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.Objects; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java index 6339865..2fbe343 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java @@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; -import com.muyu.common.core.enums.SysNormalDisableEnum; -import com.muyu.common.core.enums.SysWhetherEnum; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.page.PageQueryModel; @@ -13,7 +11,6 @@ import com.muyu.common.security.utils.DictUtils; import com.muyu.common.system.domain.SysDictData; import com.muyu.common.system.domain.SysDictType; import com.muyu.system.domain.model.SysDictTypePageQueryModel; -import com.muyu.system.mapper.SysDictDataMapper; import com.muyu.system.mapper.SysDictTypeMapper; import com.muyu.system.service.SysDictDataService; import com.muyu.system.service.SysDictTypeService; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java index c5eb3db..c5a14e7 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.system.domain.SysLogininfor; -import com.muyu.system.domain.SysConfig; import com.muyu.system.domain.model.SysLogininforExportModel; import com.muyu.system.domain.model.SysLogininforListModel; import com.muyu.system.mapper.SysLogininforMapper; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java index 9603dc9..1cf8411 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java @@ -1,24 +1,19 @@ package com.muyu.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.Constants; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.SysLogininfor; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.SysMenu; -import com.muyu.system.domain.model.SysMenuPageQueryModel; import com.muyu.system.domain.vo.MetaVo; import com.muyu.system.domain.vo.RouterVo; import com.muyu.system.domain.vo.TreeSelect; import com.muyu.system.mapper.SysMenuMapper; import com.muyu.system.mapper.SysRoleMapper; -import com.muyu.system.mapper.SysRoleMenuMapper; import com.muyu.system.service.SysMenuService; import com.muyu.system.service.SysRoleMenuService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java index cb2c0e5..10dcbca 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.page.PageQueryModel; -import com.muyu.common.system.domain.SysLogininfor; import com.muyu.system.domain.SysNotice; import com.muyu.system.domain.model.SysNoticePageQueryModel; import com.muyu.system.mapper.SysNoticeMapper; @@ -14,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Objects; /** * 公告 服务层实现 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java index 1bc4aab..dc9258c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.page.PageQueryModel; -import com.muyu.common.system.domain.SysLogininfor; import com.muyu.common.system.domain.SysOperLog; import com.muyu.system.domain.model.SysOperlogPageQueryModel; import com.muyu.system.mapper.SysOperLogMapper; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java index a8641a1..0e260db 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java @@ -1,6 +1,5 @@ package com.muyu.system.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; import com.muyu.system.service.SysMenuService; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java index 784d36c..7588de5 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java @@ -7,7 +7,6 @@ import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.page.PageQueryModel; -import com.muyu.common.system.domain.SysLogininfor; import com.muyu.system.domain.SysPost; import com.muyu.system.domain.model.SysPostPageQueryModel; import com.muyu.system.mapper.SysPostMapper; @@ -18,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Objects; /** * 岗位信息 服务层处理 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleMenuServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleMenuServiceImpl.java index 244539e..ada9609 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleMenuServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleMenuServiceImpl.java @@ -1,7 +1,6 @@ package com.muyu.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.system.domain.SysRoleMenu; import com.muyu.system.mapper.SysRoleMenuMapper; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java index 0bb009a..4094bfa 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java @@ -18,9 +18,7 @@ import com.muyu.system.domain.SysRoleDept; import com.muyu.system.domain.SysRoleMenu; import com.muyu.system.domain.SysUserRole; import com.muyu.system.domain.model.SysRolePageQueryModel; -import com.muyu.system.mapper.SysRoleDeptMapper; import com.muyu.system.mapper.SysRoleMapper; -import com.muyu.system.mapper.SysUserRoleMapper; import com.muyu.system.service.SysRoleDeptService; import com.muyu.system.service.SysRoleMenuService; import com.muyu.system.service.SysRoleService; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java index 8ede754..c1ef1ee 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,6 +1,5 @@ package com.muyu.system.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.system.domain.LoginUser; import com.muyu.system.domain.SysUserOnline; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java index 09929ac..f01a7ab 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java @@ -2,7 +2,6 @@ package com.muyu.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.enums.SysDelFlagEnum; @@ -18,11 +17,14 @@ import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.SysPost; import com.muyu.system.domain.SysUserPost; import com.muyu.system.domain.SysUserRole; -import com.muyu.system.mapper.*; +import com.muyu.system.mapper.SysPostMapper; +import com.muyu.system.mapper.SysRoleMapper; +import com.muyu.system.mapper.SysUserMapper; +import com.muyu.system.mapper.SysUserRoleMapper; +import com.muyu.system.service.SysConfigService; import com.muyu.system.service.SysUserPostService; import com.muyu.system.service.SysUserRoleService; import com.muyu.system.service.SysUserService; -import com.muyu.system.service.SysConfigService; import jakarta.validation.Validator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysPostMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysPostMapper.xml index 63142c3..d6ddd4f 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -44,15 +44,6 @@ - - - - - - - - - - update sys_post - - post_code = #{postCode}, - post_name = #{postName}, - post_sort = #{postSort}, - status = #{status}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = sysdate() - - where post_id = #{postId} - - - - insert into sys_post( - post_id, - post_code, - post_name, - post_sort, - status, - remark, - create_by, - create_time - )values( - #{postId}, - #{postCode}, - #{postName}, - #{postSort}, - #{status}, - #{remark}, - #{createBy}, - sysdate() - ) - - - - delete - from sys_post - where post_id = #{postId} - - - - delete from sys_post where post_id in - - #{postId} - - - diff --git a/deploy/skywalking/ins b/deploy/skywalking/ins index b255bd9..388a2e9 100644 --- a/deploy/skywalking/ins +++ b/deploy/skywalking/ins @@ -5,6 +5,7 @@ -XX:MaxDirectMemorySize=128m -javaagent:.\skywalking\agent\skywalking-agent.jar -Dskywalking.agent.service_name=muyu::cloud-system +-Dcollector.backend_service=127.0.0.1:11800 -Dskywalking.agent.namespace=DEV -Dskywalking.logging.file_name=Application_name.log -Dskywalking.collector.backend_service=ServerHost