b2baccline/ballcat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔨 调整模块名，sys => system

Browse Source
This commit is contained in:
b2baccline
2021-04-13 15:31:24 +08:00
parent 342e418e51
commit dca3e67730
138 changed files with 464 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/UpmsAutoConfiguration.java
View File

@@ -3,7 +3,7 @@ package com.hccake.ballcat.admin;
import com.anji.captcha.service.CaptchaService;
import com.hccake.ballcat.admin.constants.SecurityConst;
import com.hccake.ballcat.admin.modules.notify.push.MailNotifyPusher;
import com.hccake.ballcat.admin.modules.sys.checker.AdminRuleProperties;
import com.hccake.ballcat.admin.modules.system.checker.AdminRuleProperties;
import com.hccake.ballcat.admin.oauth.UserInfoCoordinator;
import com.hccake.ballcat.admin.oauth.filter.LoginCaptchaFilter;
import com.hccake.ballcat.common.mail.MailAutoConfiguration;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/config/AdminFillMetaObjectHandle.java
View File

@@ -1,6 +1,6 @@
package com.hccake.ballcat.admin.config;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import com.hccake.ballcat.admin.oauth.util.SecurityUtils;
import com.hccake.ballcat.common.conf.mybatis.FillMetaObjectHandle;
import lombok.extern.slf4j.Slf4j;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/handler/AdminOperationLogHandler.java
View File

@@ -2,7 +2,7 @@ package com.hccake.ballcat.admin.modules.log.handler;
import com.hccake.ballcat.admin.modules.log.model.entity.AdminOperationLog;
import com.hccake.ballcat.admin.modules.log.service.OperationLogAdminService;
import com.hccake.ballcat.admin.modules.sys.converter.OperationLogConverter;
import com.hccake.ballcat.admin.modules.system.converter.OperationLogConverter;
import com.hccake.ballcat.commom.log.operation.model.OperationLogDTO;
import com.hccake.ballcat.commom.log.operation.service.OperationLogHandler;
import lombok.RequiredArgsConstructor;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/event/StationNotifyPushEvent.java
View File

@@ -1,7 +1,7 @@
package com.hccake.ballcat.admin.modules.notify.event;
import com.hccake.ballcat.admin.modules.notify.model.domain.NotifyInfo;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/listener/AnnouncementLoginEventListener.java
View File

@@ -6,7 +6,7 @@ import com.hccake.ballcat.admin.modules.notify.model.entity.UserAnnouncement;
import com.hccake.ballcat.admin.modules.notify.recipient.RecipientHandler;
import com.hccake.ballcat.admin.modules.notify.service.AnnouncementService;
import com.hccake.ballcat.admin.modules.notify.service.UserAnnouncementService;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import com.hccake.ballcat.admin.oauth.SysUserDetails;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/MailNotifyPusher.java
View File

@@ -3,7 +3,7 @@ package com.hccake.ballcat.admin.modules.notify.push;
import cn.hutool.core.util.StrUtil;
import com.hccake.ballcat.admin.constants.NotifyChannel;
import com.hccake.ballcat.admin.modules.notify.model.domain.NotifyInfo;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import com.hccake.ballcat.common.mail.model.MailDetails;
import com.hccake.ballcat.common.mail.sender.MailSender;
import lombok.RequiredArgsConstructor;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/NotifyPushExecutor.java
View File

@@ -3,7 +3,7 @@ package com.hccake.ballcat.admin.modules.notify.push;
import cn.hutool.core.collection.CollectionUtil;
import com.hccake.ballcat.admin.modules.notify.model.domain.NotifyInfo;
import com.hccake.ballcat.admin.modules.notify.recipient.RecipientHandler;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/NotifyPusher.java
View File

@@ -1,7 +1,7 @@
package com.hccake.ballcat.admin.modules.notify.push;
import com.hccake.ballcat.admin.modules.notify.model.domain.NotifyInfo;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import java.util.List;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/SmsNotifyPusher.java
View File

@@ -3,7 +3,7 @@ package com.hccake.ballcat.admin.modules.notify.push;
import cn.hutool.core.util.StrUtil;
import com.hccake.ballcat.admin.constants.NotifyChannel;
import com.hccake.ballcat.admin.modules.notify.model.domain.NotifyInfo;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import com.hccake.ballcat.common.util.HtmlUtils;
import org.springframework.stereotype.Component;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/StationNotifyPusher.java
View File

@@ -3,7 +3,7 @@ package com.hccake.ballcat.admin.modules.notify.push;
import com.hccake.ballcat.admin.constants.NotifyChannel;
import com.hccake.ballcat.admin.modules.notify.event.StationNotifyPushEvent;
import com.hccake.ballcat.admin.modules.notify.model.domain.NotifyInfo;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import lombok.RequiredArgsConstructor;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Component;

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/AllRecipientFilter.java
View File

@@ -1,8 +1,8 @@
package com.hccake.ballcat.admin.modules.notify.recipient;
import com.hccake.ballcat.admin.constants.NotifyRecipientFilterType;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.sys.service.SysUserService;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.service.SysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/RecipientFilter.java
View File

@@ -1,6 +1,6 @@
package com.hccake.ballcat.admin.modules.notify.recipient;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import java.util.List;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/RecipientHandler.java
View File

@@ -1,6 +1,6 @@
package com.hccake.ballcat.admin.modules.notify.recipient;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyOrganizationRecipientFilter.java
View File

@@ -1,8 +1,8 @@
package com.hccake.ballcat.admin.modules.notify.recipient;
import com.hccake.ballcat.admin.constants.NotifyRecipientFilterType;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.sys.service.SysUserService;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.service.SysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyRoleRecipientFilter.java
View File

@@ -2,8 +2,8 @@ package com.hccake.ballcat.admin.modules.notify.recipient;
import cn.hutool.core.collection.CollectionUtil;
import com.hccake.ballcat.admin.constants.NotifyRecipientFilterType;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.sys.service.SysUserService;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.service.SysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyUserRecipientFilter.java
View File

@@ -1,8 +1,8 @@
package com.hccake.ballcat.admin.modules.notify.recipient;
import com.hccake.ballcat.admin.constants.NotifyRecipientFilterType;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.sys.service.SysUserService;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.service.SysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyUserTypeRecipientFilter.java
View File

@@ -1,8 +1,8 @@
package com.hccake.ballcat.admin.modules.notify.recipient;
import com.hccake.ballcat.admin.constants.NotifyRecipientFilterType;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.sys.service.SysUserService;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.service.SysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/impl/AnnouncementServiceImpl.java
View File

@@ -16,7 +16,7 @@ import com.hccake.ballcat.admin.modules.notify.model.entity.Announcement;
import com.hccake.ballcat.admin.modules.notify.model.qo.AnnouncementQO;
import com.hccake.ballcat.admin.modules.notify.model.vo.AnnouncementPageVO;
import com.hccake.ballcat.admin.modules.notify.service.AnnouncementService;
import com.hccake.ballcat.admin.modules.sys.service.FileService;
import com.hccake.ballcat.admin.modules.system.service.FileService;
import com.hccake.ballcat.common.core.constant.enums.BooleanEnum;
import com.hccake.ballcat.common.model.domain.PageParam;
import com.hccake.ballcat.common.model.domain.PageResult;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/checker/AdminRuleProperties.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/checker/AdminRuleProperties.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.checker;
package com.hccake.ballcat.admin.modules.system.checker;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/checker/AdminUserChecker.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/checker/AdminUserChecker.java
View File

@@ -1,6 +1,6 @@
package com.hccake.ballcat.admin.modules.sys.checker;
package com.hccake.ballcat.admin.modules.system.checker;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
/**
* 超级管理员账户规则配置

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/checker/AdminUserCheckerImpl.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/checker/AdminUserCheckerImpl.java
View File

@@ -1,7 +1,7 @@
package com.hccake.ballcat.admin.modules.sys.checker;
package com.hccake.ballcat.admin.modules.system.checker;
import cn.hutool.core.util.StrUtil;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import com.hccake.ballcat.admin.oauth.util.SecurityUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthController.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/AuthController.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.controller;
package com.hccake.ballcat.admin.modules.system.controller;
import cn.hutool.core.util.StrUtil;
import com.hccake.ballcat.common.model.result.R;

41
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/controller/LovController.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/LovController.java
View File

@@ -1,14 +1,14 @@
package com.hccake.ballcat.admin.modules.lov.controller;
package com.hccake.ballcat.admin.modules.system.controller;
import com.hccake.ballcat.admin.modules.lov.converter.LovConverter;
import com.hccake.ballcat.admin.modules.lov.model.dto.LovDTO;
import com.hccake.ballcat.admin.modules.lov.model.entity.Lov;
import com.hccake.ballcat.admin.modules.lov.model.qo.LovQO;
import com.hccake.ballcat.admin.modules.lov.model.vo.LovInfoVO;
import com.hccake.ballcat.admin.modules.lov.model.vo.LovPageVO;
import com.hccake.ballcat.admin.modules.lov.service.LovBodyService;
import com.hccake.ballcat.admin.modules.lov.service.LovSearchService;
import com.hccake.ballcat.admin.modules.lov.service.LovService;
import com.hccake.ballcat.admin.modules.system.converter.LovConverter;
import com.hccake.ballcat.admin.modules.system.model.dto.LovDTO;
import com.hccake.ballcat.admin.modules.system.model.entity.Lov;
import com.hccake.ballcat.admin.modules.system.model.qo.LovQO;
import com.hccake.ballcat.admin.modules.system.model.vo.LovInfoVO;
import com.hccake.ballcat.admin.modules.system.model.vo.LovPageVO;
import com.hccake.ballcat.admin.modules.system.service.LovBodyService;
import com.hccake.ballcat.admin.modules.system.service.LovSearchService;
import com.hccake.ballcat.admin.modules.system.service.LovService;
import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging;
import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging;
import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging;
@@ -18,10 +18,6 @@ import com.hccake.ballcat.common.model.result.BaseResultCode;
import com.hccake.ballcat.common.model.result.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -33,13 +29,18 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* @author lingting 2020-08-10 16:40
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/lov")
@Api(value = "lov", tags = "lov管理")
@RequestMapping("/system/lov")
@Api(value = "system-lov", tags = "弹窗选择器")
public class LovController {
private final LovService lovService;
@@ -56,7 +57,7 @@ public class LovController {
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page")
@PreAuthorize("@per.hasPermission('sys:lov:read')")
@PreAuthorize("@per.hasPermission('system:lov:read')")
public R<PageResult<LovPageVO>> getLovPage(PageParam pageParam, LovQO qo) {
return R.ok(lovService.queryPage(pageParam, qo));
}
@@ -93,7 +94,7 @@ public class LovController {
@ApiOperation(value = "新增lov", notes = "新增lov")
@CreateOperationLogging(msg = "新增lov")
@PutMapping
@PreAuthorize("@per.hasPermission('sys:lov:add')")
@PreAuthorize("@per.hasPermission('system:lov:add')")
public R<?> save(@RequestBody LovDTO dto) {
return lovService.save(dto.toLov(), dto.getBodyList(), dto.getSearchList()) ? R.ok()
: R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "新增lov失败!");
@@ -107,7 +108,7 @@ public class LovController {
@ApiOperation(value = "修改lov", notes = "修改lov")
@UpdateOperationLogging(msg = "修改lov")
@PostMapping
@PreAuthorize("@per.hasPermission('sys:lov:edit')")
@PreAuthorize("@per.hasPermission('system:lov:edit')")
public R<?> updateById(@RequestBody LovDTO dto) {
return lovService.update(dto.toLov(), dto.getBodyList(), dto.getSearchList()) ? R.ok()
: R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改lov失败");
@@ -121,7 +122,7 @@ public class LovController {
@ApiOperation(value = "通过id删除lov", notes = "通过id删除lov")
@DeleteOperationLogging(msg = "通过id删除lov")
@DeleteMapping("/{id}")
@PreAuthorize("@per.hasPermission('sys:lov:del')")
@PreAuthorize("@per.hasPermission('system:lov:del')")
public R<?> removeById(@PathVariable Integer id) {
return lovService.remove(id) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "通过id删除lov失败");
}

24
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysConfigController.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysConfigController.java
View File

@@ -1,9 +1,9 @@
package com.hccake.ballcat.admin.modules.sys.controller;
package com.hccake.ballcat.admin.modules.system.controller;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysConfig;
import com.hccake.ballcat.admin.modules.sys.model.qo.SysConfigQO;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysConfigPageVO;
import com.hccake.ballcat.admin.modules.sys.service.SysConfigService;
import com.hccake.ballcat.admin.modules.system.model.entity.SysConfig;
import com.hccake.ballcat.admin.modules.system.model.qo.SysConfigQO;
import com.hccake.ballcat.admin.modules.system.model.vo.SysConfigPageVO;
import com.hccake.ballcat.admin.modules.system.service.SysConfigService;
import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging;
import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging;
import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging;
@@ -24,8 +24,8 @@ import org.springframework.web.bind.annotation.*;
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("sys/config")
@Api(value = "sys/config", tags = "系统配置")
@RequestMapping("/system/config")
@Api(value = "system-config", tags = "系统配置")
public class SysConfigController {
private final SysConfigService sysConfigService;
@@ -38,7 +38,7 @@ public class SysConfigController {
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page")
@PreAuthorize("@per.hasPermission('sys:config:read')")
@PreAuthorize("@per.hasPermission('system:config:read')")
public R<PageResult<SysConfigPageVO>> getSysConfigPage(PageParam pageParam, SysConfigQO sysConfigQO) {
return R.ok(sysConfigService.queryPage(pageParam, sysConfigQO));
}
@@ -50,7 +50,7 @@ public class SysConfigController {
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{id}")
@PreAuthorize("@per.hasPermission('sys:config:read')")
@PreAuthorize("@per.hasPermission('system:config:read')")
public R<SysConfig> getById(@PathVariable("id") Integer id) {
return R.ok(sysConfigService.getById(id));
}
@@ -63,7 +63,7 @@ public class SysConfigController {
@ApiOperation(value = "新增系统配置表", notes = "新增系统配置表")
@CreateOperationLogging(msg = "新增系统配置表")
@PostMapping
@PreAuthorize("@per.hasPermission('sys:config:add')")
@PreAuthorize("@per.hasPermission('system:config:add')")
public R save(@RequestBody SysConfig sysConfig) {
return R.ok(sysConfigService.save(sysConfig));
}
@@ -76,7 +76,7 @@ public class SysConfigController {
@ApiOperation(value = "修改系统配置表", notes = "修改系统配置表")
@UpdateOperationLogging(msg = "修改系统配置表")
@PutMapping
@PreAuthorize("@per.hasPermission('sys:config:edit')")
@PreAuthorize("@per.hasPermission('system:config:edit')")
public R updateById(@RequestBody SysConfig sysConfig) {
return R.ok(sysConfigService.updateById(sysConfig));
}
@@ -89,7 +89,7 @@ public class SysConfigController {
@ApiOperation(value = "通过id删除系统配置表", notes = "通过id删除系统配置表")
@DeleteOperationLogging(msg = "通过id删除系统配置表")
@DeleteMapping("/{id}")
@PreAuthorize("@per.hasPermission('sys:config:del')")
@PreAuthorize("@per.hasPermission('system:config:del')")
public R removeById(@PathVariable Integer id) {
return R.ok(sysConfigService.removeById(id));
}

36
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysDictController.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysDictController.java
View File

@@ -1,12 +1,12 @@
package com.hccake.ballcat.admin.modules.sys.controller;
package com.hccake.ballcat.admin.modules.system.controller;
import com.hccake.ballcat.admin.modules.sys.manager.SysDictManager;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem;
import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO;
import com.hccake.ballcat.admin.modules.sys.model.vo.DictDataVO;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictItemPageVO;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictPageVO;
import com.hccake.ballcat.admin.modules.system.manager.SysDictManager;
import com.hccake.ballcat.admin.modules.system.model.entity.SysDict;
import com.hccake.ballcat.admin.modules.system.model.entity.SysDictItem;
import com.hccake.ballcat.admin.modules.system.model.qo.SysDictQO;
import com.hccake.ballcat.admin.modules.system.model.vo.DictDataVO;
import com.hccake.ballcat.admin.modules.system.model.vo.SysDictItemPageVO;
import com.hccake.ballcat.admin.modules.system.model.vo.SysDictPageVO;
import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging;
import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging;
import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging;
@@ -31,8 +31,8 @@ import java.util.Map;
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/sys/dict")
@Api(value = "/sys/dict", tags = "字典表管理")
@RequestMapping("/system/dict")
@Api(value = "system-dict", tags = "字典表管理")
public class SysDictController {
private final SysDictManager sysDictManager;
@@ -65,7 +65,7 @@ public class SysDictController {
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page")
@PreAuthorize("@per.hasPermission('sys:dict:read')")
@PreAuthorize("@per.hasPermission('system:dict:read')")
public R<PageResult<SysDictPageVO>> getSysDictPage(PageParam pageParam, SysDictQO sysDictQO) {
return R.ok(sysDictManager.dictPage(pageParam, sysDictQO));
}
@@ -78,7 +78,7 @@ public class SysDictController {
@ApiOperation(value = "新增字典表", notes = "新增字典表")
@CreateOperationLogging(msg = "新增字典表")
@PostMapping
@PreAuthorize("@per.hasPermission('sys:dict:add')")
@PreAuthorize("@per.hasPermission('system:dict:add')")
public R<?> save(@RequestBody SysDict sysDict) {
return sysDictManager.dictSave(sysDict) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "新增字典表失败");
}
@@ -91,7 +91,7 @@ public class SysDictController {
@ApiOperation(value = "修改字典表", notes = "修改字典表")
@UpdateOperationLogging(msg = "修改字典表")
@PutMapping
@PreAuthorize("@per.hasPermission('sys:dict:edit')")
@PreAuthorize("@per.hasPermission('system:dict:edit')")
public R<?> updateById(@RequestBody SysDict sysDict) {
return sysDictManager.updateDictById(sysDict) ? R.ok()
: R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改字典表失败");
@@ -105,7 +105,7 @@ public class SysDictController {
@ApiOperation(value = "通过id删除字典表", notes = "通过id删除字典表")
@DeleteOperationLogging(msg = "通过id删除字典表")
@DeleteMapping("/{id}")
@PreAuthorize("@per.hasPermission('sys:dict:del')")
@PreAuthorize("@per.hasPermission('system:dict:del')")
public R<?> removeById(@PathVariable Integer id) {
return sysDictManager.removeDictById(id) ? R.ok()
: R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "通过id删除字典表失败");
@@ -119,7 +119,7 @@ public class SysDictController {
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/item/page")
@PreAuthorize("@per.hasPermission('sys:dict:read')")
@PreAuthorize("@per.hasPermission('system:dict:read')")
public R<PageResult<SysDictItemPageVO>> getSysDictItemPage(PageParam pageParam,
@RequestParam("dictCode") String dictCode) {
return R.ok(sysDictManager.dictItemPage(pageParam, dictCode));
@@ -133,7 +133,7 @@ public class SysDictController {
@ApiOperation(value = "新增字典项", notes = "新增字典项")
@CreateOperationLogging(msg = "新增字典项")
@PostMapping("item")
@PreAuthorize("@per.hasPermission('sys:dict:add')")
@PreAuthorize("@per.hasPermission('system:dict:add')")
public R<?> saveItem(@RequestBody SysDictItem sysDictItem) {
return sysDictManager.saveDictItem(sysDictItem) ? R.ok()
: R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "新增字典项失败");
@@ -147,7 +147,7 @@ public class SysDictController {
@ApiOperation(value = "修改字典项", notes = "修改字典项")
@UpdateOperationLogging(msg = "修改字典项")
@PutMapping("item")
@PreAuthorize("@per.hasPermission('sys:dict:edit')")
@PreAuthorize("@per.hasPermission('system:dict:edit')")
public R<?> updateItemById(@RequestBody SysDictItem sysDictItem) {
return sysDictManager.updateDictItemById(sysDictItem) ? R.ok()
: R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改字典项失败");
@@ -161,7 +161,7 @@ public class SysDictController {
@ApiOperation(value = "通过id删除字典项", notes = "通过id删除字典项")
@DeleteOperationLogging(msg = "通过id删除字典项")
@DeleteMapping("/item/{id}")
@PreAuthorize("@per.hasPermission('sys:dict:del')")
@PreAuthorize("@per.hasPermission('system:dict:del')")
public R<?> removeItemById(@PathVariable Integer id) {
return sysDictManager.removeDictItemById(id) ? R.ok()
: R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "通过id删除字典项失败");

24
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysMenuController.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysMenuController.java
View File

@@ -1,12 +1,12 @@
package com.hccake.ballcat.admin.modules.sys.controller;
package com.hccake.ballcat.admin.modules.system.controller;
import cn.hutool.core.collection.CollectionUtil;
import com.hccake.ballcat.admin.constants.SysPermissionConst;
import com.hccake.ballcat.admin.modules.sys.converter.SysMenuConverter;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysMenu;
import com.hccake.ballcat.admin.modules.sys.model.qo.SysMenuQO;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysMenuRouterVO;
import com.hccake.ballcat.admin.modules.sys.service.SysMenuService;
import com.hccake.ballcat.admin.modules.system.converter.SysMenuConverter;
import com.hccake.ballcat.admin.modules.system.model.entity.SysMenu;
import com.hccake.ballcat.admin.modules.system.model.qo.SysMenuQO;
import com.hccake.ballcat.admin.modules.system.model.vo.SysMenuRouterVO;
import com.hccake.ballcat.admin.modules.system.service.SysMenuService;
import com.hccake.ballcat.admin.oauth.SysUserDetails;
import com.hccake.ballcat.admin.oauth.domain.UserResources;
import com.hccake.ballcat.admin.oauth.util.SecurityUtils;
@@ -31,8 +31,8 @@ import java.util.stream.Collectors;
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/sys/sysmenu")
@Api(value = "sysmenu", tags = "菜单权限管理")
@RequestMapping("/system/menu")
@Api(value = "system-menu", tags = "菜单权限管理")
public class SysMenuController {
private final SysMenuService sysMenuService;
@@ -73,7 +73,7 @@ public class SysMenuController {
*/
@ApiOperation(value = "查询菜单列表", notes = "查询菜单列表")
@GetMapping("/list")
@PreAuthorize("@per.hasPermission('sys:sysmenu:read')")
@PreAuthorize("@per.hasPermission('system:menu:read')")
public R<List<SysMenu>> getSysMenuPage(SysMenuQO sysMenuQO) {
return R.ok(sysMenuService.listOrderBySort(sysMenuQO));
}
@@ -86,7 +86,7 @@ public class SysMenuController {
@ApiOperation(value = "新增菜单权限", notes = "新增菜单权限")
@CreateOperationLogging(msg = "新增菜单权限")
@PostMapping
@PreAuthorize("@per.hasPermission('sys:sysmenu:add')")
@PreAuthorize("@per.hasPermission('system:menu:add')")
public R<String> save(@RequestBody SysMenu sysMenu) {
return sysMenuService.save(sysMenu) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "新增菜单权限失败");
}
@@ -99,7 +99,7 @@ public class SysMenuController {
@ApiOperation(value = "修改菜单权限", notes = "修改菜单权限")
@UpdateOperationLogging(msg = "修改菜单权限")
@PutMapping
@PreAuthorize("@per.hasPermission('sys:sysmenu:edit')")
@PreAuthorize("@per.hasPermission('system:menu:edit')")
public R<String> updateById(@RequestBody SysMenu sysMenu) {
return sysMenuService.updateById(sysMenu) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改菜单权限失败");
}
@@ -112,7 +112,7 @@ public class SysMenuController {
@ApiOperation(value = "通过id删除菜单权限", notes = "通过id删除菜单权限")
@DeleteOperationLogging(msg = "通过id删除菜单权限")
@DeleteMapping("/{id}")
@PreAuthorize("@per.hasPermission('sys:sysmenu:del')")
@PreAuthorize("@per.hasPermission('system:menu:del')")
public R<String> removeById(@PathVariable Integer id) {
return sysMenuService.removeById(id) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "通过id删除菜单权限失败");
}

20
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysOrganizationController.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysOrganizationController.java
View File

@@ -1,8 +1,8 @@
package com.hccake.ballcat.admin.modules.sys.controller;
package com.hccake.ballcat.admin.modules.system.controller;
import com.hccake.ballcat.admin.modules.sys.model.dto.SysOrganizationDTO;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysOrganizationTree;
import com.hccake.ballcat.admin.modules.sys.service.SysOrganizationService;
import com.hccake.ballcat.admin.modules.system.model.dto.SysOrganizationDTO;
import com.hccake.ballcat.admin.modules.system.model.vo.SysOrganizationTree;
import com.hccake.ballcat.admin.modules.system.service.SysOrganizationService;
import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging;
import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging;
import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging;
@@ -23,8 +23,8 @@ import java.util.List;
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/sys/organization")
@Api(value = "organization", tags = "组织架构管理")
@RequestMapping("/system/organization")
@Api(value = "system-organization", tags = "组织架构管理")
public class SysOrganizationController {
private final SysOrganizationService sysOrganizationService;
@@ -35,7 +35,7 @@ public class SysOrganizationController {
*/
@ApiOperation(value = "组织架构树查询", notes = "组织架构树查询")
@GetMapping("/tree")
@PreAuthorize("@per.hasPermission('sys:organization:read')")
@PreAuthorize("@per.hasPermission('system:organization:read')")
public R<List<SysOrganizationTree>> getOrganizationTree() {
return R.ok(sysOrganizationService.listTree());
}
@@ -48,7 +48,7 @@ public class SysOrganizationController {
@ApiOperation(value = "新增组织架构", notes = "新增组织架构")
@CreateOperationLogging(msg = "新增组织架构")
@PostMapping
@PreAuthorize("@per.hasPermission('sys:organization:add')")
@PreAuthorize("@per.hasPermission('system:organization:add')")
public R<?> save(@RequestBody SysOrganizationDTO sysOrganizationDTO) {
return sysOrganizationService.create(sysOrganizationDTO) ? R.ok()
: R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "新增组织架构失败");
@@ -62,7 +62,7 @@ public class SysOrganizationController {
@ApiOperation(value = "修改组织架构", notes = "修改组织架构")
@UpdateOperationLogging(msg = "修改组织架构")
@PutMapping
@PreAuthorize("@per.hasPermission('sys:organization:edit')")
@PreAuthorize("@per.hasPermission('system:organization:edit')")
public R<?> updateById(@RequestBody SysOrganizationDTO sysOrganizationDTO) {
return sysOrganizationService.update(sysOrganizationDTO) ? R.ok()
: R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改组织架构失败");
@@ -76,7 +76,7 @@ public class SysOrganizationController {
@ApiOperation(value = "通过id删除组织架构", notes = "通过id删除组织架构")
@DeleteOperationLogging(msg = "通过id删除组织架构")
@DeleteMapping("/{id}")
@PreAuthorize("@per.hasPermission('sys:organization:del')")
@PreAuthorize("@per.hasPermission('system:organization:del')")
public R<?> removeById(@PathVariable Integer id) {
return sysOrganizationService.removeById(id) ? R.ok()
: R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "通过id删除组织架构失败");

46
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysRoleController.java
View File

@@ -1,18 +1,18 @@
package com.hccake.ballcat.admin.modules.sys.controller;
package com.hccake.ballcat.admin.modules.system.controller;
import com.hccake.ballcat.admin.constants.SysRoleConst;
import com.hccake.ballcat.admin.modules.sys.converter.SysRoleConverter;
import com.hccake.ballcat.admin.modules.sys.model.dto.SysRoleUpdateDTO;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysMenu;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole;
import com.hccake.ballcat.admin.modules.sys.model.qo.RoleBindUserQO;
import com.hccake.ballcat.admin.modules.sys.model.qo.SysRoleQO;
import com.hccake.ballcat.admin.modules.sys.model.vo.RoleBindUserVO;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysRolePageVO;
import com.hccake.ballcat.admin.modules.sys.service.SysMenuService;
import com.hccake.ballcat.admin.modules.sys.service.SysRoleMenuService;
import com.hccake.ballcat.admin.modules.sys.service.SysRoleService;
import com.hccake.ballcat.admin.modules.sys.service.SysUserRoleService;
import com.hccake.ballcat.admin.modules.system.converter.SysRoleConverter;
import com.hccake.ballcat.admin.modules.system.model.dto.SysRoleUpdateDTO;
import com.hccake.ballcat.admin.modules.system.model.entity.SysMenu;
import com.hccake.ballcat.admin.modules.system.model.entity.SysRole;
import com.hccake.ballcat.admin.modules.system.model.qo.RoleBindUserQO;
import com.hccake.ballcat.admin.modules.system.model.qo.SysRoleQO;
import com.hccake.ballcat.admin.modules.system.model.vo.RoleBindUserVO;
import com.hccake.ballcat.admin.modules.system.model.vo.SysRolePageVO;
import com.hccake.ballcat.admin.modules.system.service.SysMenuService;
import com.hccake.ballcat.admin.modules.system.service.SysRoleMenuService;
import com.hccake.ballcat.admin.modules.system.service.SysRoleService;
import com.hccake.ballcat.admin.modules.system.service.SysUserRoleService;
import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging;
import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging;
import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging;
@@ -35,8 +35,8 @@ import java.util.stream.Collectors;
* @author Hccake
*/
@RestController
@RequestMapping("/sysrole")
@Api(value = "sysrole", tags = "角色管理模块")
@RequestMapping("/system/role")
@Api(value = "system-role", tags = "角色管理模块")
@RequiredArgsConstructor
public class SysRoleController {
@@ -54,7 +54,7 @@ public class SysRoleController {
* @return PageResult 分页结果
*/
@GetMapping("/page")
@PreAuthorize("@per.hasPermission('sys:sysrole:read')")
@PreAuthorize("@per.hasPermission('system:role:read')")
public R<PageResult<SysRolePageVO>> getRolePage(PageParam pageParam, SysRoleQO sysRoleQo) {
return R.ok(sysRoleService.queryPage(pageParam, sysRoleQo));
}
@@ -65,7 +65,7 @@ public class SysRoleController {
* @return 角色信息
*/
@GetMapping("/{id}")
@PreAuthorize("@per.hasPermission('sys:sysrole:read')")
@PreAuthorize("@per.hasPermission('system:role:read')")
public R<SysRole> getById(@PathVariable Integer id) {
return R.ok(sysRoleService.getById(id));
}
@@ -78,7 +78,7 @@ public class SysRoleController {
@ApiOperation(value = "新增系统角色", notes = "新增系统角色")
@CreateOperationLogging(msg = "新增系统角色")
@PostMapping
@PreAuthorize("@per.hasPermission('sys:sysrole:add')")
@PreAuthorize("@per.hasPermission('system:role:add')")
public R<Boolean> save(@Valid @RequestBody SysRole sysRole) {
return R.ok(sysRoleService.save(sysRole));
}
@@ -91,7 +91,7 @@ public class SysRoleController {
@ApiOperation(value = "修改系统角色", notes = "修改系统角色")
@UpdateOperationLogging(msg = "修改系统角色")
@PutMapping
@PreAuthorize("@per.hasPermission('sys:sysrole:edit')")
@PreAuthorize("@per.hasPermission('system:role:edit')")
public R<Boolean> update(@Valid @RequestBody SysRoleUpdateDTO roleUpdateDTO) {
SysRole sysRole = SysRoleConverter.INSTANCE.dtoToPo(roleUpdateDTO);
return R.ok(sysRoleService.updateById(sysRole));
@@ -105,7 +105,7 @@ public class SysRoleController {
@DeleteMapping("/{id}")
@ApiOperation(value = "通过id删除系统角色", notes = "通过id删除系统角色")
@DeleteOperationLogging(msg = "通过id删除系统角色")
@PreAuthorize("@per.hasPermission('sys:sysrole:del')")
@PreAuthorize("@per.hasPermission('system:role:del')")
public R<Boolean> removeById(@PathVariable Integer id) {
SysRole oldRole = sysRoleService.getById(id);
if (SysRoleConst.Type.SYSTEM.getValue().equals(oldRole.getType())) {
@@ -132,7 +132,7 @@ public class SysRoleController {
@PutMapping("/permission/code/{roleCode}")
@ApiOperation(value = "更新角色权限", notes = "更新角色权限")
@UpdateOperationLogging(msg = "更新角色权限")
@PreAuthorize("@per.hasPermission('sys:sysrole:grant')")
@PreAuthorize("@per.hasPermission('system:role:grant')")
public R<Boolean> savePermissionIds(@PathVariable String roleCode, @RequestBody Integer[] permissionIds) {
return R.ok(sysRoleMenuService.saveRoleMenus(roleCode, permissionIds));
}
@@ -165,7 +165,7 @@ public class SysRoleController {
*/
@GetMapping("/user/page")
@ApiOperation(value = "查看已授权指定角色的用户列表", notes = "查看已授权指定角色的用户列表")
@PreAuthorize("@per.hasPermission('sys:sysrole:grant')")
@PreAuthorize("@per.hasPermission('system:role:grant')")
public R<PageResult<RoleBindUserVO>> queryUserPageByRoleCode(PageParam pageParam,
@Valid RoleBindUserQO roleBindUserQO) {
return R.ok(sysUserRoleService.queryUserPageByRoleCode(pageParam, roleBindUserQO));
@@ -177,7 +177,7 @@ public class SysRoleController {
*/
@DeleteMapping("/user")
@ApiOperation(value = "解绑与用户绑定关系", notes = "解绑与用户绑定关系")
@PreAuthorize("@per.hasPermission('sys:sysrole:grant')")
@PreAuthorize("@per.hasPermission('system:role:grant')")
public R<Boolean> unbindRoleUser(@RequestParam Integer userId, @RequestParam String roleCode) {
return R.ok(sysUserRoleService.unbindRoleUser(userId, roleCode));
}

44
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysUserController.java
View File

@@ -1,16 +1,16 @@
package com.hccake.ballcat.admin.modules.sys.controller;
package com.hccake.ballcat.admin.modules.system.controller;
import cn.hutool.core.collection.CollectionUtil;
import com.hccake.ballcat.admin.constants.SysUserConst;
import com.hccake.ballcat.admin.modules.sys.model.dto.SysUserDTO;
import com.hccake.ballcat.admin.modules.sys.model.dto.SysUserPassDTO;
import com.hccake.ballcat.admin.modules.sys.model.dto.SysUserScope;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.sys.model.qo.SysUserQO;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysUserPageVO;
import com.hccake.ballcat.admin.modules.sys.service.SysUserRoleService;
import com.hccake.ballcat.admin.modules.sys.service.SysUserService;
import com.hccake.ballcat.admin.modules.system.model.dto.SysUserDTO;
import com.hccake.ballcat.admin.modules.system.model.dto.SysUserPassDTO;
import com.hccake.ballcat.admin.modules.system.model.dto.SysUserScope;
import com.hccake.ballcat.admin.modules.system.model.entity.SysRole;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.model.qo.SysUserQO;
import com.hccake.ballcat.admin.modules.system.model.vo.SysUserPageVO;
import com.hccake.ballcat.admin.modules.system.service.SysUserRoleService;
import com.hccake.ballcat.admin.modules.system.service.SysUserService;
import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging;
import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging;
import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging;
@@ -47,8 +47,8 @@ import java.util.List;
@Slf4j
@Validated
@RestController
@RequestMapping("/sysuser")
@Api(value = "sysuser", tags = "用户管理模块")
@RequestMapping("/system/user")
@Api(value = "system-user", tags = "用户管理模块")
@RequiredArgsConstructor
public class SysUserController {
@@ -68,7 +68,7 @@ public class SysUserController {
* @return 用户集合
*/
@GetMapping("/page")
@PreAuthorize("@per.hasPermission('sys:sysuser:read')")
@PreAuthorize("@per.hasPermission('system:user:read')")
public R<PageResult<SysUserPageVO>> getUserPage(PageParam pageParam, SysUserQO qo) {
return R.ok(sysUserService.queryPage(pageParam, qo));
}
@@ -78,7 +78,7 @@ public class SysUserController {
* @return 用户SelectData
*/
@GetMapping("/select")
@PreAuthorize("@per.hasPermission('sys:sysuser:read')")
@PreAuthorize("@per.hasPermission('system:user:read')")
public R<List<SelectData<?>>> listSelectData(
@RequestParam(value = "userTypes", required = false) List<Integer> userTypes) {
return R.ok(sysUserService.listSelectData(userTypes));
@@ -92,7 +92,7 @@ public class SysUserController {
@PostMapping
@ApiOperation(value = "新增系统用户", notes = "新增系统用户")
@CreateOperationLogging(msg = "新增系统用户")
@PreAuthorize("@per.hasPermission('sys:sysuser:add')")
@PreAuthorize("@per.hasPermission('system:user:add')")
public R<?> addSysUser(@Valid @RequestBody SysUserDTO sysUserDTO) {
SysUser user = sysUserService.getByUsername(sysUserDTO.getUsername());
if (user != null) {
@@ -113,7 +113,7 @@ public class SysUserController {
@PutMapping
@ApiOperation(value = "修改系统用户", notes = "修改系统用户")
@UpdateOperationLogging(msg = "修改系统用户")
@PreAuthorize("@per.hasPermission('sys:sysuser:edit')")
@PreAuthorize("@per.hasPermission('system:user:edit')")
public R<?> updateUserInfo(@Valid @RequestBody SysUserDTO sysUserDto) {
return sysUserService.updateSysUser(sysUserDto) ? R.ok()
: R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改系统用户失败");
@@ -125,7 +125,7 @@ public class SysUserController {
@DeleteMapping("/{userId}")
@ApiOperation(value = "通过id删除系统用户", notes = "通过id删除系统用户")
@DeleteOperationLogging(msg = "通过id删除系统用户")
@PreAuthorize("@per.hasPermission('sys:sysuser:del')")
@PreAuthorize("@per.hasPermission('system:user:del')")
public R<?> deleteByUserId(@PathVariable Integer userId) {
return sysUserService.deleteByUserId(userId) ? R.ok()
: R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "删除系统用户失败");
@@ -136,7 +136,7 @@ public class SysUserController {
* @param userId userId
*/
@GetMapping("/scope/{userId}")
@PreAuthorize("@per.hasPermission('sys:sysuser:grant')")
@PreAuthorize("@per.hasPermission('system:user:grant')")
public R<SysUserScope> getUserRoleIds(@PathVariable Integer userId) {
List<SysRole> roleList = sysUserRoleService.listRoles(userId);
@@ -160,7 +160,7 @@ public class SysUserController {
@PutMapping("/scope/{userId}")
@ApiOperation(value = "系统用户授权", notes = "系统用户授权")
@UpdateOperationLogging(msg = "系统用户授权")
@PreAuthorize("@per.hasPermission('sys:sysuser:grant')")
@PreAuthorize("@per.hasPermission('system:user:grant')")
public R<?> updateUserScope(@PathVariable Integer userId, @RequestBody SysUserScope sysUserScope) {
return sysUserService.updateUserScope(userId, sysUserScope) ? R.ok()
: R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "系统用户授权失败");
@@ -172,7 +172,7 @@ public class SysUserController {
@PutMapping("/pass/{userId}")
@ApiOperation(value = "修改系统用户密码", notes = "修改系统用户密码")
@UpdateOperationLogging(msg = "修改系统用户密码")
@PreAuthorize("@per.hasPermission('sys:sysuser:pass')")
@PreAuthorize("@per.hasPermission('system:user:pass')")
public R<?> updateUserPass(@PathVariable Integer userId, @RequestBody SysUserPassDTO sysUserPassDTO) {
String pass = sysUserPassDTO.getPass();
if (!pass.equals(sysUserPassDTO.getConfirmPass())) {
@@ -191,7 +191,7 @@ public class SysUserController {
@PutMapping("/status")
@ApiOperation(value = "批量修改用户状态", notes = "批量修改用户状态")
@UpdateOperationLogging(msg = "批量修改用户状态")
@PreAuthorize("@per.hasPermission('sys:sysuser:edit')")
@PreAuthorize("@per.hasPermission('system:user:edit')")
public R<?> updateUserStatus(@NotEmpty(message = "用户ID不能为空") @RequestBody List<Integer> userIds,
@NotNull(message = "用户状态不能为空") @RequestParam Integer status) {
@@ -205,7 +205,7 @@ public class SysUserController {
@ApiOperation(value = "修改系统用户头像", notes = "修改系统用户头像")
@UpdateOperationLogging(msg = "修改系统用户头像")
@PreAuthorize("@per.hasPermission('sys:sysuser:edit')")
@PreAuthorize("@per.hasPermission('system:user:edit')")
@PostMapping("/avatar")
public R<String> updateAvatar(@RequestParam("file") MultipartFile file, @RequestParam("userId") Integer userId) {
String objectName;

8
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/converter/LovConverter.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/LovConverter.java
View File

@@ -1,8 +1,8 @@
package com.hccake.ballcat.admin.modules.lov.converter;
package com.hccake.ballcat.admin.modules.system.converter;
import com.hccake.ballcat.admin.modules.lov.model.entity.Lov;
import com.hccake.ballcat.admin.modules.lov.model.vo.LovInfoVO;
import com.hccake.ballcat.admin.modules.lov.model.vo.LovPageVO;
import com.hccake.ballcat.admin.modules.system.model.entity.Lov;
import com.hccake.ballcat.admin.modules.system.model.vo.LovInfoVO;
import com.hccake.ballcat.admin.modules.system.model.vo.LovPageVO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/OperationLogConverter.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/OperationLogConverter.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.converter;
package com.hccake.ballcat.admin.modules.system.converter;
import com.hccake.ballcat.admin.modules.log.model.entity.AdminOperationLog;
import com.hccake.ballcat.commom.log.operation.model.OperationLogDTO;

6
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysConfigConverter.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysConfigConverter.java
View File

@@ -1,7 +1,7 @@
package com.hccake.ballcat.admin.modules.sys.converter;
package com.hccake.ballcat.admin.modules.system.converter;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysConfig;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysConfigPageVO;
import com.hccake.ballcat.admin.modules.system.model.entity.SysConfig;
import com.hccake.ballcat.admin.modules.system.model.vo.SysConfigPageVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

6
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysDictConverter.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysDictConverter.java
View File

@@ -1,7 +1,7 @@
package com.hccake.ballcat.admin.modules.sys.converter;
package com.hccake.ballcat.admin.modules.system.converter;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictPageVO;
import com.hccake.ballcat.admin.modules.system.model.entity.SysDict;
import com.hccake.ballcat.admin.modules.system.model.vo.SysDictPageVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

8
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysDictItemConverter.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysDictItemConverter.java
View File

@@ -1,8 +1,8 @@
package com.hccake.ballcat.admin.modules.sys.converter;
package com.hccake.ballcat.admin.modules.system.converter;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem;
import com.hccake.ballcat.admin.modules.sys.model.vo.DictItemVO;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictItemPageVO;
import com.hccake.ballcat.admin.modules.system.model.entity.SysDictItem;
import com.hccake.ballcat.admin.modules.system.model.vo.DictItemVO;
import com.hccake.ballcat.admin.modules.system.model.vo.SysDictItemPageVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

8
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysMenuConverter.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysMenuConverter.java
View File

@@ -1,8 +1,8 @@
package com.hccake.ballcat.admin.modules.sys.converter;
package com.hccake.ballcat.admin.modules.system.converter;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysMenu;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysMenuRouterVO;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysMenuPageVO;
import com.hccake.ballcat.admin.modules.system.model.entity.SysMenu;
import com.hccake.ballcat.admin.modules.system.model.vo.SysMenuRouterVO;
import com.hccake.ballcat.admin.modules.system.model.vo.SysMenuPageVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

8
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysOrganizationConverter.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysOrganizationConverter.java
View File

@@ -1,8 +1,8 @@
package com.hccake.ballcat.admin.modules.sys.converter;
package com.hccake.ballcat.admin.modules.system.converter;
import com.hccake.ballcat.admin.modules.sys.model.dto.SysOrganizationDTO;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysOrganization;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysOrganizationTree;
import com.hccake.ballcat.admin.modules.system.model.dto.SysOrganizationDTO;
import com.hccake.ballcat.admin.modules.system.model.entity.SysOrganization;
import com.hccake.ballcat.admin.modules.system.model.vo.SysOrganizationTree;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

8
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysRoleConverter.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysRoleConverter.java
View File

@@ -1,8 +1,8 @@
package com.hccake.ballcat.admin.modules.sys.converter;
package com.hccake.ballcat.admin.modules.system.converter;
import com.hccake.ballcat.admin.modules.sys.model.dto.SysRoleUpdateDTO;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysRolePageVO;
import com.hccake.ballcat.admin.modules.system.model.dto.SysRoleUpdateDTO;
import com.hccake.ballcat.admin.modules.system.model.entity.SysRole;
import com.hccake.ballcat.admin.modules.system.model.vo.SysRolePageVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

10
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysUserConverter.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysUserConverter.java
View File

@@ -1,9 +1,9 @@
package com.hccake.ballcat.admin.modules.sys.converter;
package com.hccake.ballcat.admin.modules.system.converter;
import com.hccake.ballcat.admin.modules.sys.model.dto.SysUserDTO;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysUserInfo;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysUserPageVO;
import com.hccake.ballcat.admin.modules.system.model.dto.SysUserDTO;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.model.vo.SysUserInfo;
import com.hccake.ballcat.admin.modules.system.model.vo.SysUserPageVO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/enums/HttpMethod.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/enums/HttpMethod.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.lov.enums;
package com.hccake.ballcat.admin.modules.system.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/enums/HttpParamsPosition.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/enums/HttpParamsPosition.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.lov.enums;
package com.hccake.ballcat.admin.modules.system.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/enums/Tag.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/enums/Tag.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.lov.enums;
package com.hccake.ballcat.admin.modules.system.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/event/DictChangeEvent.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/event/DictChangeEvent.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.event;
package com.hccake.ballcat.admin.modules.system.event;
import lombok.Getter;
import org.springframework.context.ApplicationEvent;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/event/LovChangeEvent.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/event/LovChangeEvent.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.lov.event;
package com.hccake.ballcat.admin.modules.system.event;
import lombok.Getter;
import org.springframework.context.ApplicationEvent;

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/event/UserChangeEvent.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/event/UserChangeEvent.java
View File

@@ -1,6 +1,6 @@
package com.hccake.ballcat.admin.modules.sys.event;
package com.hccake.ballcat.admin.modules.system.event;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import lombok.Getter;
import org.springframework.context.ApplicationEvent;

24
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/manager/SysDictManager.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/manager/SysDictManager.java
View File

@@ -1,18 +1,18 @@
package com.hccake.ballcat.admin.modules.sys.manager;
package com.hccake.ballcat.admin.modules.system.manager;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.IdUtil;
import com.hccake.ballcat.admin.modules.sys.converter.SysDictItemConverter;
import com.hccake.ballcat.admin.modules.sys.event.DictChangeEvent;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem;
import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO;
import com.hccake.ballcat.admin.modules.sys.model.vo.DictDataVO;
import com.hccake.ballcat.admin.modules.sys.model.vo.DictItemVO;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictItemPageVO;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictPageVO;
import com.hccake.ballcat.admin.modules.sys.service.SysDictItemService;
import com.hccake.ballcat.admin.modules.sys.service.SysDictService;
import com.hccake.ballcat.admin.modules.system.converter.SysDictItemConverter;
import com.hccake.ballcat.admin.modules.system.event.DictChangeEvent;
import com.hccake.ballcat.admin.modules.system.model.entity.SysDict;
import com.hccake.ballcat.admin.modules.system.model.entity.SysDictItem;
import com.hccake.ballcat.admin.modules.system.model.qo.SysDictQO;
import com.hccake.ballcat.admin.modules.system.model.vo.DictDataVO;
import com.hccake.ballcat.admin.modules.system.model.vo.DictItemVO;
import com.hccake.ballcat.admin.modules.system.model.vo.SysDictItemPageVO;
import com.hccake.ballcat.admin.modules.system.model.vo.SysDictPageVO;
import com.hccake.ballcat.admin.modules.system.service.SysDictItemService;
import com.hccake.ballcat.admin.modules.system.service.SysDictService;
import com.hccake.ballcat.common.core.constant.enums.BooleanEnum;
import com.hccake.ballcat.common.core.exception.BusinessException;
import com.hccake.ballcat.common.model.domain.PageParam;

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovBodyMapper.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/LovBodyMapper.java
View File

@@ -1,8 +1,8 @@
package com.hccake.ballcat.admin.modules.lov.mapper;
package com.hccake.ballcat.admin.modules.system.mapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.hccake.ballcat.admin.modules.lov.model.entity.LovBody;
import com.hccake.ballcat.admin.modules.system.model.entity.LovBody;
import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
import java.util.List;

10
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovMapper.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/LovMapper.java
View File

@@ -1,11 +1,11 @@
package com.hccake.ballcat.admin.modules.lov.mapper;
package com.hccake.ballcat.admin.modules.system.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hccake.ballcat.admin.modules.lov.converter.LovConverter;
import com.hccake.ballcat.admin.modules.lov.model.entity.Lov;
import com.hccake.ballcat.admin.modules.lov.model.qo.LovQO;
import com.hccake.ballcat.admin.modules.lov.model.vo.LovPageVO;
import com.hccake.ballcat.admin.modules.system.converter.LovConverter;
import com.hccake.ballcat.admin.modules.system.model.entity.Lov;
import com.hccake.ballcat.admin.modules.system.model.qo.LovQO;
import com.hccake.ballcat.admin.modules.system.model.vo.LovPageVO;
import com.hccake.ballcat.common.model.domain.PageParam;
import com.hccake.ballcat.common.model.domain.PageResult;
import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX;

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovSearchMapper.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/LovSearchMapper.java
View File

@@ -1,8 +1,8 @@
package com.hccake.ballcat.admin.modules.lov.mapper;
package com.hccake.ballcat.admin.modules.system.mapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.hccake.ballcat.admin.modules.lov.model.entity.LovSearch;
import com.hccake.ballcat.admin.modules.system.model.entity.LovSearch;
import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
import java.util.List;

10
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysConfigMapper.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysConfigMapper.java
View File

@@ -1,11 +1,11 @@
package com.hccake.ballcat.admin.modules.sys.mapper;
package com.hccake.ballcat.admin.modules.system.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hccake.ballcat.admin.modules.sys.converter.SysConfigConverter;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysConfig;
import com.hccake.ballcat.admin.modules.sys.model.qo.SysConfigQO;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysConfigPageVO;
import com.hccake.ballcat.admin.modules.system.converter.SysConfigConverter;
import com.hccake.ballcat.admin.modules.system.model.entity.SysConfig;
import com.hccake.ballcat.admin.modules.system.model.qo.SysConfigQO;
import com.hccake.ballcat.admin.modules.system.model.vo.SysConfigPageVO;
import com.hccake.ballcat.common.model.domain.PageParam;
import com.hccake.ballcat.common.model.domain.PageResult;
import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;

8
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysDictItemMapper.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysDictItemMapper.java
View File

@@ -1,12 +1,12 @@
package com.hccake.ballcat.admin.modules.sys.mapper;
package com.hccake.ballcat.admin.modules.system.mapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.hccake.ballcat.admin.modules.sys.converter.SysDictItemConverter;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictItemPageVO;
import com.hccake.ballcat.admin.modules.system.converter.SysDictItemConverter;
import com.hccake.ballcat.admin.modules.system.model.entity.SysDictItem;
import com.hccake.ballcat.admin.modules.system.model.vo.SysDictItemPageVO;
import com.hccake.ballcat.common.model.domain.PageParam;
import com.hccake.ballcat.common.model.domain.PageResult;
import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;

10
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysDictMapper.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysDictMapper.java
View File

@@ -1,12 +1,12 @@
package com.hccake.ballcat.admin.modules.sys.mapper;
package com.hccake.ballcat.admin.modules.system.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.hccake.ballcat.admin.modules.sys.converter.SysDictConverter;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict;
import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictPageVO;
import com.hccake.ballcat.admin.modules.system.converter.SysDictConverter;
import com.hccake.ballcat.admin.modules.system.model.entity.SysDict;
import com.hccake.ballcat.admin.modules.system.model.qo.SysDictQO;
import com.hccake.ballcat.admin.modules.system.model.vo.SysDictPageVO;
import com.hccake.ballcat.common.model.domain.PageParam;
import com.hccake.ballcat.common.model.domain.PageResult;
import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX;

6
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysMenuMapper.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysMenuMapper.java
View File

@@ -1,8 +1,8 @@
package com.hccake.ballcat.admin.modules.sys.mapper;
package com.hccake.ballcat.admin.modules.system.mapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysMenu;
import com.hccake.ballcat.admin.modules.sys.model.qo.SysMenuQO;
import com.hccake.ballcat.admin.modules.system.model.entity.SysMenu;
import com.hccake.ballcat.admin.modules.system.model.qo.SysMenuQO;
import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX;
import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
import com.hccake.extend.mybatis.plus.toolkit.WrappersX;

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysOrganizationMapper.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysOrganizationMapper.java
View File

@@ -1,7 +1,7 @@
package com.hccake.ballcat.admin.modules.sys.mapper;
package com.hccake.ballcat.admin.modules.system.mapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysOrganization;
import com.hccake.ballcat.admin.modules.system.model.entity.SysOrganization;
import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
import org.apache.ibatis.annotations.Param;

10
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRoleMapper.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysRoleMapper.java
View File

@@ -1,13 +1,13 @@
package com.hccake.ballcat.admin.modules.sys.mapper;
package com.hccake.ballcat.admin.modules.system.mapper;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hccake.ballcat.admin.modules.sys.converter.SysRoleConverter;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole;
import com.hccake.ballcat.admin.modules.sys.model.qo.SysRoleQO;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysRolePageVO;
import com.hccake.ballcat.admin.modules.system.converter.SysRoleConverter;
import com.hccake.ballcat.admin.modules.system.model.entity.SysRole;
import com.hccake.ballcat.admin.modules.system.model.qo.SysRoleQO;
import com.hccake.ballcat.admin.modules.system.model.vo.SysRolePageVO;
import com.hccake.ballcat.common.model.domain.PageParam;
import com.hccake.ballcat.common.model.domain.PageResult;
import com.hccake.ballcat.common.model.domain.SelectData;

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRoleMenuMapper.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysRoleMenuMapper.java
View File

@@ -1,7 +1,7 @@
package com.hccake.ballcat.admin.modules.sys.mapper;
package com.hccake.ballcat.admin.modules.system.mapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysRoleMenu;
import com.hccake.ballcat.admin.modules.system.model.entity.SysRoleMenu;
import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
import java.io.Serializable;

8
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserMapper.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysUserMapper.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.mapper;
package com.hccake.ballcat.admin.modules.system.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.sys.model.qo.SysUserQO;
import com.hccake.ballcat.admin.modules.sys.model.vo.SysUserPageVO;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.model.qo.SysUserQO;
import com.hccake.ballcat.admin.modules.system.model.vo.SysUserPageVO;
import com.hccake.ballcat.common.core.constant.GlobalConstants;
import com.hccake.ballcat.common.model.domain.PageParam;
import com.hccake.ballcat.common.model.domain.PageResult;

10
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserRoleMapper.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysUserRoleMapper.java
View File

@@ -1,12 +1,12 @@
package com.hccake.ballcat.admin.modules.sys.mapper;
package com.hccake.ballcat.admin.modules.system.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUserRole;
import com.hccake.ballcat.admin.modules.sys.model.qo.RoleBindUserQO;
import com.hccake.ballcat.admin.modules.sys.model.vo.RoleBindUserVO;
import com.hccake.ballcat.admin.modules.system.model.entity.SysRole;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUserRole;
import com.hccake.ballcat.admin.modules.system.model.qo.RoleBindUserQO;
import com.hccake.ballcat.admin.modules.system.model.vo.RoleBindUserVO;
import com.hccake.ballcat.common.model.domain.PageParam;
import com.hccake.ballcat.common.model.domain.PageResult;
import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;

12
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/dto/LovDTO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/LovDTO.java
View File

@@ -1,11 +1,11 @@
package com.hccake.ballcat.admin.modules.lov.model.dto;
package com.hccake.ballcat.admin.modules.system.model.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.hccake.ballcat.admin.modules.lov.enums.HttpMethod;
import com.hccake.ballcat.admin.modules.lov.enums.HttpParamsPosition;
import com.hccake.ballcat.admin.modules.lov.model.entity.Lov;
import com.hccake.ballcat.admin.modules.lov.model.entity.LovBody;
import com.hccake.ballcat.admin.modules.lov.model.entity.LovSearch;
import com.hccake.ballcat.admin.modules.system.enums.HttpMethod;
import com.hccake.ballcat.admin.modules.system.enums.HttpParamsPosition;
import com.hccake.ballcat.admin.modules.system.model.entity.Lov;
import com.hccake.ballcat.admin.modules.system.model.entity.LovBody;
import com.hccake.ballcat.admin.modules.system.model.entity.LovSearch;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysOrganizationDTO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysOrganizationDTO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.dto;
package com.hccake.ballcat.admin.modules.system.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysRoleUpdateDTO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysRoleUpdateDTO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.dto;
package com.hccake.ballcat.admin.modules.system.model.dto;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import io.swagger.annotations.ApiModel;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserDTO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysUserDTO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.dto;
package com.hccake.ballcat.admin.modules.system.model.dto;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.hccake.ballcat.common.desensitize.json.annotation.JsonRegexDesensitize;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserPassDTO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysUserPassDTO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.dto;
package com.hccake.ballcat.admin.modules.system.model.dto;
import com.hccake.ballcat.common.desensitize.json.annotation.JsonRegexDesensitize;
import com.hccake.ballcat.common.desensitize.enums.RegexDesensitizationTypeEnum;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserScope.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysUserScope.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.dto;
package com.hccake.ballcat.admin.modules.system.model.dto;
import lombok.Data;

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/UserInfoDTO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/UserInfoDTO.java
View File

@@ -1,6 +1,6 @@
package com.hccake.ballcat.admin.modules.sys.model.dto;
package com.hccake.ballcat.admin.modules.system.model.dto;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
import com.hccake.ballcat.admin.modules.system.model.entity.SysUser;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

10
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/entity/Lov.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/Lov.java
View File

@@ -1,11 +1,11 @@
package com.hccake.ballcat.admin.modules.lov.model.entity;
package com.hccake.ballcat.admin.modules.system.model.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.hccake.ballcat.admin.modules.lov.enums.HttpMethod;
import com.hccake.ballcat.admin.modules.lov.enums.HttpParamsPosition;
import com.hccake.ballcat.admin.modules.system.enums.HttpMethod;
import com.hccake.ballcat.admin.modules.system.enums.HttpParamsPosition;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,12 +16,14 @@ import javax.validation.constraints.Pattern;
import java.time.LocalDateTime;
/**
* list of value 值列表，又名弹窗选择器
*
* @author lingting 2020/7/5 16:04
*/
@Data
@TableName("sys_lov")
@Accessors(chain = true)
@ApiModel(value = "lov模块")
@ApiModel(value = "弹窗选择器")
public class Lov {
@TableId

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/entity/LovBody.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/LovBody.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.lov.model.entity;
package com.hccake.ballcat.admin.modules.system.model.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;

6
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/entity/LovSearch.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/LovSearch.java
View File

@@ -1,11 +1,11 @@
package com.hccake.ballcat.admin.modules.lov.model.entity;
package com.hccake.ballcat.admin.modules.system.model.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.hccake.ballcat.admin.modules.lov.enums.Tag;
import com.hccake.ballcat.admin.modules.lov.typehandler.ListLovSelectOptionTypeHandler;
import com.hccake.ballcat.admin.modules.system.enums.Tag;
import com.hccake.ballcat.admin.modules.system.typehandler.ListLovSelectOptionTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/entity/LovSelectOptions.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/LovSelectOptions.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.lov.model.entity;
package com.hccake.ballcat.admin.modules.system.model.entity;
import io.swagger.annotations.ApiModel;
import lombok.Getter;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysConfig.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysConfig.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.entity;
package com.hccake.ballcat.admin.modules.system.model.entity;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysDict.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysDict.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.entity;
package com.hccake.ballcat.admin.modules.system.model.entity;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysDictItem.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysDictItem.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.entity;
package com.hccake.ballcat.admin.modules.system.model.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysMenu.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysMenu.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.entity;
package com.hccake.ballcat.admin.modules.system.model.entity;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysOrganization.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysOrganization.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.entity;
package com.hccake.ballcat.admin.modules.system.model.entity;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRole.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysRole.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.entity;
package com.hccake.ballcat.admin.modules.system.model.entity;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRoleMenu.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysRoleMenu.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.entity;
package com.hccake.ballcat.admin.modules.system.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUser.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysUser.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.entity;
package com.hccake.ballcat.admin.modules.system.model.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.hccake.extend.mybatis.plus.alias.TableAlias;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUserRole.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysUserRole.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.entity;
package com.hccake.ballcat.admin.modules.system.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

6
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/qo/LovQO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/LovQO.java
View File

@@ -1,7 +1,7 @@
package com.hccake.ballcat.admin.modules.lov.model.qo;
package com.hccake.ballcat.admin.modules.system.model.qo;
import com.hccake.ballcat.admin.modules.lov.enums.HttpMethod;
import com.hccake.ballcat.admin.modules.lov.enums.HttpParamsPosition;
import com.hccake.ballcat.admin.modules.system.enums.HttpMethod;
import com.hccake.ballcat.admin.modules.system.enums.HttpParamsPosition;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.time.LocalDateTime;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/RoleBindUserQO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/RoleBindUserQO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.qo;
package com.hccake.ballcat.admin.modules.system.model.qo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysConfigQO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysConfigQO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.qo;
package com.hccake.ballcat.admin.modules.system.model.qo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysDictQO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysDictQO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.qo;
package com.hccake.ballcat.admin.modules.system.model.qo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysMenuQO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysMenuQO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.qo;
package com.hccake.ballcat.admin.modules.system.model.qo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysOrganizationQO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysOrganizationQO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.qo;
package com.hccake.ballcat.admin.modules.system.model.qo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysRoleQO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysRoleQO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.qo;
package com.hccake.ballcat.admin.modules.system.model.qo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysUserQO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysUserQO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.qo;
package com.hccake.ballcat.admin.modules.system.model.qo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/DictDataVO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/DictDataVO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.vo;
package com.hccake.ballcat.admin.modules.system.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/DictItemVO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/DictItemVO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.vo;
package com.hccake.ballcat.admin.modules.system.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

10
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/vo/LovInfoVO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/LovInfoVO.java
View File

@@ -1,10 +1,10 @@
package com.hccake.ballcat.admin.modules.lov.model.vo;
package com.hccake.ballcat.admin.modules.system.model.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.hccake.ballcat.admin.modules.lov.enums.HttpMethod;
import com.hccake.ballcat.admin.modules.lov.enums.HttpParamsPosition;
import com.hccake.ballcat.admin.modules.lov.model.entity.LovBody;
import com.hccake.ballcat.admin.modules.lov.model.entity.LovSearch;
import com.hccake.ballcat.admin.modules.system.enums.HttpMethod;
import com.hccake.ballcat.admin.modules.system.enums.HttpParamsPosition;
import com.hccake.ballcat.admin.modules.system.model.entity.LovBody;
import com.hccake.ballcat.admin.modules.system.model.entity.LovSearch;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.time.LocalDateTime;

6
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/vo/LovPageVO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/LovPageVO.java
View File

@@ -1,7 +1,7 @@
package com.hccake.ballcat.admin.modules.lov.model.vo;
package com.hccake.ballcat.admin.modules.system.model.vo;
import com.hccake.ballcat.admin.modules.lov.enums.HttpMethod;
import com.hccake.ballcat.admin.modules.lov.enums.HttpParamsPosition;
import com.hccake.ballcat.admin.modules.system.enums.HttpMethod;
import com.hccake.ballcat.admin.modules.system.enums.HttpParamsPosition;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/RoleBindUserVO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/RoleBindUserVO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.vo;
package com.hccake.ballcat.admin.modules.system.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysConfigPageVO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysConfigPageVO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.vo;
package com.hccake.ballcat.admin.modules.system.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysDictItemPageVO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysDictItemPageVO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.vo;
package com.hccake.ballcat.admin.modules.system.model.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysDictPageVO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysDictPageVO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.vo;
package com.hccake.ballcat.admin.modules.system.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysMenuPageVO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysMenuPageVO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.vo;
package com.hccake.ballcat.admin.modules.system.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysMenuRouterVO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysMenuRouterVO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.vo;
package com.hccake.ballcat.admin.modules.system.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysOrganizationTree.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysOrganizationTree.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.vo;
package com.hccake.ballcat.admin.modules.system.model.vo;
import com.hccake.ballcat.common.model.tree.TreeNode;
import io.swagger.annotations.ApiModel;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysRolePageVO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysRolePageVO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.vo;
package com.hccake.ballcat.admin.modules.system.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysUserInfo.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysUserInfo.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.vo;
package com.hccake.ballcat.admin.modules.system.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysUserPageVO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysUserPageVO.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.model.vo;
package com.hccake.ballcat.admin.modules.system.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/FileService.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/FileService.java
View File

@@ -1,4 +1,4 @@
package com.hccake.ballcat.admin.modules.sys.service;
package com.hccake.ballcat.admin.modules.system.service;
import org.springframework.web.multipart.MultipartFile;

Some files were not shown because too many files have changed in this diff Show More