diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/SwaggerTagConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/SwaggerTagConst.java deleted file mode 100644 index 7e6f0923..00000000 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/SwaggerTagConst.java +++ /dev/null @@ -1,57 +0,0 @@ -package net.lab1024.smartadmin.service.common.swagger; - -/** - * [ ] - * - * @author 罗伊 - * @date 2021/1/9 11:45 - */ -public class SwaggerTagConst { - - public static class Support { - - public static final String FILE = "基础-文件服务"; - - public static final String CACHE = "基础-缓存"; - - public static final String SYSTEM_CONFIG = "基础-系统参数"; - - public static final String ID_GENERATOR = "基础-ID生成器"; - - public static final String RELOAD = "基础-Reload"; - - public static final String TASK_SCHEDULER = "基础-任务调度"; - - public static final String USER_OPERATE_LOG = "基础-用户操作日志"; - - public static final String HEART_BEAT = "基础-心跳日志"; - - public static final String CAPTCHA = "基础-图形验证码"; - - } - - public static class Admin { - - public static final String MANAGER_EMPLOYEE = "管理端-员工"; - - public static final String MANAGER_EMPLOYEE_LOGIN = "管理端-员工登录"; - - public static final String MANAGER_DEPARTMENT = "管理端-部门"; - - public static final String MANAGER_ROLE = "管理端-角色"; - - public static final String MANAGER_NOTICE = "管理端-系统通知"; - - public static final String MANAGER_MENU = "管理端-菜单"; - - public static final String MANAGER_ROLE_MENU = "管理端-角色-菜单"; - - public static final String MANAGER_DATA_TRACER = "管理端-数据变动跟踪"; - - public static final String MANAGER_CATEGORY = "管理端-分类"; - - public static final String MANAGER_GOODS = "管理端-商品业务"; - - public static final String MANAGER_SYSTEM_CACHE = "管理端-系统缓存"; - } -} diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/DataSourceConfig.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/DataSourceConfig.java index c0dc0f7e..874b372e 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/DataSourceConfig.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/DataSourceConfig.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; import lombok.extern.slf4j.Slf4j; -import net.lab1024.smartadmin.service.module.support.datascope.MyBatisPlugin; +import net.lab1024.smartadmin.service.module.system.datascope.MyBatisPlugin; import org.apache.ibatis.plugin.Interceptor; import org.apache.ibatis.session.SqlSessionFactory; import org.springframework.aop.support.DefaultPointcutAdvisor; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SwaggerConfig.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SwaggerConfig.java index b86b6d19..4372f940 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SwaggerConfig.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SwaggerConfig.java @@ -8,9 +8,9 @@ import com.google.common.collect.Maps; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import net.lab1024.smartadmin.service.common.constant.RequestHeaderConst; -import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; import net.lab1024.smartadmin.service.common.enumeration.SystemEnvironmentEnum; import net.lab1024.smartadmin.service.common.swagger.SwaggerApiModelPropertyEnumPlugin; +import net.lab1024.smartadmin.service.constant.SwaggerTagConst; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanDefinition; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/constant/SwaggerTagConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/constant/SwaggerTagConst.java index 8efe5ffd..a0887b29 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/constant/SwaggerTagConst.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/constant/SwaggerTagConst.java @@ -9,95 +9,69 @@ package net.lab1024.smartadmin.service.constant; public class SwaggerTagConst { public static class Business { - - } - - - public static class System { - - public static final String MANAGER_HOME = "管理端-首页"; - - public static final String MANAGER_SYSTEM_CONFIG = "管理端-系统配置"; + public static final String MANAGER_NOTICE = "管理端-系统通知"; public static final String MANAGER_EMPLOYEE_LOGIN = "管理端-员工登录"; - public static final String EMPLOYEE = "系统-员工管理"; - - public static final String DEPARTMENT = "系统-部门管理"; + public static final String MANAGER_DEPARTMENT = "管理端-部门"; public static final String MANAGER_ROLE = "管理端-角色"; + public static final String MANAGER_MENU = "管理端-菜单"; public static final String MANAGER_ROLE_MENU = "管理端-角色-菜单"; - public static final String MANAGER_ROLE_USER = "管理端-角色用户"; + public static final String MANAGER_DATA_TRACER = "管理端-数据变动跟踪"; - public static final String MANAGER_ROLE_PRIVILEGE = "管理端-角色权限"; + public static final String MANAGER_CATEGORY = "管理端-分类"; - public static final String MANAGER_BUSINESS_OPERATE_LOG = "管理端-操作日志"; + public static final String MANAGER_GOODS = "管理端-商品业务"; + } - public static final String MANAGER_DATA_SCOPE = "管理端-数据范围"; - public static final String MANAGER_JOB = "管理端-岗位"; + public static class System { - public static final String MANAGER_NOTICE = "管理端-系统通知"; - public static final String MANAGER_PRIVILEGE = "通用-权限"; + public static final String SYSTEM_CONFIG = "系统-系统配置"; - public static final String MANAGER_PIC = "管理端-轮播图"; + public static final String SYSTEM_LOGIN = "系统-员工登录"; - public static final String CATEGORY = "管理端-类目业务"; + public static final String SYSTEM_EMPLOYEE = "系统-员工管理"; - public static final String GOODS = "管理端-商品业务"; + public static final String SYSTEM_DEPARTMENT = "系统-部门管理"; - public static final String ORDER = "管理端-订单业务"; + public static final String SYSTEM_MENU = "系统-菜单"; - public static final String RECEIVE_ACCOUNT = "管理端-收款账号"; + public static final String SYSTEM_DATA_SCOPE = "系统-系统-数据范围"; - public static final String TABLE_COLUMN = "管理端-表格列自定义"; + public static final String SYSTEM_ROLE = "系统-角色"; - public static final String MANAGER_CLUE = "管理端-线索"; + public static final String SYSTEM_ROLE_DATA_SCOPE = "系统-角色-数据范围"; - public static final String MANAGER_CONTRACT = "管理端-合同"; + public static final String SYSTEM_ROLE_EMPLOYEE = "系统-角色-员工"; - public static final String MANAGER_DEPARTMENT_BUSINESS = "管理端-部门业务"; - - public static final String MANAGER_EMPLOYEE_BUSINESS = "管理端-员工业务"; - - public static final String MANAGER_DATA_TRACER = "管理端-数据变动记录"; - - public static final String MANAGER_FLOW = "管理端-审批流"; - - public static final String SPEAK_SCRIPT = "管理端-话术"; - - public static final String SPEAK_SCRIPT_CATEGORY = "管理端-话术分类"; - - public static final String TAG = "管理端-标签管理"; - - public static final String SEAL = "管理端-印章管理"; + public static final String SYSTEM_ROLE_MENU = "系统-角色-菜单"; } public static class Support { - public static final String AREA = "基础-地区服务"; + public static final String SUPPORT_DATA_TRACER = "业务支撑-数据变动记录"; - public static final String FILE = "基础-文件服务"; + public static final String SUPPORT_CACHE = "业务支撑-缓存"; - public static final String CACHE = "基础-缓存"; + public static final String SUPPORT_CAPTCHA = "业务支撑-验证码"; - public static final String SYSTEM_CONFIG = "基础-系统参数"; + public static final String SUPPORT_OPERATE_LOG = "业务支撑-用户操作记录"; - public static final String WX = "基础-微信业务"; + public static final String SUPPORT_RELOAD = "业务支撑-reload"; - public static final String SMART_RELOAD = "基础-Reload"; + public static final String SUPPORT_ID_GENERATOR = "业务支撑-id生成器"; - public static final String HEART_BEAT = "基础-心跳"; + public static final String SUPPORT_HEART_BEAT = "业务支撑-服务心跳"; - public static final String USER_OPERATE_LOG = "基础-用户操作日志"; + public static final String SUPPORT_FILE = "业务支撑-文件服务"; - public static final String PAY = "基础-支付业务"; - - public static final String SMS = "基础-短信业务"; } + } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryController.java index f1e9058a..ae104f48 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryController.java @@ -2,9 +2,9 @@ package net.lab1024.smartadmin.service.module.business.category; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; import net.lab1024.smartadmin.service.common.controller.SystemBaseController; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; +import net.lab1024.smartadmin.service.constant.SwaggerTagConst; import net.lab1024.smartadmin.service.module.business.category.domain.form.CategoryAddForm; import net.lab1024.smartadmin.service.module.business.category.domain.form.CategoryTreeQueryForm; import net.lab1024.smartadmin.service.module.business.category.domain.form.CategoryUpdateForm; @@ -22,7 +22,7 @@ import java.util.List; * @author 胡克 * @date 2021/1/21 9:10 */ -@Api(tags = SwaggerTagConst.Admin.MANAGER_CATEGORY) +@Api(tags = SwaggerTagConst.Business.MANAGER_CATEGORY) @RestController public class CategoryController extends SystemBaseController { diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsController.java index d04c4b43..50b1c337 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsController.java @@ -5,9 +5,9 @@ import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.controller.SystemBaseController; import net.lab1024.smartadmin.service.common.domain.PageResult; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; -import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; -import net.lab1024.smartadmin.service.module.business.goods.domain.*; import net.lab1024.smartadmin.service.common.util.SmartRequestUtil; +import net.lab1024.smartadmin.service.constant.SwaggerTagConst; +import net.lab1024.smartadmin.service.module.business.goods.domain.*; import net.lab1024.smartadmin.service.module.system.login.domain.RequestEmployee; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -22,7 +22,7 @@ import javax.validation.Valid; * @author 胡克 * @date 2021/08/21 19:10 */ -@Api(tags = SwaggerTagConst.Admin.MANAGER_GOODS) +@Api(tags = SwaggerTagConst.Business.MANAGER_GOODS) @RestController public class GoodsController extends SystemBaseController { diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeController.java index f6c7fa3b..aca41afc 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeController.java @@ -2,15 +2,15 @@ package net.lab1024.smartadmin.service.module.business.notice; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; import net.lab1024.smartadmin.service.common.controller.SystemBaseController; import net.lab1024.smartadmin.service.common.domain.PageParam; import net.lab1024.smartadmin.service.common.domain.PageResult; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; +import net.lab1024.smartadmin.service.common.util.SmartRequestUtil; +import net.lab1024.smartadmin.service.constant.SwaggerTagConst; import net.lab1024.smartadmin.service.module.business.notice.domain.dto.*; import net.lab1024.smartadmin.service.module.business.notice.domain.vo.NoticeDetailVO; import net.lab1024.smartadmin.service.module.business.notice.domain.vo.NoticeVO; -import net.lab1024.smartadmin.service.common.util.SmartRequestUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -23,7 +23,7 @@ import javax.validation.Valid; * @date */ @RestController -@Api(tags = {SwaggerTagConst.Admin.MANAGER_NOTICE}) +@Api(tags = {SwaggerTagConst.Business.MANAGER_NOTICE}) public class NoticeController extends SystemBaseController { @Autowired diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/dao/NoticeDao.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/dao/NoticeDao.java index b45f4cfc..41a9b0f7 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/dao/NoticeDao.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/dao/NoticeDao.java @@ -9,9 +9,9 @@ import net.lab1024.smartadmin.service.module.business.notice.domain.dto.NoticeRe import net.lab1024.smartadmin.service.module.business.notice.domain.entity.NoticeEntity; import net.lab1024.smartadmin.service.module.business.notice.domain.vo.NoticeDetailVO; import net.lab1024.smartadmin.service.module.business.notice.domain.vo.NoticeVO; -import net.lab1024.smartadmin.service.module.support.datascope.DataScope; -import net.lab1024.smartadmin.service.module.support.datascope.constant.DataScopeTypeEnum; -import net.lab1024.smartadmin.service.module.support.datascope.constant.DataScopeWhereInTypeEnum; +import net.lab1024.smartadmin.service.module.system.datascope.DataScope; +import net.lab1024.smartadmin.service.module.system.datascope.constant.DataScopeTypeEnum; +import net.lab1024.smartadmin.service.module.system.datascope.constant.DataScopeWhereInTypeEnum; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/cache/CacheController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/cache/CacheController.java index de58c8e8..37603606 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/cache/CacheController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/cache/CacheController.java @@ -4,7 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.controller.SupportBaseController; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; -import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; +import net.lab1024.smartadmin.service.constant.SwaggerTagConst; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -19,23 +19,23 @@ import java.util.List; * @date 2021/10/11 20:07 */ @RestController -@Api(tags = {SwaggerTagConst.Admin.MANAGER_SYSTEM_CACHE}) +@Api(tags = {SwaggerTagConst.Support.SUPPORT_CACHE}) public class CacheController extends SupportBaseController { @Autowired - private CacheService systemCacheService; + private CacheService cacheService; @ApiOperation(value = "获取所有缓存 @author 罗伊") @GetMapping("/cache/names") public ResponseDTO> cacheNames() { - return ResponseDTO.ok(systemCacheService.cacheNames()); + return ResponseDTO.ok(cacheService.cacheNames()); } @ApiOperation(value = "移除某个缓存 @author 罗伊") @GetMapping("/cache/remove/{cacheName}") public ResponseDTO removeCache(@PathVariable String cacheName) { - systemCacheService.removeCache(cacheName); + cacheService.removeCache(cacheName); return ResponseDTO.ok(); } @@ -43,7 +43,7 @@ public class CacheController extends SupportBaseController { @ApiOperation(value = "获取某个缓存的所有key @author 罗伊") @GetMapping("/cache/keys/{cacheName}") public ResponseDTO> cacheKeys(@PathVariable String cacheName) { - return ResponseDTO.ok(systemCacheService.cacheKey(cacheName)); + return ResponseDTO.ok(cacheService.cacheKey(cacheName)); } } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/CaptchaController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/CaptchaController.java index c0a28a7e..a4e3ddfb 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/CaptchaController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/CaptchaController.java @@ -6,7 +6,7 @@ import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.annoation.NoNeedLogin; import net.lab1024.smartadmin.service.common.controller.SupportBaseController; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; -import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; +import net.lab1024.smartadmin.service.constant.SwaggerTagConst; import net.lab1024.smartadmin.service.module.support.captcha.domain.CaptchaVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; * @author 胡克 * @date 2021/08/31 20:00 */ -@Api(tags = SwaggerTagConst.Support.CAPTCHA) +@Api(tags = SwaggerTagConst.Support.SUPPORT_CAPTCHA) @RestController public class CaptchaController extends SupportBaseController { diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/controller/DataTracerController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/controller/DataTracerController.java index 14d9c2a0..790de697 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/controller/DataTracerController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/controller/DataTracerController.java @@ -2,10 +2,10 @@ package net.lab1024.smartadmin.service.module.support.datatracer.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; -import net.lab1024.smartadmin.service.common.controller.SystemBaseController; +import net.lab1024.smartadmin.service.common.controller.SupportBaseController; import net.lab1024.smartadmin.service.common.domain.PageResult; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; +import net.lab1024.smartadmin.service.constant.SwaggerTagConst; import net.lab1024.smartadmin.service.module.support.datatracer.domain.DataTracerQueryForm; import net.lab1024.smartadmin.service.module.support.datatracer.domain.DataTracerVO; import net.lab1024.smartadmin.service.module.support.datatracer.service.DataTracerService; @@ -23,9 +23,9 @@ import javax.validation.Valid; * @date 2020/8/25 11:00 */ -@Api(tags = {SwaggerTagConst.Admin.MANAGER_DATA_TRACER}) +@Api(tags = {SwaggerTagConst.Support.SUPPORT_DATA_TRACER}) @RestController -public class DataTracerController extends SystemBaseController { +public class DataTracerController extends SupportBaseController { @Autowired private DataTracerService dataTracerService; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/FileController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/FileController.java index 7e0c4f71..649c8dfe 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/FileController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/FileController.java @@ -5,7 +5,7 @@ import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.controller.SupportBaseController; import net.lab1024.smartadmin.service.common.domain.PageResult; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; -import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; +import net.lab1024.smartadmin.service.constant.SwaggerTagConst; import net.lab1024.smartadmin.service.module.support.file.domain.FileFolderTypeEnum; import net.lab1024.smartadmin.service.module.support.file.domain.form.FileQueryForm; import net.lab1024.smartadmin.service.module.support.file.domain.form.FileUrlUploadForm; @@ -26,7 +26,7 @@ import javax.validation.Valid; * @Author: 1024lab */ @RestController -@Api(tags = {SwaggerTagConst.Support.FILE}) +@Api(tags = {SwaggerTagConst.Support.SUPPORT_FILE}) public class FileController extends SupportBaseController { @Autowired diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatController.java index 94a9f35b..8fae9616 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatController.java @@ -2,11 +2,11 @@ package net.lab1024.smartadmin.service.module.support.heartbeat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; +import net.lab1024.smartadmin.service.common.controller.SupportBaseController; import net.lab1024.smartadmin.service.common.domain.PageParam; import net.lab1024.smartadmin.service.common.domain.PageResult; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; -import net.lab1024.smartadmin.service.common.controller.SupportBaseController; +import net.lab1024.smartadmin.service.constant.SwaggerTagConst; import net.lab1024.smartadmin.service.module.support.heartbeat.domain.HeartBeatRecordVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -15,8 +15,14 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; - -@Api(tags = {SwaggerTagConst.Support.HEART_BEAT}) +/** + * + * [ ] + * + * @author yandanyang + * @date + */ +@Api(tags = {SwaggerTagConst.Support.SUPPORT_HEART_BEAT}) @RestController public class HeartBeatController extends SupportBaseController { diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorController.java index 2430febe..39dbba3e 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorController.java @@ -5,9 +5,9 @@ import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.code.UserErrorCode; import net.lab1024.smartadmin.service.common.controller.SupportBaseController; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; -import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; -import net.lab1024.smartadmin.service.module.support.idgenerator.constant.IdGeneratorEnum; import net.lab1024.smartadmin.service.common.util.SmartBaseEnumUtil; +import net.lab1024.smartadmin.service.constant.SwaggerTagConst; +import net.lab1024.smartadmin.service.module.support.idgenerator.constant.IdGeneratorEnum; import net.lab1024.smartadmin.service.module.support.idgenerator.constant.IdGeneratorStrategyTypeEnum; import net.lab1024.smartadmin.service.module.support.idgenerator.service.IdGeneratorService; import org.springframework.beans.factory.annotation.Autowired; @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; * @author listen * @date 2019/09/26 21:13 */ -@Api(tags = SwaggerTagConst.Support.ID_GENERATOR) +@Api(tags = SwaggerTagConst.Support.SUPPORT_ID_GENERATOR) @RestController public class IdGeneratorController extends SupportBaseController { diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/service/IdGeneratorCacheService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/service/IdGeneratorCacheManager.java similarity index 96% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/service/IdGeneratorCacheService.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/service/IdGeneratorCacheManager.java index 73fc0858..5485b248 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/service/IdGeneratorCacheService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/service/IdGeneratorCacheManager.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service -public class IdGeneratorCacheService { +public class IdGeneratorCacheManager { @Autowired private IdGeneratorDao idGeneratorDao; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/strategy/IdGeneratorInternStrategy.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/strategy/IdGeneratorInternStrategy.java index 0b41bc73..d2465107 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/strategy/IdGeneratorInternStrategy.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/strategy/IdGeneratorInternStrategy.java @@ -5,7 +5,7 @@ import com.google.common.collect.Interners; import net.lab1024.smartadmin.service.module.support.idgenerator.constant.IdGeneratorEnum; import net.lab1024.smartadmin.service.module.support.idgenerator.constant.IdGeneratorStrategyTypeEnum; import net.lab1024.smartadmin.service.module.support.idgenerator.domain.IdGeneratorEntity; -import net.lab1024.smartadmin.service.module.support.idgenerator.service.IdGeneratorCacheService; +import net.lab1024.smartadmin.service.module.support.idgenerator.service.IdGeneratorCacheManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,7 +20,7 @@ public class IdGeneratorInternStrategy extends IdGeneratorStrategyBaseService { private static final Interner POOL = Interners.newWeakInterner(); @Autowired - private IdGeneratorCacheService idGeneratorCacheService; + private IdGeneratorCacheManager idGeneratorCacheManager; /** * 策略类型 @@ -40,7 +40,7 @@ public class IdGeneratorInternStrategy extends IdGeneratorStrategyBaseService { */ @Override public String generate(IdGeneratorEnum idGeneratorEnum) { - IdGeneratorEntity idGeneratorEntity = idGeneratorCacheService.getIdGeneratorEntity(idGeneratorEnum.getValue()); + IdGeneratorEntity idGeneratorEntity = idGeneratorCacheManager.getIdGeneratorEntity(idGeneratorEnum.getValue()); synchronized (POOL.intern(idGeneratorEntity.getId())) { return generate(idGeneratorEntity); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/strategy/IdGeneratorRedisStrategy.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/strategy/IdGeneratorRedisStrategy.java index 9dd672b3..2a4d6c01 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/strategy/IdGeneratorRedisStrategy.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/strategy/IdGeneratorRedisStrategy.java @@ -1,28 +1,16 @@ package net.lab1024.smartadmin.service.module.support.idgenerator.strategy; -import com.google.common.collect.Interner; -import com.google.common.collect.Interners; import lombok.extern.slf4j.Slf4j; -import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.common.exception.BusinessException; -import net.lab1024.smartadmin.service.common.util.SmartRandomUtil; import net.lab1024.smartadmin.service.constant.RedisKeyConst; -import net.lab1024.smartadmin.service.constant.SwaggerTagConst; import net.lab1024.smartadmin.service.module.support.idgenerator.constant.IdGeneratorEnum; -import net.lab1024.smartadmin.service.module.support.idgenerator.constant.IdGeneratorRuleTypeEnum; import net.lab1024.smartadmin.service.module.support.idgenerator.constant.IdGeneratorStrategyTypeEnum; import net.lab1024.smartadmin.service.module.support.idgenerator.domain.IdGeneratorEntity; -import net.lab1024.smartadmin.service.module.support.idgenerator.service.IdGeneratorCacheService; +import net.lab1024.smartadmin.service.module.support.idgenerator.service.IdGeneratorCacheManager; import net.lab1024.smartadmin.service.module.support.redis.RedisService; -import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.util.Strings; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Objects; - /** * [ ] * @@ -40,7 +28,7 @@ public class IdGeneratorRedisStrategy extends IdGeneratorStrategyBaseService { private static volatile long lastSleepMilliSeconds = SLEEP_MILLISECONDS; @Autowired - private IdGeneratorCacheService idGeneratorCacheService; + private IdGeneratorCacheManager idGeneratorCacheManager; @Autowired private RedisService redisService; @@ -62,7 +50,7 @@ public class IdGeneratorRedisStrategy extends IdGeneratorStrategyBaseService { */ @Override public String generate(IdGeneratorEnum idGeneratorEnum) { - IdGeneratorEntity idGeneratorEntity = idGeneratorCacheService.getIdGeneratorEntity(idGeneratorEnum.getValue()); + IdGeneratorEntity idGeneratorEntity = idGeneratorCacheManager.getIdGeneratorEntity(idGeneratorEnum.getValue()); String lockKey = RedisKeyConst.Support.ID_GENERATOR + idGeneratorEnum.getValue(); try { boolean lock = false; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogController.java index ef244605..168e1d7c 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogController.java @@ -5,7 +5,7 @@ import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.controller.SupportBaseController; import net.lab1024.smartadmin.service.common.domain.PageResult; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; -import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; +import net.lab1024.smartadmin.service.constant.SwaggerTagConst; import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogDTO; import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogQueryForm; import org.springframework.beans.factory.annotation.Autowired; @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; * @author 罗伊 */ @RestController -@Api(tags = {SwaggerTagConst.Support.USER_OPERATE_LOG}) +@Api(tags = {SwaggerTagConst.Support.SUPPORT_OPERATE_LOG}) public class OperateLogController extends SupportBaseController { @Autowired diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/ReloadController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/ReloadController.java index e8eb6db0..3fa3193d 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/ReloadController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/ReloadController.java @@ -4,7 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.controller.SupportBaseController; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; -import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; +import net.lab1024.smartadmin.service.constant.SwaggerTagConst; import net.lab1024.smartadmin.service.module.support.reload.domain.ReloadItemUpdateDTO; import net.lab1024.smartadmin.service.module.support.reload.domain.ReloadItemVO; import net.lab1024.smartadmin.service.module.support.reload.domain.ReloadResultVO; @@ -19,7 +19,7 @@ import java.util.List; * @author 开云 */ @RestController -@Api(tags = {SwaggerTagConst.Support.RELOAD}) +@Api(tags = {SwaggerTagConst.Support.SUPPORT_RELOAD}) public class ReloadController extends SupportBaseController { @Autowired diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/DataScope.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/DataScope.java similarity index 78% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/DataScope.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/DataScope.java index 8a89f816..b7d51b0f 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/DataScope.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/DataScope.java @@ -1,9 +1,9 @@ -package net.lab1024.smartadmin.service.module.support.datascope; +package net.lab1024.smartadmin.service.module.system.datascope; -import net.lab1024.smartadmin.service.module.support.datascope.constant.DataScopeTypeEnum; -import net.lab1024.smartadmin.service.module.support.datascope.constant.DataScopeWhereInTypeEnum; -import net.lab1024.smartadmin.service.module.support.datascope.strategy.DataScopePowerStrategy; +import net.lab1024.smartadmin.service.module.system.datascope.constant.DataScopeTypeEnum; +import net.lab1024.smartadmin.service.module.system.datascope.constant.DataScopeWhereInTypeEnum; +import net.lab1024.smartadmin.service.module.system.datascope.strategy.DataScopePowerStrategy; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/DataScopeController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/DataScopeController.java similarity index 78% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/DataScopeController.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/DataScopeController.java index fe1f05ef..4ee599f1 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/DataScopeController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/DataScopeController.java @@ -1,12 +1,12 @@ -package net.lab1024.smartadmin.service.module.support.datascope; +package net.lab1024.smartadmin.service.module.system.datascope; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.controller.SupportBaseController; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.constant.SwaggerTagConst; -import net.lab1024.smartadmin.service.module.support.datascope.domain.DataScopeAndViewTypeVO; -import net.lab1024.smartadmin.service.module.support.datascope.service.DataScopeService; +import net.lab1024.smartadmin.service.module.system.datascope.domain.DataScopeAndViewTypeVO; +import net.lab1024.smartadmin.service.module.system.datascope.service.DataScopeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -23,7 +23,7 @@ import java.util.List; * @date 2019/4/27 0027 下午 15:12 * @since JDK1.8 */ -@Api(tags = {SwaggerTagConst.System.MANAGER_ROLE}) +@Api(tags = {SwaggerTagConst.System.SYSTEM_DATA_SCOPE}) @RestController public class DataScopeController extends SupportBaseController { diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/MyBatisPlugin.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/MyBatisPlugin.java similarity index 96% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/MyBatisPlugin.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/MyBatisPlugin.java index 98776b4d..fbba30de 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/MyBatisPlugin.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/MyBatisPlugin.java @@ -1,9 +1,9 @@ -package net.lab1024.smartadmin.service.module.support.datascope; +package net.lab1024.smartadmin.service.module.system.datascope; import com.google.common.collect.Maps; import net.lab1024.smartadmin.service.common.util.SmartStringUtil; -import net.lab1024.smartadmin.service.module.support.datascope.domain.DataScopeSqlConfig; -import net.lab1024.smartadmin.service.module.support.datascope.service.DataScopeSqlConfigService; +import net.lab1024.smartadmin.service.module.system.datascope.domain.DataScopeSqlConfig; +import net.lab1024.smartadmin.service.module.system.datascope.service.DataScopeSqlConfigService; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.mapping.*; import org.apache.ibatis.plugin.*; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/constant/DataScopeTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeTypeEnum.java similarity index 55% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/constant/DataScopeTypeEnum.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeTypeEnum.java index ef636c5d..8e600886 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/constant/DataScopeTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeTypeEnum.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.module.support.datascope.constant; +package net.lab1024.smartadmin.service.module.system.datascope.constant; import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; @@ -15,20 +15,8 @@ import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; */ public enum DataScopeTypeEnum implements BaseEnum { - CLUE_USER(1, 1, "线索", "线索数据范围"), - CLUE_USER_TRACK(2, 2, "线索跟进", "线索跟进记录"), - CLUE_PUBLIC_USER(3, 3, "公海线索", "公海线索数据范围"), - CLUE_INVALID_USER(4, 4, "无效线索", "无效线索数据范围"), - CONTRACT(11, 5, "合同", "合同数据范围"), - - ORDER(21, 10, "订单", "订单数据范围"), - RECEIVE_ORDER(22, 11, "收款单", "收款单数据范围"), - REFUND_ORDER(23, 12, "退款单", "退款单数据范围"), - - EMPLOYEE_SALES_RANK(31, 15, "员工业绩排行", "员工业绩排行数据范围"), - - NOTICE(41, 20, "系统通知", "系统通知数据范围"), + NOTICE(1, 20, "系统通知", "系统通知数据范围"), ; private Integer value; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/constant/DataScopeViewTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeViewTypeEnum.java similarity index 92% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/constant/DataScopeViewTypeEnum.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeViewTypeEnum.java index 1e63e10f..33cd681f 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/constant/DataScopeViewTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeViewTypeEnum.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.module.support.datascope.constant; +package net.lab1024.smartadmin.service.module.system.datascope.constant; import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/constant/DataScopeWhereInTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeWhereInTypeEnum.java similarity index 91% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/constant/DataScopeWhereInTypeEnum.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeWhereInTypeEnum.java index fad457d5..f655080c 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/constant/DataScopeWhereInTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeWhereInTypeEnum.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.module.support.datascope.constant; +package net.lab1024.smartadmin.service.module.system.datascope.constant; import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/domain/DataScopeAndViewTypeVO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/domain/DataScopeAndViewTypeVO.java similarity index 91% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/domain/DataScopeAndViewTypeVO.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/domain/DataScopeAndViewTypeVO.java index 82c19580..82cf001f 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/domain/DataScopeAndViewTypeVO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/domain/DataScopeAndViewTypeVO.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.module.support.datascope.domain; +package net.lab1024.smartadmin.service.module.system.datascope.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/domain/DataScope.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/domain/DataScopeDTO.java similarity index 86% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/domain/DataScope.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/domain/DataScopeDTO.java index 4c05e58d..5683ba63 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/domain/DataScope.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/domain/DataScopeDTO.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.module.support.datascope.domain; +package net.lab1024.smartadmin.service.module.system.datascope.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Builder; @@ -16,7 +16,7 @@ import lombok.Data; */ @Data @Builder -public class DataScope { +public class DataScopeDTO { @ApiModelProperty("数据范围类型") private Integer dataScopeType; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/domain/DataScopeSqlConfig.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/domain/DataScopeSqlConfig.java similarity index 72% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/domain/DataScopeSqlConfig.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/domain/DataScopeSqlConfig.java index bdd8cea5..33702491 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/domain/DataScopeSqlConfig.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/domain/DataScopeSqlConfig.java @@ -1,8 +1,8 @@ -package net.lab1024.smartadmin.service.module.support.datascope.domain; +package net.lab1024.smartadmin.service.module.system.datascope.domain; import lombok.Data; -import net.lab1024.smartadmin.service.module.support.datascope.constant.DataScopeTypeEnum; -import net.lab1024.smartadmin.service.module.support.datascope.constant.DataScopeWhereInTypeEnum; +import net.lab1024.smartadmin.service.module.system.datascope.constant.DataScopeTypeEnum; +import net.lab1024.smartadmin.service.module.system.datascope.constant.DataScopeWhereInTypeEnum; /** * [ ] diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/domain/DataScopeViewTypeVO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/domain/DataScopeViewTypeVO.java similarity index 88% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/domain/DataScopeViewTypeVO.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/domain/DataScopeViewTypeVO.java index 29c6145c..ba5d3bd0 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/domain/DataScopeViewTypeVO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/domain/DataScopeViewTypeVO.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.module.support.datascope.domain; +package net.lab1024.smartadmin.service.module.system.datascope.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Builder; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/service/DataScopeService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeService.java similarity index 64% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/service/DataScopeService.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeService.java index 5a6bae13..6df2fad5 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/service/DataScopeService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeService.java @@ -1,14 +1,14 @@ -package net.lab1024.smartadmin.service.module.support.datascope.service; +package net.lab1024.smartadmin.service.module.system.datascope.service; import com.google.common.collect.Lists; import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; import org.springframework.stereotype.Service; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; -import net.lab1024.smartadmin.service.module.support.datascope.constant.DataScopeTypeEnum; -import net.lab1024.smartadmin.service.module.support.datascope.constant.DataScopeViewTypeEnum; -import net.lab1024.smartadmin.service.module.support.datascope.domain.DataScopeAndViewTypeVO; -import net.lab1024.smartadmin.service.module.support.datascope.domain.DataScope; -import net.lab1024.smartadmin.service.module.support.datascope.domain.DataScopeViewTypeVO; +import net.lab1024.smartadmin.service.module.system.datascope.constant.DataScopeTypeEnum; +import net.lab1024.smartadmin.service.module.system.datascope.constant.DataScopeViewTypeEnum; +import net.lab1024.smartadmin.service.module.system.datascope.domain.DataScopeAndViewTypeVO; +import net.lab1024.smartadmin.service.module.system.datascope.domain.DataScopeDTO; +import net.lab1024.smartadmin.service.module.system.datascope.domain.DataScopeViewTypeVO; import java.util.Comparator; import java.util.List; @@ -32,7 +32,7 @@ public class DataScopeService { * @return */ public ResponseDTO> dataScopeList() { - List dataScopeList = this.getDataScopeType(); + List dataScopeList = this.getDataScopeType(); List dataScopeAndTypeList = SmartBeanUtil.copyList(dataScopeList, DataScopeAndViewTypeVO.class); List typeList = this.getViewType(); dataScopeAndTypeList.forEach(e -> { @@ -59,16 +59,16 @@ public class DataScopeService { return viewTypeList; } - public List getDataScopeType() { - List dataScopeTypeList = Lists.newArrayList(); + public List getDataScopeType() { + List dataScopeTypeList = Lists.newArrayList(); DataScopeTypeEnum[] enums = DataScopeTypeEnum.class.getEnumConstants(); - DataScope dataScope; + DataScopeDTO dataScopeDTO; for (DataScopeTypeEnum typeEnum : enums) { - dataScope = - DataScope.builder().dataScopeType(typeEnum.getValue()).dataScopeTypeDesc(typeEnum.getDesc()).dataScopeTypeName(typeEnum.getName()).dataScopeTypeSort(typeEnum.getSort()).build(); - dataScopeTypeList.add(dataScope); + dataScopeDTO = + DataScopeDTO.builder().dataScopeType(typeEnum.getValue()).dataScopeTypeDesc(typeEnum.getDesc()).dataScopeTypeName(typeEnum.getName()).dataScopeTypeSort(typeEnum.getSort()).build(); + dataScopeTypeList.add(dataScopeDTO); } - Comparator comparator = (h1, h2) -> h1.getDataScopeTypeSort().compareTo(h2.getDataScopeTypeSort()); + Comparator comparator = (h1, h2) -> h1.getDataScopeTypeSort().compareTo(h2.getDataScopeTypeSort()); dataScopeTypeList.sort(comparator); return dataScopeTypeList; } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/service/DataScopeSqlConfigService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeSqlConfigService.java similarity index 89% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/service/DataScopeSqlConfigService.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeSqlConfigService.java index 0aa1a671..a3807cae 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/service/DataScopeSqlConfigService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeSqlConfigService.java @@ -1,7 +1,8 @@ -package net.lab1024.smartadmin.service.module.support.datascope.service; +package net.lab1024.smartadmin.service.module.system.datascope.service; import lombok.extern.slf4j.Slf4j; import net.lab1024.smartadmin.service.common.util.SmartRequestUtil; +import net.lab1024.smartadmin.service.module.system.datascope.domain.DataScopeDTO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.reflections.Reflections; @@ -12,12 +13,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; -import net.lab1024.smartadmin.service.module.support.datascope.DataScope; -import net.lab1024.smartadmin.service.module.support.datascope.constant.DataScopeTypeEnum; -import net.lab1024.smartadmin.service.module.support.datascope.constant.DataScopeViewTypeEnum; -import net.lab1024.smartadmin.service.module.support.datascope.constant.DataScopeWhereInTypeEnum; -import net.lab1024.smartadmin.service.module.support.datascope.domain.DataScopeSqlConfig; -import net.lab1024.smartadmin.service.module.support.datascope.strategy.DataScopePowerStrategy; +import net.lab1024.smartadmin.service.module.system.datascope.DataScope; +import net.lab1024.smartadmin.service.module.system.datascope.constant.DataScopeTypeEnum; +import net.lab1024.smartadmin.service.module.system.datascope.constant.DataScopeViewTypeEnum; +import net.lab1024.smartadmin.service.module.system.datascope.constant.DataScopeWhereInTypeEnum; +import net.lab1024.smartadmin.service.module.system.datascope.domain.DataScopeSqlConfig; +import net.lab1024.smartadmin.service.module.system.datascope.strategy.DataScopePowerStrategy; import javax.annotation.PostConstruct; import java.lang.reflect.Method; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/service/DataScopeViewService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeViewService.java similarity index 96% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/service/DataScopeViewService.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeViewService.java index 493e0a07..6d13e856 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/service/DataScopeViewService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeViewService.java @@ -1,9 +1,9 @@ -package net.lab1024.smartadmin.service.module.support.datascope.service; +package net.lab1024.smartadmin.service.module.system.datascope.service; import com.google.common.collect.Lists; import net.lab1024.smartadmin.service.common.util.SmartBaseEnumUtil; -import net.lab1024.smartadmin.service.module.support.datascope.constant.DataScopeTypeEnum; -import net.lab1024.smartadmin.service.module.support.datascope.constant.DataScopeViewTypeEnum; +import net.lab1024.smartadmin.service.module.system.datascope.constant.DataScopeTypeEnum; +import net.lab1024.smartadmin.service.module.system.datascope.constant.DataScopeViewTypeEnum; import net.lab1024.smartadmin.service.module.system.role.domain.entity.RoleDataScopeEntity; import net.lab1024.smartadmin.service.module.system.department.service.DepartmentService; import net.lab1024.smartadmin.service.module.system.employee.EmployeeDao; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/strategy/DataScopePowerStrategy.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/strategy/DataScopePowerStrategy.java similarity index 66% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/strategy/DataScopePowerStrategy.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/strategy/DataScopePowerStrategy.java index 0d39f69d..5aebaaa6 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datascope/strategy/DataScopePowerStrategy.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/strategy/DataScopePowerStrategy.java @@ -1,7 +1,7 @@ -package net.lab1024.smartadmin.service.module.support.datascope.strategy; +package net.lab1024.smartadmin.service.module.system.datascope.strategy; -import net.lab1024.smartadmin.service.module.support.datascope.constant.DataScopeViewTypeEnum; -import net.lab1024.smartadmin.service.module.support.datascope.domain.DataScopeSqlConfig; +import net.lab1024.smartadmin.service.module.system.datascope.constant.DataScopeViewTypeEnum; +import net.lab1024.smartadmin.service.module.system.datascope.domain.DataScopeSqlConfig; import java.util.Map; @@ -19,7 +19,8 @@ public abstract class DataScopePowerStrategy { /** * 获取joinsql 字符串 - * @param viewTypeEnum 查看的类型 + * @param viewTypeEnum + * @param paramMap * @param sqlConfigDTO * @return */ diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/controller/DepartmentController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/controller/DepartmentController.java index 74d11406..6d43dbc9 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/controller/DepartmentController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/controller/DepartmentController.java @@ -21,7 +21,7 @@ import java.util.List; * * @author zhuoda */ -@Api(tags = {SwaggerTagConst.System.DEPARTMENT}) +@Api(tags = {SwaggerTagConst.System.SYSTEM_DEPARTMENT}) @RestController public class DepartmentController extends SystemBaseController { diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentCacheService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/manager/DepartmentCacheManager.java similarity index 97% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentCacheService.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/manager/DepartmentCacheManager.java index ec14266f..8217ccc8 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentCacheService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/manager/DepartmentCacheManager.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.module.system.department.service; +package net.lab1024.smartadmin.service.module.system.department.manager; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; @@ -6,6 +6,7 @@ import net.lab1024.smartadmin.service.constant.CacheModuleConst; import net.lab1024.smartadmin.service.module.system.department.dao.DepartmentDao; import net.lab1024.smartadmin.service.module.system.department.domain.vo.DepartmentTreeVO; import net.lab1024.smartadmin.service.module.system.department.domain.vo.DepartmentVO; +import net.lab1024.smartadmin.service.module.system.department.service.DepartmentTreeService; import org.apache.commons.lang3.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; @@ -25,7 +26,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service -public class DepartmentCacheService { +public class DepartmentCacheManager { @Autowired private DepartmentDao departmentDao; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentService.java index dead0eef..d6222550 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentService.java @@ -9,6 +9,7 @@ import net.lab1024.smartadmin.service.module.system.department.domain.form.Depar import net.lab1024.smartadmin.service.module.system.department.domain.form.DepartmentUpdateForm; import net.lab1024.smartadmin.service.module.system.department.domain.vo.DepartmentTreeVO; import net.lab1024.smartadmin.service.module.system.department.domain.vo.DepartmentVO; +import net.lab1024.smartadmin.service.module.system.department.manager.DepartmentCacheManager; import net.lab1024.smartadmin.service.module.system.employee.EmployeeDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,7 +31,7 @@ public class DepartmentService { private EmployeeDao employeeDao; @Autowired - private DepartmentCacheService departmentCacheService; + private DepartmentCacheManager departmentCacheManager; /** @@ -39,7 +40,7 @@ public class DepartmentService { * @return */ public ResponseDTO> departmentTree() { - List treeVOList = departmentCacheService.departmentTreeCache(); + List treeVOList = departmentCacheManager.departmentTreeCache(); return ResponseDTO.ok(treeVOList); } @@ -50,7 +51,7 @@ public class DepartmentService { * @return */ public List selfAndChildrenIdList(Long departmentId) { - return departmentCacheService.departmentSelfChildrenCache(departmentId); + return departmentCacheManager.departmentSelfChildrenCache(departmentId); } @@ -136,11 +137,11 @@ public class DepartmentService { * 清除自身以及下级的id列表缓存 */ private void clearCache() { - departmentCacheService.clearDepartmentCache(); - departmentCacheService.clearSelfAndChildrenIdCache(); - departmentCacheService.clearTreeCache(); - departmentCacheService.clearDepartmentSchoolCache(); - departmentCacheService.clearDepartmentRouteCache(); + departmentCacheManager.clearDepartmentCache(); + departmentCacheManager.clearSelfAndChildrenIdCache(); + departmentCacheManager.clearTreeCache(); + departmentCacheManager.clearDepartmentSchoolCache(); + departmentCacheManager.clearDepartmentRouteCache(); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeController.java index 9f3cc929..0124fc50 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeController.java @@ -24,7 +24,7 @@ import java.util.List; * @date 2021年09月19日上午21:34:52 */ @RestController -@Api(tags = {SwaggerTagConst.System.EMPLOYEE}) +@Api(tags = {SwaggerTagConst.System.SYSTEM_EMPLOYEE}) public class EmployeeController extends SystemBaseController { @Autowired diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/service/EmployeeCacheService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/manager/EmployeeCacheManager.java similarity index 96% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/service/EmployeeCacheService.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/manager/EmployeeCacheManager.java index 5dba47ce..dae90493 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/service/EmployeeCacheService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/manager/EmployeeCacheManager.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.module.system.employee.service; +package net.lab1024.smartadmin.service.module.system.employee.manager; import lombok.extern.slf4j.Slf4j; import net.lab1024.smartadmin.service.constant.CacheModuleConst; @@ -19,7 +19,7 @@ import java.util.List; */ @Slf4j @Service -public class EmployeeCacheService { +public class EmployeeCacheManager { @Autowired private EmployeeDao employeeDao; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/service/EmployeeService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/service/EmployeeService.java index 511ac20c..b8957984 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/service/EmployeeService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/service/EmployeeService.java @@ -10,11 +10,12 @@ import net.lab1024.smartadmin.service.common.util.SmartPageUtil; import net.lab1024.smartadmin.service.module.system.department.dao.DepartmentDao; import net.lab1024.smartadmin.service.module.system.department.domain.entity.DepartmentEntity; import net.lab1024.smartadmin.service.module.system.department.domain.vo.DepartmentVO; -import net.lab1024.smartadmin.service.module.system.department.service.DepartmentCacheService; +import net.lab1024.smartadmin.service.module.system.department.manager.DepartmentCacheManager; import net.lab1024.smartadmin.service.module.system.employee.EmployeeDao; import net.lab1024.smartadmin.service.module.system.employee.domain.entity.EmployeeEntity; import net.lab1024.smartadmin.service.module.system.employee.domain.form.*; import net.lab1024.smartadmin.service.module.system.employee.domain.vo.EmployeeVO; +import net.lab1024.smartadmin.service.module.system.employee.manager.EmployeeCacheManager; import net.lab1024.smartadmin.service.module.system.employee.manager.EmployeeManager; import net.lab1024.smartadmin.service.module.system.login.domain.LoginUserDetail; import net.lab1024.smartadmin.service.module.system.login.domain.RequestEmployee; @@ -58,9 +59,9 @@ public class EmployeeService { private RoleEmployeeDao roleEmployeeDao; @Autowired - private EmployeeCacheService employeeCacheService; + private EmployeeCacheManager employeeCacheManager; @Autowired - private DepartmentCacheService departmentCacheService; + private DepartmentCacheManager departmentCacheManager; /** * 获取员工登录信息 @@ -69,9 +70,9 @@ public class EmployeeService { * @return */ public RequestEmployee getById(Long employeeId) { - EmployeeEntity employeeEntity = employeeCacheService.singleEmployeeCache(employeeId); + EmployeeEntity employeeEntity = employeeCacheManager.singleEmployeeCache(employeeId); //获取员工角色缓存 - List roleIdList = employeeCacheService.singleEmployeeRoleCache(employeeId); + List roleIdList = employeeCacheManager.singleEmployeeRoleCache(employeeId); if (employeeEntity != null) { Boolean isSuperman = menuEmployeeService.isSuperman(employeeId); RequestEmployee loginDTO = SmartBeanUtil.copy(employeeEntity, RequestEmployee.class); @@ -90,9 +91,9 @@ public class EmployeeService { * @return */ public LoginUserDetail getBoById(Long employeeId) { - EmployeeEntity employeeEntity = employeeCacheService.singleEmployeeCache(employeeId); + EmployeeEntity employeeEntity = employeeCacheManager.singleEmployeeCache(employeeId); //获取员工角色缓存 - List roleIdList = employeeCacheService.singleEmployeeRoleCache(employeeId); + List roleIdList = employeeCacheManager.singleEmployeeRoleCache(employeeId); if (employeeEntity == null) { return null; } @@ -124,7 +125,7 @@ public class EmployeeService { Map> employeeRoleIdListMap = roleEmployeeEntityList.stream().collect(Collectors.groupingBy(RoleEmployeeVO::getEmployeeId, Collectors.mapping(RoleEmployeeVO::getRoleId, Collectors.toList()))); Map> employeeRoleNameListMap = roleEmployeeEntityList.stream().collect(Collectors.groupingBy(RoleEmployeeVO::getEmployeeId, Collectors.mapping(RoleEmployeeVO::getRoleName, Collectors.toList()))); // 查询员工部门 - Map departmentNameMap = departmentCacheService.departmentRouteCache(); + Map departmentNameMap = departmentCacheManager.departmentRouteCache(); employeeList.forEach(e -> { e.setRoleIdList(employeeRoleIdListMap.getOrDefault(e.getEmployeeId(), Lists.newArrayList())); @@ -170,7 +171,7 @@ public class EmployeeService { // 保存数据 employeeManager.saveEmployee(entity, employeeAddForm.getRoleIdList()); - employeeCacheService.clearCacheByDepartmentId(departmentId); + employeeCacheManager.clearCacheByDepartmentId(departmentId); return ResponseDTO.ok(); } @@ -220,8 +221,8 @@ public class EmployeeService { employeeManager.updateEmployee(entity, employeeUpdateForm.getRoleIdList()); // 清除缓存 - employeeCacheService.clearCacheByEmployeeId(employeeId); - employeeCacheService.clearCacheByDepartmentId(departmentId); + employeeCacheManager.clearCacheByEmployeeId(employeeId); + employeeCacheManager.clearCacheByDepartmentId(departmentId); return ResponseDTO.ok(); } @@ -242,8 +243,8 @@ public class EmployeeService { } employeeDao.updateDisableFlag(employeeId, !employeeEntity.getDisabledFlag()); - employeeCacheService.clearCacheByEmployeeId(employeeId); - employeeCacheService.clearCacheByDepartmentId(employeeEntity.getDepartmentId()); + employeeCacheManager.clearCacheByEmployeeId(employeeId); + employeeCacheManager.clearCacheByDepartmentId(employeeEntity.getDepartmentId()); return ResponseDTO.ok(); } @@ -271,10 +272,10 @@ public class EmployeeService { // 清除缓存 employeeEntityList.forEach(e -> { - employeeCacheService.clearCacheByEmployeeId(e.getEmployeeId()); - employeeCacheService.clearCacheByDepartmentId(e.getDepartmentId()); + employeeCacheManager.clearCacheByEmployeeId(e.getEmployeeId()); + employeeCacheManager.clearCacheByDepartmentId(e.getDepartmentId()); }); - employeeCacheService.clearCacheByDepartmentId(batchUpdateDepartmentForm.getDepartmentId()); + employeeCacheManager.clearCacheByDepartmentId(batchUpdateDepartmentForm.getDepartmentId()); return ResponseDTO.ok(); } @@ -319,12 +320,12 @@ public class EmployeeService { * @return */ public ResponseDTO> getAllEmployeeByDepartmentId(Long departmentId, Boolean disabledFlag) { - List employeeEntityList = employeeCacheService.departmentEmployeeCache(departmentId); + List employeeEntityList = employeeCacheManager.departmentEmployeeCache(departmentId); if (disabledFlag != null) { employeeEntityList = employeeEntityList.stream().filter(e -> e.getDisabledFlag().equals(disabledFlag)).collect(Collectors.toList()); } // 获取部门 - List departmentList = departmentCacheService.departmentCache(); + List departmentList = departmentCacheManager.departmentCache(); Optional departmentVO = departmentList.stream().filter(e -> e.getDepartmentId().equals(departmentId)).findFirst(); if (CollectionUtils.isEmpty(employeeEntityList)) { return ResponseDTO.ok(Collections.emptyList()); diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/controller/LoginController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/controller/LoginController.java index 0694c262..19a43649 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/controller/LoginController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/controller/LoginController.java @@ -27,7 +27,7 @@ import javax.validation.Valid; * @author zhuoda */ @RestController -@Api(tags = {SwaggerTagConst.System.MANAGER_EMPLOYEE_LOGIN}) +@Api(tags = {SwaggerTagConst.System.SYSTEM_LOGIN}) public class LoginController extends SystemBaseController { @Autowired diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/controller/MenuController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/controller/MenuController.java index 94f23281..419dd828 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/controller/MenuController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/controller/MenuController.java @@ -23,7 +23,7 @@ import java.util.List; * * @author zhuoda */ -@Api(tags = {SwaggerTagConst.System.MANAGER_MENU}) +@Api(tags = {SwaggerTagConst.System.SYSTEM_MENU}) @RestController public class MenuController extends SystemBaseController { diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/controller/RoleController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/controller/RoleController.java index 7e6bdbd7..ac24af62 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/controller/RoleController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/controller/RoleController.java @@ -21,7 +21,7 @@ import java.util.List; * @author listen * @date 2017/12/28 10:10 */ -@Api(tags = {SwaggerTagConst.System.MANAGER_ROLE}) +@Api(tags = {SwaggerTagConst.System.SYSTEM_ROLE}) @RestController public class RoleController extends SystemBaseController { diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/controller/RoleDataScopeController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/controller/RoleDataScopeController.java index 39367b7f..0f777103 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/controller/RoleDataScopeController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/controller/RoleDataScopeController.java @@ -19,7 +19,7 @@ import java.util.List; * @Date 2021-10-22 */ -@Api(tags = {SwaggerTagConst.System.MANAGER_ROLE}) +@Api(tags = {SwaggerTagConst.System.SYSTEM_ROLE_DATA_SCOPE}) @RestController public class RoleDataScopeController extends SystemBaseController { diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/controller/RoleEmployeeController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/controller/RoleEmployeeController.java index 357840c6..e0079188 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/controller/RoleEmployeeController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/controller/RoleEmployeeController.java @@ -25,7 +25,7 @@ import java.util.List; * @author listen * @date 2017/12/28 10:10 */ -@Api(tags = {SwaggerTagConst.System.MANAGER_ROLE}) +@Api(tags = {SwaggerTagConst.System.SYSTEM_ROLE_EMPLOYEE}) @RestController public class RoleEmployeeController extends SystemBaseController { diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/controller/RoleMenuController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/controller/RoleMenuController.java index ae1f8ec6..fe926acd 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/controller/RoleMenuController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/controller/RoleMenuController.java @@ -20,7 +20,7 @@ import javax.validation.Valid; * @date 2021/7/30 17:06 */ @RestController -@Api(tags = {SwaggerTagConst.System.MANAGER_ROLE_MENU}) +@Api(tags = {SwaggerTagConst.System.SYSTEM_ROLE_MENU}) public class RoleMenuController extends SystemBaseController { @Autowired diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/domain/entity/RoleDataScopeEntity.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/domain/entity/RoleDataScopeEntity.java index da94030c..bcc2dbfa 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/domain/entity/RoleDataScopeEntity.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/domain/entity/RoleDataScopeEntity.java @@ -27,12 +27,12 @@ public class RoleDataScopeEntity { private Long id; /** * 数据范围id - * {@link net.lab1024.smartadmin.service.module.support.datascope.constant.DataScopeTypeEnum} + * {@link net.lab1024.smartadmin.service.module.system.datascope.constant.DataScopeTypeEnum} */ private Integer dataScopeType; /** * 数据范围类型 - * {@link net.lab1024.smartadmin.service.module.support.datascope.constant.DataScopeViewTypeEnum} + * {@link net.lab1024.smartadmin.service.module.system.datascope.constant.DataScopeViewTypeEnum} */ private Integer viewType; /** diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/service/RoleEmployeeService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/service/RoleEmployeeService.java index fef962e5..1ee0b502 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/service/RoleEmployeeService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/service/RoleEmployeeService.java @@ -9,7 +9,7 @@ import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; import net.lab1024.smartadmin.service.common.util.SmartPageUtil; import net.lab1024.smartadmin.service.module.system.department.dao.DepartmentDao; import net.lab1024.smartadmin.service.module.system.department.domain.entity.DepartmentEntity; -import net.lab1024.smartadmin.service.module.system.employee.service.EmployeeCacheService; +import net.lab1024.smartadmin.service.module.system.employee.manager.EmployeeCacheManager; import net.lab1024.smartadmin.service.module.system.employee.domain.vo.EmployeeVO; import net.lab1024.smartadmin.service.module.system.role.dao.RoleDao; import net.lab1024.smartadmin.service.module.system.role.dao.RoleEmployeeDao; @@ -46,7 +46,7 @@ public class RoleEmployeeService { @Autowired private RoleEmployeeManager roleEmployeeManager; @Autowired - private EmployeeCacheService employeeCacheService; + private EmployeeCacheManager employeeCacheManager; /** * 通过角色id，分页获取成员员工列表 @@ -86,7 +86,7 @@ public class RoleEmployeeService { return ResponseDTO.error(UserErrorCode.PARAM_ERROR); } roleEmployeeDao.deleteByEmployeeIdRoleId(employeeId, roleId); - employeeCacheService.clearCacheByEmployeeId(employeeId); + employeeCacheManager.clearCacheByEmployeeId(employeeId); return ResponseDTO.ok(); } @@ -99,7 +99,7 @@ public class RoleEmployeeService { public ResponseDTO batchRemoveRoleEmployee(RoleEmployeeUpdateForm roleEmployeeUpdateForm) { roleEmployeeDao.batchDeleteEmployeeRole(roleEmployeeUpdateForm.getRoleId(), roleEmployeeUpdateForm.getEmployeeIdList()); for (Long employeeId : roleEmployeeUpdateForm.getEmployeeIdList()) { - employeeCacheService.clearCacheByEmployeeId(employeeId); + employeeCacheManager.clearCacheByEmployeeId(employeeId); } return ResponseDTO.ok(); } @@ -123,7 +123,7 @@ public class RoleEmployeeService { // 保存数据 roleEmployeeManager.saveRoleEmployee(roleId, roleEmployeeList); for (Long employeeId : employeeIdList) { - employeeCacheService.clearCacheByEmployeeId(employeeId); + employeeCacheManager.clearCacheByEmployeeId(employeeId); } return ResponseDTO.ok(); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigController.java index 4895921d..f1fce50d 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigController.java @@ -5,7 +5,7 @@ import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.controller.SystemBaseController; import net.lab1024.smartadmin.service.common.domain.PageResult; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; -import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; +import net.lab1024.smartadmin.service.constant.SwaggerTagConst; import net.lab1024.smartadmin.service.module.system.systemconfig.domain.SystemConfigAddForm; import net.lab1024.smartadmin.service.module.system.systemconfig.domain.SystemConfigQueryForm; import net.lab1024.smartadmin.service.module.system.systemconfig.domain.SystemConfigUpdateForm; @@ -23,7 +23,7 @@ import javax.validation.Valid; * @date * @since JDK1.8 */ -@Api(tags = {SwaggerTagConst.Support.SYSTEM_CONFIG}) +@Api(tags = {SwaggerTagConst.System.SYSTEM_CONFIG}) @RestController public class SystemConfigController extends SystemBaseController { diff --git a/admin-api/java-api/src/main/resources/dev/application.properties b/admin-api/java-api/src/main/resources/dev/application.properties index a0457e19..2cbfe8d8 100644 --- a/admin-api/java-api/src/main/resources/dev/application.properties +++ b/admin-api/java-api/src/main/resources/dev/application.properties @@ -26,9 +26,9 @@ spring.jackson.serialization.write-dates-as-timestamps=false #spring.datasource.username=root #spring.datasource.password=root -spring.datasource.url=jdbc:p6spy:mysql://82.157.125.186:10200/smart_admin_v2?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai +spring.datasource.url=jdbc:p6spy:mysql://127.0.0.1:11024/smart_admin_v2?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai spring.datasource.username=root -spring.datasource.password=Zhuoda.vip +spring.datasource.password=xxxx spring.datasource.initial-size=2 spring.datasource.min-idle=1 @@ -50,9 +50,9 @@ spring.redis.lettuce.pool.max-active=100 spring.redis.lettuce.pool.min-idle=5 spring.redis.lettuce.pool.max-idle=10 spring.redis.lettuce.pool.max-wait=30000ms -spring.redis.port=1234 +spring.redis.port=21024 spring.redis.timeout=10000ms -spring.redis.password=1234 +spring.redis.password=xxxx ######################### swagger ######################### swagger.apiGroupName=smartAdmin @@ -61,7 +61,7 @@ swagger.description=SmartAdmin2.0 swagger.version=2.0 swagger.serviceUrl=http://localhost:${server.port}/smart-admin-api swagger.packAge=net.lab1024.smartadmin.service -swagger.tagClass=net.lab1024.smartadmin.service.common.constant.SwaggerTagConst +swagger.tagClass=net.lab1024.smartadmin.service.constant.SwaggerTagConst ########################## rest http pool ######################### http.pool.max-total=20