diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/common/CaptchaController.java b/shgx-admin/src/main/java/com/shgx/web/controller/common/CaptchaController.java index a2bb5c0..6251624 100644 --- a/shgx-admin/src/main/java/com/shgx/web/controller/common/CaptchaController.java +++ b/shgx-admin/src/main/java/com/shgx/web/controller/common/CaptchaController.java @@ -18,7 +18,7 @@ import com.shgx.common.core.domain.AjaxResult; import com.shgx.common.core.redis.RedisCache; import com.shgx.common.utils.sign.Base64; import com.shgx.common.utils.uuid.IdUtils; -import com.shgx.system.service.sys.ISysConfigService; +import com.shgx.system.service.ISysConfigService; /** * 验证码操作处理 diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/monitor/CacheController.java b/shgx-admin/src/main/java/com/shgx/web/controller/monitor/CacheController.java index 1adabe8..861ac7e 100644 --- a/shgx-admin/src/main/java/com/shgx/web/controller/monitor/CacheController.java +++ b/shgx-admin/src/main/java/com/shgx/web/controller/monitor/CacheController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; import com.shgx.common.constant.CacheConstants; import com.shgx.common.core.domain.AjaxResult; import com.shgx.common.utils.StringUtils; -import com.shgx.system.domain.sys.SysCache; +import com.shgx.system.domain.SysCache; /** * 缓存监控 diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/monitor/SysLogininforController.java b/shgx-admin/src/main/java/com/shgx/web/controller/monitor/SysLogininforController.java index a9533f4..1deb422 100644 --- a/shgx-admin/src/main/java/com/shgx/web/controller/monitor/SysLogininforController.java +++ b/shgx-admin/src/main/java/com/shgx/web/controller/monitor/SysLogininforController.java @@ -17,8 +17,8 @@ import com.shgx.common.core.page.TableDataInfo; import com.shgx.common.enums.BusinessType; import com.shgx.common.utils.poi.ExcelUtil; import com.shgx.framework.web.service.SysPasswordService; -import com.shgx.system.domain.sys.SysLogininfor; -import com.shgx.system.service.sys.ISysLogininforService; +import com.shgx.system.domain.SysLogininfor; +import com.shgx.system.service.ISysLogininforService; /** * 系统访问记录 diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/monitor/SysOperlogController.java b/shgx-admin/src/main/java/com/shgx/web/controller/monitor/SysOperlogController.java index ef44de4..6735ae2 100644 --- a/shgx-admin/src/main/java/com/shgx/web/controller/monitor/SysOperlogController.java +++ b/shgx-admin/src/main/java/com/shgx/web/controller/monitor/SysOperlogController.java @@ -16,8 +16,8 @@ import com.shgx.common.core.domain.AjaxResult; import com.shgx.common.core.page.TableDataInfo; import com.shgx.common.enums.BusinessType; import com.shgx.common.utils.poi.ExcelUtil; -import com.shgx.system.domain.sys.SysOperLog; -import com.shgx.system.service.sys.ISysOperLogService; +import com.shgx.system.domain.SysOperLog; +import com.shgx.system.service.ISysOperLogService; /** * 操作日志记录 diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/monitor/SysUserOnlineController.java b/shgx-admin/src/main/java/com/shgx/web/controller/monitor/SysUserOnlineController.java index 6dc9ab9..9f560bb 100644 --- a/shgx-admin/src/main/java/com/shgx/web/controller/monitor/SysUserOnlineController.java +++ b/shgx-admin/src/main/java/com/shgx/web/controller/monitor/SysUserOnlineController.java @@ -20,8 +20,8 @@ import com.shgx.common.core.page.TableDataInfo; import com.shgx.common.core.redis.RedisCache; import com.shgx.common.enums.BusinessType; import com.shgx.common.utils.StringUtils; -import com.shgx.system.domain.sys.SysUserOnline; -import com.shgx.system.service.sys.ISysUserOnlineService; +import com.shgx.system.domain.SysUserOnline; +import com.shgx.system.service.ISysUserOnlineService; /** * 在线用户监控 diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysConfigController.java b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysConfigController.java index abb1d1d..e3a4342 100644 --- a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysConfigController.java +++ b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysConfigController.java @@ -19,8 +19,8 @@ import com.shgx.common.core.domain.AjaxResult; import com.shgx.common.core.page.TableDataInfo; import com.shgx.common.enums.BusinessType; import com.shgx.common.utils.poi.ExcelUtil; -import com.shgx.system.domain.sys.SysConfig; -import com.shgx.system.service.sys.ISysConfigService; +import com.shgx.system.domain.SysConfig; +import com.shgx.system.service.ISysConfigService; /** * 参数配置 信息操作处理 diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysDeptController.java b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysDeptController.java index d23eae4..e9aef08 100644 --- a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysDeptController.java +++ b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysDeptController.java @@ -20,7 +20,7 @@ import com.shgx.common.core.domain.AjaxResult; import com.shgx.common.core.domain.entity.SysDept; import com.shgx.common.enums.BusinessType; import com.shgx.common.utils.StringUtils; -import com.shgx.system.service.sys.ISysDeptService; +import com.shgx.system.service.ISysDeptService; /** * 部门信息 diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysDictDataController.java b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysDictDataController.java index fae2e6d..2dc386f 100644 --- a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysDictDataController.java +++ b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysDictDataController.java @@ -22,8 +22,8 @@ import com.shgx.common.core.page.TableDataInfo; import com.shgx.common.enums.BusinessType; import com.shgx.common.utils.StringUtils; import com.shgx.common.utils.poi.ExcelUtil; -import com.shgx.system.service.sys.ISysDictDataService; -import com.shgx.system.service.sys.ISysDictTypeService; +import com.shgx.system.service.ISysDictDataService; +import com.shgx.system.service.ISysDictTypeService; /** * 数据字典信息 diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysDictTypeController.java b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysDictTypeController.java index 3921ea6..1e7f38a 100644 --- a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysDictTypeController.java +++ b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysDictTypeController.java @@ -20,7 +20,7 @@ import com.shgx.common.core.domain.entity.SysDictType; import com.shgx.common.core.page.TableDataInfo; import com.shgx.common.enums.BusinessType; import com.shgx.common.utils.poi.ExcelUtil; -import com.shgx.system.service.sys.ISysDictTypeService; +import com.shgx.system.service.ISysDictTypeService; /** * 数据字典信息 diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysLoginController.java b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysLoginController.java index 5a8b301..7370b74 100644 --- a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysLoginController.java +++ b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysLoginController.java @@ -21,8 +21,8 @@ import com.shgx.common.utils.StringUtils; import com.shgx.framework.web.service.SysLoginService; import com.shgx.framework.web.service.SysPermissionService; import com.shgx.framework.web.service.TokenService; -import com.shgx.system.service.sys.ISysConfigService; -import com.shgx.system.service.sys.ISysMenuService; +import com.shgx.system.service.ISysConfigService; +import com.shgx.system.service.ISysMenuService; /** * 登录验证 diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysMenuController.java b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysMenuController.java index d4cb9f6..3556748 100644 --- a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysMenuController.java +++ b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysMenuController.java @@ -19,7 +19,7 @@ import com.shgx.common.core.domain.AjaxResult; import com.shgx.common.core.domain.entity.SysMenu; import com.shgx.common.enums.BusinessType; import com.shgx.common.utils.StringUtils; -import com.shgx.system.service.sys.ISysMenuService; +import com.shgx.system.service.ISysMenuService; /** * 菜单信息 diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysNoticeController.java b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysNoticeController.java index d067c26..60112a4 100644 --- a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysNoticeController.java +++ b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysNoticeController.java @@ -17,8 +17,8 @@ import com.shgx.common.core.controller.BaseController; import com.shgx.common.core.domain.AjaxResult; import com.shgx.common.core.page.TableDataInfo; import com.shgx.common.enums.BusinessType; -import com.shgx.system.domain.sys.SysNotice; -import com.shgx.system.service.sys.ISysNoticeService; +import com.shgx.system.domain.SysNotice; +import com.shgx.system.service.ISysNoticeService; /** * 公告 信息操作处理 diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysPostController.java b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysPostController.java index 5ab6056..04115ca 100644 --- a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysPostController.java +++ b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysPostController.java @@ -19,8 +19,8 @@ import com.shgx.common.core.domain.AjaxResult; import com.shgx.common.core.page.TableDataInfo; import com.shgx.common.enums.BusinessType; import com.shgx.common.utils.poi.ExcelUtil; -import com.shgx.system.domain.sys.SysPost; -import com.shgx.system.service.sys.ISysPostService; +import com.shgx.system.domain.SysPost; +import com.shgx.system.service.ISysPostService; /** * 岗位信息操作处理 diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysProfileController.java b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysProfileController.java index db7cb83..e585fde 100644 --- a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysProfileController.java +++ b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysProfileController.java @@ -24,7 +24,7 @@ import com.shgx.common.utils.file.FileUploadUtils; import com.shgx.common.utils.file.FileUtils; import com.shgx.common.utils.file.MimeTypeUtils; import com.shgx.framework.web.service.TokenService; -import com.shgx.system.service.sys.ISysUserService; +import com.shgx.system.service.ISysUserService; /** * 个人信息 业务处理 diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysRegisterController.java b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysRegisterController.java index 042b156..174bea3 100644 --- a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysRegisterController.java +++ b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysRegisterController.java @@ -9,7 +9,7 @@ import com.shgx.common.core.domain.AjaxResult; import com.shgx.common.core.domain.model.RegisterBody; import com.shgx.common.utils.StringUtils; import com.shgx.framework.web.service.SysRegisterService; -import com.shgx.system.service.sys.ISysConfigService; +import com.shgx.system.service.ISysConfigService; /** * 注册验证 diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysRoleController.java b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysRoleController.java index c1b6e1e..4111c7b 100644 --- a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysRoleController.java +++ b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysRoleController.java @@ -26,10 +26,10 @@ import com.shgx.common.utils.StringUtils; import com.shgx.common.utils.poi.ExcelUtil; import com.shgx.framework.web.service.SysPermissionService; import com.shgx.framework.web.service.TokenService; -import com.shgx.system.domain.sys.SysUserRole; -import com.shgx.system.service.sys.ISysDeptService; -import com.shgx.system.service.sys.ISysRoleService; -import com.shgx.system.service.sys.ISysUserService; +import com.shgx.system.domain.SysUserRole; +import com.shgx.system.service.ISysDeptService; +import com.shgx.system.service.ISysRoleService; +import com.shgx.system.service.ISysUserService; /** * 角色信息 diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysUserController.java b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysUserController.java index 4636c79..c4f5ffe 100644 --- a/shgx-admin/src/main/java/com/shgx/web/controller/system/SysUserController.java +++ b/shgx-admin/src/main/java/com/shgx/web/controller/system/SysUserController.java @@ -27,10 +27,10 @@ import com.shgx.common.enums.BusinessType; import com.shgx.common.utils.SecurityUtils; import com.shgx.common.utils.StringUtils; import com.shgx.common.utils.poi.ExcelUtil; -import com.shgx.system.service.sys.ISysDeptService; -import com.shgx.system.service.sys.ISysPostService; -import com.shgx.system.service.sys.ISysRoleService; -import com.shgx.system.service.sys.ISysUserService; +import com.shgx.system.service.ISysDeptService; +import com.shgx.system.service.ISysPostService; +import com.shgx.system.service.ISysRoleService; +import com.shgx.system.service.ISysUserService; /** * 用户信息 diff --git a/shgx-framework/src/main/java/com/shgx/framework/aspectj/LogAspect.java b/shgx-framework/src/main/java/com/shgx/framework/aspectj/LogAspect.java index 47f480a..952ce78 100644 --- a/shgx-framework/src/main/java/com/shgx/framework/aspectj/LogAspect.java +++ b/shgx-framework/src/main/java/com/shgx/framework/aspectj/LogAspect.java @@ -31,7 +31,7 @@ import com.shgx.common.utils.StringUtils; import com.shgx.common.utils.ip.IpUtils; import com.shgx.framework.manager.AsyncManager; import com.shgx.framework.manager.factory.AsyncFactory; -import com.shgx.system.domain.sys.SysOperLog; +import com.shgx.system.domain.SysOperLog; /** * 操作日志记录处理 diff --git a/shgx-framework/src/main/java/com/shgx/framework/manager/factory/AsyncFactory.java b/shgx-framework/src/main/java/com/shgx/framework/manager/factory/AsyncFactory.java index cfbd6e8..53e5735 100644 --- a/shgx-framework/src/main/java/com/shgx/framework/manager/factory/AsyncFactory.java +++ b/shgx-framework/src/main/java/com/shgx/framework/manager/factory/AsyncFactory.java @@ -10,10 +10,10 @@ import com.shgx.common.utils.StringUtils; import com.shgx.common.utils.ip.AddressUtils; import com.shgx.common.utils.ip.IpUtils; import com.shgx.common.utils.spring.SpringUtils; -import com.shgx.system.domain.sys.SysLogininfor; -import com.shgx.system.domain.sys.SysOperLog; -import com.shgx.system.service.sys.ISysLogininforService; -import com.shgx.system.service.sys.ISysOperLogService; +import com.shgx.system.domain.SysLogininfor; +import com.shgx.system.domain.SysOperLog; +import com.shgx.system.service.ISysLogininforService; +import com.shgx.system.service.ISysOperLogService; import eu.bitwalker.useragentutils.UserAgent; /** diff --git a/shgx-framework/src/main/java/com/shgx/framework/web/service/SysLoginService.java b/shgx-framework/src/main/java/com/shgx/framework/web/service/SysLoginService.java index 3411edc..ca0dc7a 100644 --- a/shgx-framework/src/main/java/com/shgx/framework/web/service/SysLoginService.java +++ b/shgx-framework/src/main/java/com/shgx/framework/web/service/SysLoginService.java @@ -25,8 +25,8 @@ import com.shgx.common.utils.ip.IpUtils; import com.shgx.framework.manager.AsyncManager; import com.shgx.framework.manager.factory.AsyncFactory; import com.shgx.framework.security.context.AuthenticationContextHolder; -import com.shgx.system.service.sys.ISysConfigService; -import com.shgx.system.service.sys.ISysUserService; +import com.shgx.system.service.ISysConfigService; +import com.shgx.system.service.ISysUserService; /** * 登录校验方法 diff --git a/shgx-framework/src/main/java/com/shgx/framework/web/service/SysPermissionService.java b/shgx-framework/src/main/java/com/shgx/framework/web/service/SysPermissionService.java index f8fcc3c..a767faf 100644 --- a/shgx-framework/src/main/java/com/shgx/framework/web/service/SysPermissionService.java +++ b/shgx-framework/src/main/java/com/shgx/framework/web/service/SysPermissionService.java @@ -10,8 +10,8 @@ import com.shgx.common.constant.UserConstants; import com.shgx.common.core.domain.entity.SysRole; import com.shgx.common.core.domain.entity.SysUser; import com.shgx.common.utils.StringUtils; -import com.shgx.system.service.sys.ISysMenuService; -import com.shgx.system.service.sys.ISysRoleService; +import com.shgx.system.service.ISysMenuService; +import com.shgx.system.service.ISysRoleService; /** * 用户权限处理 diff --git a/shgx-framework/src/main/java/com/shgx/framework/web/service/SysRegisterService.java b/shgx-framework/src/main/java/com/shgx/framework/web/service/SysRegisterService.java index 025e939..3e91c15 100644 --- a/shgx-framework/src/main/java/com/shgx/framework/web/service/SysRegisterService.java +++ b/shgx-framework/src/main/java/com/shgx/framework/web/service/SysRegisterService.java @@ -16,8 +16,8 @@ import com.shgx.common.utils.SecurityUtils; import com.shgx.common.utils.StringUtils; import com.shgx.framework.manager.AsyncManager; import com.shgx.framework.manager.factory.AsyncFactory; -import com.shgx.system.service.sys.ISysConfigService; -import com.shgx.system.service.sys.ISysUserService; +import com.shgx.system.service.ISysConfigService; +import com.shgx.system.service.ISysUserService; /** * 注册校验方法 diff --git a/shgx-framework/src/main/java/com/shgx/framework/web/service/UserDetailsServiceImpl.java b/shgx-framework/src/main/java/com/shgx/framework/web/service/UserDetailsServiceImpl.java index 0095d33..c6a0dc4 100644 --- a/shgx-framework/src/main/java/com/shgx/framework/web/service/UserDetailsServiceImpl.java +++ b/shgx-framework/src/main/java/com/shgx/framework/web/service/UserDetailsServiceImpl.java @@ -13,7 +13,7 @@ import com.shgx.common.enums.UserStatus; import com.shgx.common.exception.ServiceException; import com.shgx.common.utils.MessageUtils; import com.shgx.common.utils.StringUtils; -import com.shgx.system.service.sys.ISysUserService; +import com.shgx.system.service.ISysUserService; /** * 用户验证处理 diff --git a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysCache.java b/shgx-system/src/main/java/com/shgx/system/domain/SysCache.java similarity index 97% rename from shgx-system/src/main/java/com/shgx/system/domain/sys/SysCache.java rename to shgx-system/src/main/java/com/shgx/system/domain/SysCache.java index 70dfaa6..871e6aa 100644 --- a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysCache.java +++ b/shgx-system/src/main/java/com/shgx/system/domain/SysCache.java @@ -1,4 +1,4 @@ -package com.shgx.system.domain.sys; +package com.shgx.system.domain; import com.shgx.common.utils.StringUtils; diff --git a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysConfig.java b/shgx-system/src/main/java/com/shgx/system/domain/SysConfig.java similarity index 98% rename from shgx-system/src/main/java/com/shgx/system/domain/sys/SysConfig.java rename to shgx-system/src/main/java/com/shgx/system/domain/SysConfig.java index 49badc3..b1fce63 100644 --- a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysConfig.java +++ b/shgx-system/src/main/java/com/shgx/system/domain/SysConfig.java @@ -1,4 +1,4 @@ -package com.shgx.system.domain.sys; +package com.shgx.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; diff --git a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysLogininfor.java b/shgx-system/src/main/java/com/shgx/system/domain/SysLogininfor.java similarity index 98% rename from shgx-system/src/main/java/com/shgx/system/domain/sys/SysLogininfor.java rename to shgx-system/src/main/java/com/shgx/system/domain/SysLogininfor.java index 9e3f05b..6d61af8 100644 --- a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysLogininfor.java +++ b/shgx-system/src/main/java/com/shgx/system/domain/SysLogininfor.java @@ -1,4 +1,4 @@ -package com.shgx.system.domain.sys; +package com.shgx.system.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysNotice.java b/shgx-system/src/main/java/com/shgx/system/domain/SysNotice.java similarity index 98% rename from shgx-system/src/main/java/com/shgx/system/domain/sys/SysNotice.java rename to shgx-system/src/main/java/com/shgx/system/domain/SysNotice.java index 4357fa2..281fd2e 100644 --- a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysNotice.java +++ b/shgx-system/src/main/java/com/shgx/system/domain/SysNotice.java @@ -1,4 +1,4 @@ -package com.shgx.system.domain.sys; +package com.shgx.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; diff --git a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysOperLog.java b/shgx-system/src/main/java/com/shgx/system/domain/SysOperLog.java similarity index 99% rename from shgx-system/src/main/java/com/shgx/system/domain/sys/SysOperLog.java rename to shgx-system/src/main/java/com/shgx/system/domain/SysOperLog.java index db24782..498ed9a 100644 --- a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysOperLog.java +++ b/shgx-system/src/main/java/com/shgx/system/domain/SysOperLog.java @@ -1,4 +1,4 @@ -package com.shgx.system.domain.sys; +package com.shgx.system.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysPost.java b/shgx-system/src/main/java/com/shgx/system/domain/SysPost.java similarity index 98% rename from shgx-system/src/main/java/com/shgx/system/domain/sys/SysPost.java rename to shgx-system/src/main/java/com/shgx/system/domain/SysPost.java index 40c23cc..267b4cc 100644 --- a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysPost.java +++ b/shgx-system/src/main/java/com/shgx/system/domain/SysPost.java @@ -1,4 +1,4 @@ -package com.shgx.system.domain.sys; +package com.shgx.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysRoleDept.java b/shgx-system/src/main/java/com/shgx/system/domain/SysRoleDept.java similarity index 95% rename from shgx-system/src/main/java/com/shgx/system/domain/sys/SysRoleDept.java rename to shgx-system/src/main/java/com/shgx/system/domain/SysRoleDept.java index caa84e7..701c679 100644 --- a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysRoleDept.java +++ b/shgx-system/src/main/java/com/shgx/system/domain/SysRoleDept.java @@ -1,4 +1,4 @@ -package com.shgx.system.domain.sys; +package com.shgx.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysRoleMenu.java b/shgx-system/src/main/java/com/shgx/system/domain/SysRoleMenu.java similarity index 95% rename from shgx-system/src/main/java/com/shgx/system/domain/sys/SysRoleMenu.java rename to shgx-system/src/main/java/com/shgx/system/domain/SysRoleMenu.java index 832cb4d..4fa1af1 100644 --- a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysRoleMenu.java +++ b/shgx-system/src/main/java/com/shgx/system/domain/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.shgx.system.domain.sys; +package com.shgx.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysUserOnline.java b/shgx-system/src/main/java/com/shgx/system/domain/SysUserOnline.java similarity index 98% rename from shgx-system/src/main/java/com/shgx/system/domain/sys/SysUserOnline.java rename to shgx-system/src/main/java/com/shgx/system/domain/SysUserOnline.java index 45f4be5..b27c6e9 100644 --- a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysUserOnline.java +++ b/shgx-system/src/main/java/com/shgx/system/domain/SysUserOnline.java @@ -1,4 +1,4 @@ -package com.shgx.system.domain.sys; +package com.shgx.system.domain; /** * 当前在线会话 diff --git a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysUserPost.java b/shgx-system/src/main/java/com/shgx/system/domain/SysUserPost.java similarity index 95% rename from shgx-system/src/main/java/com/shgx/system/domain/sys/SysUserPost.java rename to shgx-system/src/main/java/com/shgx/system/domain/SysUserPost.java index 4276d60..200c373 100644 --- a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysUserPost.java +++ b/shgx-system/src/main/java/com/shgx/system/domain/SysUserPost.java @@ -1,4 +1,4 @@ -package com.shgx.system.domain.sys; +package com.shgx.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysUserRole.java b/shgx-system/src/main/java/com/shgx/system/domain/SysUserRole.java similarity index 95% rename from shgx-system/src/main/java/com/shgx/system/domain/sys/SysUserRole.java rename to shgx-system/src/main/java/com/shgx/system/domain/SysUserRole.java index e806a2c..e665914 100644 --- a/shgx-system/src/main/java/com/shgx/system/domain/sys/SysUserRole.java +++ b/shgx-system/src/main/java/com/shgx/system/domain/SysUserRole.java @@ -1,4 +1,4 @@ -package com.shgx.system.domain.sys; +package com.shgx.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysConfigMapper.java b/shgx-system/src/main/java/com/shgx/system/mapper/SysConfigMapper.java similarity index 94% rename from shgx-system/src/main/java/com/shgx/system/mapper/sys/SysConfigMapper.java rename to shgx-system/src/main/java/com/shgx/system/mapper/SysConfigMapper.java index fc6b4ed..52de58c 100644 --- a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysConfigMapper.java +++ b/shgx-system/src/main/java/com/shgx/system/mapper/SysConfigMapper.java @@ -1,7 +1,7 @@ -package com.shgx.system.mapper.sys; +package com.shgx.system.mapper; import java.util.List; -import com.shgx.system.domain.sys.SysConfig; +import com.shgx.system.domain.SysConfig; /** * 参数配置 数据层 diff --git a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysDeptMapper.java b/shgx-system/src/main/java/com/shgx/system/mapper/SysDeptMapper.java similarity index 98% rename from shgx-system/src/main/java/com/shgx/system/mapper/sys/SysDeptMapper.java rename to shgx-system/src/main/java/com/shgx/system/mapper/SysDeptMapper.java index 59b1fc7..db7d3a8 100644 --- a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysDeptMapper.java +++ b/shgx-system/src/main/java/com/shgx/system/mapper/SysDeptMapper.java @@ -1,4 +1,4 @@ -package com.shgx.system.mapper.sys; +package com.shgx.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysDictDataMapper.java b/shgx-system/src/main/java/com/shgx/system/mapper/SysDictDataMapper.java similarity index 98% rename from shgx-system/src/main/java/com/shgx/system/mapper/sys/SysDictDataMapper.java rename to shgx-system/src/main/java/com/shgx/system/mapper/SysDictDataMapper.java index c9f2e2d..7e69dac 100644 --- a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysDictDataMapper.java +++ b/shgx-system/src/main/java/com/shgx/system/mapper/SysDictDataMapper.java @@ -1,4 +1,4 @@ -package com.shgx.system.mapper.sys; +package com.shgx.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysDictTypeMapper.java b/shgx-system/src/main/java/com/shgx/system/mapper/SysDictTypeMapper.java similarity index 98% rename from shgx-system/src/main/java/com/shgx/system/mapper/sys/SysDictTypeMapper.java rename to shgx-system/src/main/java/com/shgx/system/mapper/SysDictTypeMapper.java index 3dfcb78..82f3b0a 100644 --- a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysDictTypeMapper.java +++ b/shgx-system/src/main/java/com/shgx/system/mapper/SysDictTypeMapper.java @@ -1,4 +1,4 @@ -package com.shgx.system.mapper.sys; +package com.shgx.system.mapper; import java.util.List; import com.shgx.common.core.domain.entity.SysDictType; diff --git a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysLogininforMapper.java b/shgx-system/src/main/java/com/shgx/system/mapper/SysLogininforMapper.java similarity index 90% rename from shgx-system/src/main/java/com/shgx/system/mapper/sys/SysLogininforMapper.java rename to shgx-system/src/main/java/com/shgx/system/mapper/SysLogininforMapper.java index 2801d3d..b59c955 100644 --- a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysLogininforMapper.java +++ b/shgx-system/src/main/java/com/shgx/system/mapper/SysLogininforMapper.java @@ -1,7 +1,7 @@ -package com.shgx.system.mapper.sys; +package com.shgx.system.mapper; import java.util.List; -import com.shgx.system.domain.sys.SysLogininfor; +import com.shgx.system.domain.SysLogininfor; /** * 系统访问日志情况信息 数据层 diff --git a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysMenuMapper.java b/shgx-system/src/main/java/com/shgx/system/mapper/SysMenuMapper.java similarity index 98% rename from shgx-system/src/main/java/com/shgx/system/mapper/sys/SysMenuMapper.java rename to shgx-system/src/main/java/com/shgx/system/mapper/SysMenuMapper.java index 4ad8e8f..d15bd33 100644 --- a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysMenuMapper.java +++ b/shgx-system/src/main/java/com/shgx/system/mapper/SysMenuMapper.java @@ -1,4 +1,4 @@ -package com.shgx.system.mapper.sys; +package com.shgx.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysNoticeMapper.java b/shgx-system/src/main/java/com/shgx/system/mapper/SysNoticeMapper.java similarity index 93% rename from shgx-system/src/main/java/com/shgx/system/mapper/sys/SysNoticeMapper.java rename to shgx-system/src/main/java/com/shgx/system/mapper/SysNoticeMapper.java index c353302..7143603 100644 --- a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysNoticeMapper.java +++ b/shgx-system/src/main/java/com/shgx/system/mapper/SysNoticeMapper.java @@ -1,7 +1,7 @@ -package com.shgx.system.mapper.sys; +package com.shgx.system.mapper; import java.util.List; -import com.shgx.system.domain.sys.SysNotice; +import com.shgx.system.domain.SysNotice; /** * 通知公告表 数据层 diff --git a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysOperLogMapper.java b/shgx-system/src/main/java/com/shgx/system/mapper/SysOperLogMapper.java similarity index 91% rename from shgx-system/src/main/java/com/shgx/system/mapper/sys/SysOperLogMapper.java rename to shgx-system/src/main/java/com/shgx/system/mapper/SysOperLogMapper.java index 63795ea..e728c9a 100644 --- a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysOperLogMapper.java +++ b/shgx-system/src/main/java/com/shgx/system/mapper/SysOperLogMapper.java @@ -1,7 +1,7 @@ -package com.shgx.system.mapper.sys; +package com.shgx.system.mapper; import java.util.List; -import com.shgx.system.domain.sys.SysOperLog; +import com.shgx.system.domain.SysOperLog; /** * 操作日志 数据层 diff --git a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysPostMapper.java b/shgx-system/src/main/java/com/shgx/system/mapper/SysPostMapper.java similarity index 96% rename from shgx-system/src/main/java/com/shgx/system/mapper/sys/SysPostMapper.java rename to shgx-system/src/main/java/com/shgx/system/mapper/SysPostMapper.java index 7b22849..bfb508e 100644 --- a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysPostMapper.java +++ b/shgx-system/src/main/java/com/shgx/system/mapper/SysPostMapper.java @@ -1,7 +1,7 @@ -package com.shgx.system.mapper.sys; +package com.shgx.system.mapper; import java.util.List; -import com.shgx.system.domain.sys.SysPost; +import com.shgx.system.domain.SysPost; /** * 岗位信息 数据层 diff --git a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysRoleDeptMapper.java b/shgx-system/src/main/java/com/shgx/system/mapper/SysRoleDeptMapper.java similarity index 91% rename from shgx-system/src/main/java/com/shgx/system/mapper/sys/SysRoleDeptMapper.java rename to shgx-system/src/main/java/com/shgx/system/mapper/SysRoleDeptMapper.java index 2dabb99..814bc25 100644 --- a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysRoleDeptMapper.java +++ b/shgx-system/src/main/java/com/shgx/system/mapper/SysRoleDeptMapper.java @@ -1,7 +1,7 @@ -package com.shgx.system.mapper.sys; +package com.shgx.system.mapper; import java.util.List; -import com.shgx.system.domain.sys.SysRoleDept; +import com.shgx.system.domain.SysRoleDept; /** * 角色与部门关联表 数据层 diff --git a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysRoleMapper.java b/shgx-system/src/main/java/com/shgx/system/mapper/SysRoleMapper.java similarity index 98% rename from shgx-system/src/main/java/com/shgx/system/mapper/sys/SysRoleMapper.java rename to shgx-system/src/main/java/com/shgx/system/mapper/SysRoleMapper.java index 13c2bac..f157662 100644 --- a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysRoleMapper.java +++ b/shgx-system/src/main/java/com/shgx/system/mapper/SysRoleMapper.java @@ -1,4 +1,4 @@ -package com.shgx.system.mapper.sys; +package com.shgx.system.mapper; import java.util.List; import com.shgx.common.core.domain.entity.SysRole; diff --git a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysRoleMenuMapper.java b/shgx-system/src/main/java/com/shgx/system/mapper/SysRoleMenuMapper.java similarity index 90% rename from shgx-system/src/main/java/com/shgx/system/mapper/sys/SysRoleMenuMapper.java rename to shgx-system/src/main/java/com/shgx/system/mapper/SysRoleMenuMapper.java index 9602dbf..def86fc 100644 --- a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysRoleMenuMapper.java +++ b/shgx-system/src/main/java/com/shgx/system/mapper/SysRoleMenuMapper.java @@ -1,7 +1,7 @@ -package com.shgx.system.mapper.sys; +package com.shgx.system.mapper; import java.util.List; -import com.shgx.system.domain.sys.SysRoleMenu; +import com.shgx.system.domain.SysRoleMenu; /** * 角色与菜单关联表 数据层 diff --git a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysUserMapper.java b/shgx-system/src/main/java/com/shgx/system/mapper/SysUserMapper.java similarity index 98% rename from shgx-system/src/main/java/com/shgx/system/mapper/sys/SysUserMapper.java rename to shgx-system/src/main/java/com/shgx/system/mapper/SysUserMapper.java index d1d7fd6..b19a7af 100644 --- a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysUserMapper.java +++ b/shgx-system/src/main/java/com/shgx/system/mapper/SysUserMapper.java @@ -1,4 +1,4 @@ -package com.shgx.system.mapper.sys; +package com.shgx.system.mapper; import java.util.Date; import java.util.List; diff --git a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysUserPostMapper.java b/shgx-system/src/main/java/com/shgx/system/mapper/SysUserPostMapper.java similarity index 91% rename from shgx-system/src/main/java/com/shgx/system/mapper/sys/SysUserPostMapper.java rename to shgx-system/src/main/java/com/shgx/system/mapper/SysUserPostMapper.java index c96ff30..af1ae8f 100644 --- a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysUserPostMapper.java +++ b/shgx-system/src/main/java/com/shgx/system/mapper/SysUserPostMapper.java @@ -1,7 +1,7 @@ -package com.shgx.system.mapper.sys; +package com.shgx.system.mapper; import java.util.List; -import com.shgx.system.domain.sys.SysUserPost; +import com.shgx.system.domain.SysUserPost; /** * 用户与岗位关联表 数据层 diff --git a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysUserRoleMapper.java b/shgx-system/src/main/java/com/shgx/system/mapper/SysUserRoleMapper.java similarity index 94% rename from shgx-system/src/main/java/com/shgx/system/mapper/sys/SysUserRoleMapper.java rename to shgx-system/src/main/java/com/shgx/system/mapper/SysUserRoleMapper.java index 507b8eb..2d966e0 100644 --- a/shgx-system/src/main/java/com/shgx/system/mapper/sys/SysUserRoleMapper.java +++ b/shgx-system/src/main/java/com/shgx/system/mapper/SysUserRoleMapper.java @@ -1,8 +1,8 @@ -package com.shgx.system.mapper.sys; +package com.shgx.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.shgx.system.domain.sys.SysUserRole; +import com.shgx.system.domain.SysUserRole; /** * 用户与角色关联表 数据层 diff --git a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysConfigService.java b/shgx-system/src/main/java/com/shgx/system/service/ISysConfigService.java similarity index 95% rename from shgx-system/src/main/java/com/shgx/system/service/sys/ISysConfigService.java rename to shgx-system/src/main/java/com/shgx/system/service/ISysConfigService.java index a84fb42..a305288 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysConfigService.java +++ b/shgx-system/src/main/java/com/shgx/system/service/ISysConfigService.java @@ -1,7 +1,7 @@ -package com.shgx.system.service.sys; +package com.shgx.system.service; import java.util.List; -import com.shgx.system.domain.sys.SysConfig; +import com.shgx.system.domain.SysConfig; /** * 参数配置 服务层 diff --git a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysDeptService.java b/shgx-system/src/main/java/com/shgx/system/service/ISysDeptService.java similarity index 98% rename from shgx-system/src/main/java/com/shgx/system/service/sys/ISysDeptService.java rename to shgx-system/src/main/java/com/shgx/system/service/ISysDeptService.java index af6a6a6..6038cd5 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysDeptService.java +++ b/shgx-system/src/main/java/com/shgx/system/service/ISysDeptService.java @@ -1,4 +1,4 @@ -package com.shgx.system.service.sys; +package com.shgx.system.service; import java.util.List; import com.shgx.common.core.domain.TreeSelect; diff --git a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysDictDataService.java b/shgx-system/src/main/java/com/shgx/system/service/ISysDictDataService.java similarity index 97% rename from shgx-system/src/main/java/com/shgx/system/service/sys/ISysDictDataService.java rename to shgx-system/src/main/java/com/shgx/system/service/ISysDictDataService.java index 2966c9b..77ce79e 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysDictDataService.java +++ b/shgx-system/src/main/java/com/shgx/system/service/ISysDictDataService.java @@ -1,4 +1,4 @@ -package com.shgx.system.service.sys; +package com.shgx.system.service; import java.util.List; import com.shgx.common.core.domain.entity.SysDictData; diff --git a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysDictTypeService.java b/shgx-system/src/main/java/com/shgx/system/service/ISysDictTypeService.java similarity index 98% rename from shgx-system/src/main/java/com/shgx/system/service/sys/ISysDictTypeService.java rename to shgx-system/src/main/java/com/shgx/system/service/ISysDictTypeService.java index e4b2291..4623c18 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysDictTypeService.java +++ b/shgx-system/src/main/java/com/shgx/system/service/ISysDictTypeService.java @@ -1,4 +1,4 @@ -package com.shgx.system.service.sys; +package com.shgx.system.service; import java.util.List; import com.shgx.common.core.domain.entity.SysDictData; diff --git a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysLogininforService.java b/shgx-system/src/main/java/com/shgx/system/service/ISysLogininforService.java similarity index 90% rename from shgx-system/src/main/java/com/shgx/system/service/sys/ISysLogininforService.java rename to shgx-system/src/main/java/com/shgx/system/service/ISysLogininforService.java index af2b93b..79c9014 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysLogininforService.java +++ b/shgx-system/src/main/java/com/shgx/system/service/ISysLogininforService.java @@ -1,7 +1,7 @@ -package com.shgx.system.service.sys; +package com.shgx.system.service; import java.util.List; -import com.shgx.system.domain.sys.SysLogininfor; +import com.shgx.system.domain.SysLogininfor; /** * 系统访问日志情况信息 服务层 diff --git a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysMenuService.java b/shgx-system/src/main/java/com/shgx/system/service/ISysMenuService.java similarity index 98% rename from shgx-system/src/main/java/com/shgx/system/service/sys/ISysMenuService.java rename to shgx-system/src/main/java/com/shgx/system/service/ISysMenuService.java index 58fcf13..ae96cd4 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysMenuService.java +++ b/shgx-system/src/main/java/com/shgx/system/service/ISysMenuService.java @@ -1,4 +1,4 @@ -package com.shgx.system.service.sys; +package com.shgx.system.service; import java.util.List; import java.util.Set; diff --git a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysNoticeService.java b/shgx-system/src/main/java/com/shgx/system/service/ISysNoticeService.java similarity index 92% rename from shgx-system/src/main/java/com/shgx/system/service/sys/ISysNoticeService.java rename to shgx-system/src/main/java/com/shgx/system/service/ISysNoticeService.java index 40a1e68..caddd17 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysNoticeService.java +++ b/shgx-system/src/main/java/com/shgx/system/service/ISysNoticeService.java @@ -1,7 +1,7 @@ -package com.shgx.system.service.sys; +package com.shgx.system.service; import java.util.List; -import com.shgx.system.domain.sys.SysNotice; +import com.shgx.system.domain.SysNotice; /** * 公告 服务层 diff --git a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysOperLogService.java b/shgx-system/src/main/java/com/shgx/system/service/ISysOperLogService.java similarity index 91% rename from shgx-system/src/main/java/com/shgx/system/service/sys/ISysOperLogService.java rename to shgx-system/src/main/java/com/shgx/system/service/ISysOperLogService.java index 6aa2795..bcccf70 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysOperLogService.java +++ b/shgx-system/src/main/java/com/shgx/system/service/ISysOperLogService.java @@ -1,7 +1,7 @@ -package com.shgx.system.service.sys; +package com.shgx.system.service; import java.util.List; -import com.shgx.system.domain.sys.SysOperLog; +import com.shgx.system.domain.SysOperLog; /** * 操作日志 服务层 diff --git a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysPostService.java b/shgx-system/src/main/java/com/shgx/system/service/ISysPostService.java similarity index 95% rename from shgx-system/src/main/java/com/shgx/system/service/sys/ISysPostService.java rename to shgx-system/src/main/java/com/shgx/system/service/ISysPostService.java index 0de31c9..6503ef3 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysPostService.java +++ b/shgx-system/src/main/java/com/shgx/system/service/ISysPostService.java @@ -1,7 +1,7 @@ -package com.shgx.system.service.sys; +package com.shgx.system.service; import java.util.List; -import com.shgx.system.domain.sys.SysPost; +import com.shgx.system.domain.SysPost; /** * 岗位信息 服务层 diff --git a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysRoleService.java b/shgx-system/src/main/java/com/shgx/system/service/ISysRoleService.java similarity index 97% rename from shgx-system/src/main/java/com/shgx/system/service/sys/ISysRoleService.java rename to shgx-system/src/main/java/com/shgx/system/service/ISysRoleService.java index 36af946..812360f 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysRoleService.java +++ b/shgx-system/src/main/java/com/shgx/system/service/ISysRoleService.java @@ -1,9 +1,9 @@ -package com.shgx.system.service.sys; +package com.shgx.system.service; import java.util.List; import java.util.Set; import com.shgx.common.core.domain.entity.SysRole; -import com.shgx.system.domain.sys.SysUserRole; +import com.shgx.system.domain.SysUserRole; /** * 角色业务层 diff --git a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysUserOnlineService.java b/shgx-system/src/main/java/com/shgx/system/service/ISysUserOnlineService.java similarity index 92% rename from shgx-system/src/main/java/com/shgx/system/service/sys/ISysUserOnlineService.java rename to shgx-system/src/main/java/com/shgx/system/service/ISysUserOnlineService.java index 62ba5ab..d598ef6 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysUserOnlineService.java +++ b/shgx-system/src/main/java/com/shgx/system/service/ISysUserOnlineService.java @@ -1,7 +1,7 @@ -package com.shgx.system.service.sys; +package com.shgx.system.service; import com.shgx.common.core.domain.model.LoginUser; -import com.shgx.system.domain.sys.SysUserOnline; +import com.shgx.system.domain.SysUserOnline; /** * 在线用户 服务层 diff --git a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysUserService.java b/shgx-system/src/main/java/com/shgx/system/service/ISysUserService.java similarity index 99% rename from shgx-system/src/main/java/com/shgx/system/service/sys/ISysUserService.java rename to shgx-system/src/main/java/com/shgx/system/service/ISysUserService.java index 907ee74..2d29b06 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/sys/ISysUserService.java +++ b/shgx-system/src/main/java/com/shgx/system/service/ISysUserService.java @@ -1,4 +1,4 @@ -package com.shgx.system.service.sys; +package com.shgx.system.service; import java.util.Date; import java.util.List; diff --git a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysConfigServiceImpl.java b/shgx-system/src/main/java/com/shgx/system/service/impl/SysConfigServiceImpl.java similarity index 96% rename from shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysConfigServiceImpl.java rename to shgx-system/src/main/java/com/shgx/system/service/impl/SysConfigServiceImpl.java index 410bd91..ddda2ca 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysConfigServiceImpl.java +++ b/shgx-system/src/main/java/com/shgx/system/service/impl/SysConfigServiceImpl.java @@ -1,4 +1,4 @@ -package com.shgx.system.service.impl.sys; +package com.shgx.system.service.impl; import java.util.Collection; import java.util.List; @@ -13,9 +13,9 @@ import com.shgx.common.core.text.Convert; import com.shgx.common.enums.DataSourceType; import com.shgx.common.exception.ServiceException; import com.shgx.common.utils.StringUtils; -import com.shgx.system.domain.sys.SysConfig; -import com.shgx.system.mapper.sys.SysConfigMapper; -import com.shgx.system.service.sys.ISysConfigService; +import com.shgx.system.domain.SysConfig; +import com.shgx.system.mapper.SysConfigMapper; +import com.shgx.system.service.ISysConfigService; /** * 参数配置 服务层实现 diff --git a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysDeptServiceImpl.java b/shgx-system/src/main/java/com/shgx/system/service/impl/SysDeptServiceImpl.java similarity index 97% rename from shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysDeptServiceImpl.java rename to shgx-system/src/main/java/com/shgx/system/service/impl/SysDeptServiceImpl.java index 8406b40..91e2b4d 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysDeptServiceImpl.java +++ b/shgx-system/src/main/java/com/shgx/system/service/impl/SysDeptServiceImpl.java @@ -1,4 +1,4 @@ -package com.shgx.system.service.impl.sys; +package com.shgx.system.service.impl; import java.util.ArrayList; import java.util.Iterator; @@ -17,9 +17,9 @@ import com.shgx.common.exception.ServiceException; import com.shgx.common.utils.SecurityUtils; import com.shgx.common.utils.StringUtils; import com.shgx.common.utils.spring.SpringUtils; -import com.shgx.system.mapper.sys.SysDeptMapper; -import com.shgx.system.mapper.sys.SysRoleMapper; -import com.shgx.system.service.sys.ISysDeptService; +import com.shgx.system.mapper.SysDeptMapper; +import com.shgx.system.mapper.SysRoleMapper; +import com.shgx.system.service.ISysDeptService; /** * 部门管理 服务实现 diff --git a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysDictDataServiceImpl.java b/shgx-system/src/main/java/com/shgx/system/service/impl/SysDictDataServiceImpl.java similarity index 94% rename from shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysDictDataServiceImpl.java rename to shgx-system/src/main/java/com/shgx/system/service/impl/SysDictDataServiceImpl.java index 89a8620..9c8e0fb 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysDictDataServiceImpl.java +++ b/shgx-system/src/main/java/com/shgx/system/service/impl/SysDictDataServiceImpl.java @@ -1,12 +1,12 @@ -package com.shgx.system.service.impl.sys; +package com.shgx.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.shgx.common.core.domain.entity.SysDictData; import com.shgx.common.utils.DictUtils; -import com.shgx.system.mapper.sys.SysDictDataMapper; -import com.shgx.system.service.sys.ISysDictDataService; +import com.shgx.system.mapper.SysDictDataMapper; +import com.shgx.system.service.ISysDictDataService; /** * 字典 业务层处理 diff --git a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysDictTypeServiceImpl.java b/shgx-system/src/main/java/com/shgx/system/service/impl/SysDictTypeServiceImpl.java similarity index 96% rename from shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysDictTypeServiceImpl.java rename to shgx-system/src/main/java/com/shgx/system/service/impl/SysDictTypeServiceImpl.java index a8eb4ec..be2150f 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysDictTypeServiceImpl.java +++ b/shgx-system/src/main/java/com/shgx/system/service/impl/SysDictTypeServiceImpl.java @@ -1,4 +1,4 @@ -package com.shgx.system.service.impl.sys; +package com.shgx.system.service.impl; import java.util.Comparator; import java.util.List; @@ -14,9 +14,9 @@ import com.shgx.common.core.domain.entity.SysDictType; import com.shgx.common.exception.ServiceException; import com.shgx.common.utils.DictUtils; import com.shgx.common.utils.StringUtils; -import com.shgx.system.mapper.sys.SysDictDataMapper; -import com.shgx.system.mapper.sys.SysDictTypeMapper; -import com.shgx.system.service.sys.ISysDictTypeService; +import com.shgx.system.mapper.SysDictDataMapper; +import com.shgx.system.mapper.SysDictTypeMapper; +import com.shgx.system.service.ISysDictTypeService; /** * 字典 业务层处理 diff --git a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysLogininforServiceImpl.java b/shgx-system/src/main/java/com/shgx/system/service/impl/SysLogininforServiceImpl.java similarity index 86% rename from shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysLogininforServiceImpl.java rename to shgx-system/src/main/java/com/shgx/system/service/impl/SysLogininforServiceImpl.java index 748eafd..47a1604 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysLogininforServiceImpl.java +++ b/shgx-system/src/main/java/com/shgx/system/service/impl/SysLogininforServiceImpl.java @@ -1,11 +1,11 @@ -package com.shgx.system.service.impl.sys; +package com.shgx.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.shgx.system.domain.sys.SysLogininfor; -import com.shgx.system.mapper.sys.SysLogininforMapper; -import com.shgx.system.service.sys.ISysLogininforService; +import com.shgx.system.domain.SysLogininfor; +import com.shgx.system.mapper.SysLogininforMapper; +import com.shgx.system.service.ISysLogininforService; /** * 系统访问日志情况信息 服务层处理 diff --git a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysMenuServiceImpl.java b/shgx-system/src/main/java/com/shgx/system/service/impl/SysMenuServiceImpl.java similarity index 98% rename from shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysMenuServiceImpl.java rename to shgx-system/src/main/java/com/shgx/system/service/impl/SysMenuServiceImpl.java index 173e4cf..3b5324d 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysMenuServiceImpl.java +++ b/shgx-system/src/main/java/com/shgx/system/service/impl/SysMenuServiceImpl.java @@ -1,4 +1,4 @@ -package com.shgx.system.service.impl.sys; +package com.shgx.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -20,10 +20,10 @@ import com.shgx.common.utils.SecurityUtils; import com.shgx.common.utils.StringUtils; import com.shgx.system.domain.vo.MetaVo; import com.shgx.system.domain.vo.RouterVo; -import com.shgx.system.mapper.sys.SysMenuMapper; -import com.shgx.system.mapper.sys.SysRoleMapper; -import com.shgx.system.mapper.sys.SysRoleMenuMapper; -import com.shgx.system.service.sys.ISysMenuService; +import com.shgx.system.mapper.SysMenuMapper; +import com.shgx.system.mapper.SysRoleMapper; +import com.shgx.system.mapper.SysRoleMenuMapper; +import com.shgx.system.service.ISysMenuService; /** * 菜单 业务层处理 diff --git a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysNoticeServiceImpl.java b/shgx-system/src/main/java/com/shgx/system/service/impl/SysNoticeServiceImpl.java similarity index 90% rename from shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysNoticeServiceImpl.java rename to shgx-system/src/main/java/com/shgx/system/service/impl/SysNoticeServiceImpl.java index dcb2217..60d304f 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysNoticeServiceImpl.java +++ b/shgx-system/src/main/java/com/shgx/system/service/impl/SysNoticeServiceImpl.java @@ -1,11 +1,11 @@ -package com.shgx.system.service.impl.sys; +package com.shgx.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.shgx.system.domain.sys.SysNotice; -import com.shgx.system.mapper.sys.SysNoticeMapper; -import com.shgx.system.service.sys.ISysNoticeService; +import com.shgx.system.domain.SysNotice; +import com.shgx.system.mapper.SysNoticeMapper; +import com.shgx.system.service.ISysNoticeService; /** * 公告 服务层实现 diff --git a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysOperLogServiceImpl.java b/shgx-system/src/main/java/com/shgx/system/service/impl/SysOperLogServiceImpl.java similarity index 88% rename from shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysOperLogServiceImpl.java rename to shgx-system/src/main/java/com/shgx/system/service/impl/SysOperLogServiceImpl.java index 52e8d0a..dfcf3aa 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysOperLogServiceImpl.java +++ b/shgx-system/src/main/java/com/shgx/system/service/impl/SysOperLogServiceImpl.java @@ -1,11 +1,11 @@ -package com.shgx.system.service.impl.sys; +package com.shgx.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.shgx.system.domain.sys.SysOperLog; -import com.shgx.system.mapper.sys.SysOperLogMapper; -import com.shgx.system.service.sys.ISysOperLogService; +import com.shgx.system.domain.SysOperLog; +import com.shgx.system.mapper.SysOperLogMapper; +import com.shgx.system.service.ISysOperLogService; /** * 操作日志 服务层处理 diff --git a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysPostServiceImpl.java b/shgx-system/src/main/java/com/shgx/system/service/impl/SysPostServiceImpl.java similarity index 94% rename from shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysPostServiceImpl.java rename to shgx-system/src/main/java/com/shgx/system/service/impl/SysPostServiceImpl.java index 6744664..5bad379 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysPostServiceImpl.java +++ b/shgx-system/src/main/java/com/shgx/system/service/impl/SysPostServiceImpl.java @@ -1,4 +1,4 @@ -package com.shgx.system.service.impl.sys; +package com.shgx.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -6,10 +6,10 @@ import org.springframework.stereotype.Service; import com.shgx.common.constant.UserConstants; import com.shgx.common.exception.ServiceException; import com.shgx.common.utils.StringUtils; -import com.shgx.system.domain.sys.SysPost; -import com.shgx.system.mapper.sys.SysPostMapper; -import com.shgx.system.mapper.sys.SysUserPostMapper; -import com.shgx.system.service.sys.ISysPostService; +import com.shgx.system.domain.SysPost; +import com.shgx.system.mapper.SysPostMapper; +import com.shgx.system.mapper.SysUserPostMapper; +import com.shgx.system.service.ISysPostService; /** * 岗位信息 服务层处理 diff --git a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysRoleServiceImpl.java b/shgx-system/src/main/java/com/shgx/system/service/impl/SysRoleServiceImpl.java similarity index 96% rename from shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysRoleServiceImpl.java rename to shgx-system/src/main/java/com/shgx/system/service/impl/SysRoleServiceImpl.java index 7c2a065..3bf58b8 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysRoleServiceImpl.java +++ b/shgx-system/src/main/java/com/shgx/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package com.shgx.system.service.impl.sys; +package com.shgx.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -16,14 +16,14 @@ import com.shgx.common.exception.ServiceException; import com.shgx.common.utils.SecurityUtils; import com.shgx.common.utils.StringUtils; import com.shgx.common.utils.spring.SpringUtils; -import com.shgx.system.domain.sys.SysRoleDept; -import com.shgx.system.domain.sys.SysRoleMenu; -import com.shgx.system.domain.sys.SysUserRole; -import com.shgx.system.mapper.sys.SysRoleDeptMapper; -import com.shgx.system.mapper.sys.SysRoleMapper; -import com.shgx.system.mapper.sys.SysRoleMenuMapper; -import com.shgx.system.mapper.sys.SysUserRoleMapper; -import com.shgx.system.service.sys.ISysRoleService; +import com.shgx.system.domain.SysRoleDept; +import com.shgx.system.domain.SysRoleMenu; +import com.shgx.system.domain.SysUserRole; +import com.shgx.system.mapper.SysRoleDeptMapper; +import com.shgx.system.mapper.SysRoleMapper; +import com.shgx.system.mapper.SysRoleMenuMapper; +import com.shgx.system.mapper.SysUserRoleMapper; +import com.shgx.system.service.ISysRoleService; /** * 角色 业务层处理 diff --git a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysUserOnlineServiceImpl.java b/shgx-system/src/main/java/com/shgx/system/service/impl/SysUserOnlineServiceImpl.java similarity index 94% rename from shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysUserOnlineServiceImpl.java rename to shgx-system/src/main/java/com/shgx/system/service/impl/SysUserOnlineServiceImpl.java index d6320b9..01d326c 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysUserOnlineServiceImpl.java +++ b/shgx-system/src/main/java/com/shgx/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,10 +1,10 @@ -package com.shgx.system.service.impl.sys; +package com.shgx.system.service.impl; import org.springframework.stereotype.Service; import com.shgx.common.core.domain.model.LoginUser; import com.shgx.common.utils.StringUtils; -import com.shgx.system.domain.sys.SysUserOnline; -import com.shgx.system.service.sys.ISysUserOnlineService; +import com.shgx.system.domain.SysUserOnline; +import com.shgx.system.service.ISysUserOnlineService; /** * 在线用户 服务层处理 diff --git a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysUserServiceImpl.java b/shgx-system/src/main/java/com/shgx/system/service/impl/SysUserServiceImpl.java similarity index 96% rename from shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysUserServiceImpl.java rename to shgx-system/src/main/java/com/shgx/system/service/impl/SysUserServiceImpl.java index ac61ebd..44f5f9e 100644 --- a/shgx-system/src/main/java/com/shgx/system/service/impl/sys/SysUserServiceImpl.java +++ b/shgx-system/src/main/java/com/shgx/system/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.shgx.system.service.impl.sys; +package com.shgx.system.service.impl; import java.util.ArrayList; import java.util.Date; @@ -20,17 +20,17 @@ import com.shgx.common.utils.SecurityUtils; import com.shgx.common.utils.StringUtils; import com.shgx.common.utils.bean.BeanValidators; import com.shgx.common.utils.spring.SpringUtils; -import com.shgx.system.domain.sys.SysPost; -import com.shgx.system.domain.sys.SysUserPost; -import com.shgx.system.domain.sys.SysUserRole; -import com.shgx.system.mapper.sys.SysPostMapper; -import com.shgx.system.mapper.sys.SysRoleMapper; -import com.shgx.system.mapper.sys.SysUserMapper; -import com.shgx.system.mapper.sys.SysUserPostMapper; -import com.shgx.system.mapper.sys.SysUserRoleMapper; -import com.shgx.system.service.sys.ISysConfigService; -import com.shgx.system.service.sys.ISysDeptService; -import com.shgx.system.service.sys.ISysUserService; +import com.shgx.system.domain.SysPost; +import com.shgx.system.domain.SysUserPost; +import com.shgx.system.domain.SysUserRole; +import com.shgx.system.mapper.SysPostMapper; +import com.shgx.system.mapper.SysRoleMapper; +import com.shgx.system.mapper.SysUserMapper; +import com.shgx.system.mapper.SysUserPostMapper; +import com.shgx.system.mapper.SysUserRoleMapper; +import com.shgx.system.service.ISysConfigService; +import com.shgx.system.service.ISysDeptService; +import com.shgx.system.service.ISysUserService; /** * 用户 业务层处理 diff --git a/shgx-system/src/main/resources/mapper/system/sys/SysConfigMapper.xml b/shgx-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 98% rename from shgx-system/src/main/resources/mapper/system/sys/SysConfigMapper.xml rename to shgx-system/src/main/resources/mapper/system/SysConfigMapper.xml index 7bdd23c..dca529a 100644 --- a/shgx-system/src/main/resources/mapper/system/sys/SysConfigMapper.xml +++ b/shgx-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/shgx-system/src/main/resources/mapper/system/sys/SysDeptMapper.xml b/shgx-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 99% rename from shgx-system/src/main/resources/mapper/system/sys/SysDeptMapper.xml rename to shgx-system/src/main/resources/mapper/system/SysDeptMapper.xml index 0c6ea71..c2566c9 100644 --- a/shgx-system/src/main/resources/mapper/system/sys/SysDeptMapper.xml +++ b/shgx-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/shgx-system/src/main/resources/mapper/system/sys/SysDictDataMapper.xml b/shgx-system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 98% rename from shgx-system/src/main/resources/mapper/system/sys/SysDictDataMapper.xml rename to shgx-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 6e374ac..9250c37 100644 --- a/shgx-system/src/main/resources/mapper/system/sys/SysDictDataMapper.xml +++ b/shgx-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/shgx-system/src/main/resources/mapper/system/sys/SysDictTypeMapper.xml b/shgx-system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 98% rename from shgx-system/src/main/resources/mapper/system/sys/SysDictTypeMapper.xml rename to shgx-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index bef8c7f..bbf9077 100644 --- a/shgx-system/src/main/resources/mapper/system/sys/SysDictTypeMapper.xml +++ b/shgx-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/shgx-system/src/main/resources/mapper/system/sys/SysLogininforMapper.xml b/shgx-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 97% rename from shgx-system/src/main/resources/mapper/system/sys/SysLogininforMapper.xml rename to shgx-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 43775e7..fc6ee02 100644 --- a/shgx-system/src/main/resources/mapper/system/sys/SysLogininforMapper.xml +++ b/shgx-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/shgx-system/src/main/resources/mapper/system/sys/SysMenuMapper.xml b/shgx-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 99% rename from shgx-system/src/main/resources/mapper/system/sys/SysMenuMapper.xml rename to shgx-system/src/main/resources/mapper/system/SysMenuMapper.xml index 1ce0e7d..e2d70d8 100644 --- a/shgx-system/src/main/resources/mapper/system/sys/SysMenuMapper.xml +++ b/shgx-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/shgx-system/src/main/resources/mapper/system/sys/SysNoticeMapper.xml b/shgx-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 98% rename from shgx-system/src/main/resources/mapper/system/sys/SysNoticeMapper.xml rename to shgx-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 9f2a296..3f2d988 100644 --- a/shgx-system/src/main/resources/mapper/system/sys/SysNoticeMapper.xml +++ b/shgx-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/shgx-system/src/main/resources/mapper/system/sys/SysOperLogMapper.xml b/shgx-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 98% rename from shgx-system/src/main/resources/mapper/system/sys/SysOperLogMapper.xml rename to shgx-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 8c2e76d..2573145 100644 --- a/shgx-system/src/main/resources/mapper/system/sys/SysOperLogMapper.xml +++ b/shgx-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/shgx-system/src/main/resources/mapper/system/sys/SysPostMapper.xml b/shgx-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 98% rename from shgx-system/src/main/resources/mapper/system/sys/SysPostMapper.xml rename to shgx-system/src/main/resources/mapper/system/SysPostMapper.xml index 66a9d58..6ff0229 100644 --- a/shgx-system/src/main/resources/mapper/system/sys/SysPostMapper.xml +++ b/shgx-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/shgx-system/src/main/resources/mapper/system/sys/SysRoleDeptMapper.xml b/shgx-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 94% rename from shgx-system/src/main/resources/mapper/system/sys/SysRoleDeptMapper.xml rename to shgx-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml index b9d1de3..c21a2cf 100644 --- a/shgx-system/src/main/resources/mapper/system/sys/SysRoleDeptMapper.xml +++ b/shgx-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/shgx-system/src/main/resources/mapper/system/sys/SysRoleMapper.xml b/shgx-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 99% rename from shgx-system/src/main/resources/mapper/system/sys/SysRoleMapper.xml rename to shgx-system/src/main/resources/mapper/system/SysRoleMapper.xml index 2c8da26..0da9734 100644 --- a/shgx-system/src/main/resources/mapper/system/sys/SysRoleMapper.xml +++ b/shgx-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/shgx-system/src/main/resources/mapper/system/sys/SysRoleMenuMapper.xml b/shgx-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 94% rename from shgx-system/src/main/resources/mapper/system/sys/SysRoleMenuMapper.xml rename to shgx-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index 7594260..708f9b0 100644 --- a/shgx-system/src/main/resources/mapper/system/sys/SysRoleMenuMapper.xml +++ b/shgx-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/shgx-system/src/main/resources/mapper/system/sys/SysUserMapper.xml b/shgx-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 99% rename from shgx-system/src/main/resources/mapper/system/sys/SysUserMapper.xml rename to shgx-system/src/main/resources/mapper/system/SysUserMapper.xml index 6d3b98c..b00276d 100644 --- a/shgx-system/src/main/resources/mapper/system/sys/SysUserMapper.xml +++ b/shgx-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/shgx-system/src/main/resources/mapper/system/sys/SysUserPostMapper.xml b/shgx-system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 94% rename from shgx-system/src/main/resources/mapper/system/sys/SysUserPostMapper.xml rename to shgx-system/src/main/resources/mapper/system/SysUserPostMapper.xml index ad5c2b4..022c949 100644 --- a/shgx-system/src/main/resources/mapper/system/sys/SysUserPostMapper.xml +++ b/shgx-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/shgx-system/src/main/resources/mapper/system/sys/SysUserRoleMapper.xml b/shgx-system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 95% rename from shgx-system/src/main/resources/mapper/system/sys/SysUserRoleMapper.xml rename to shgx-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index 88d2991..58760a8 100644 --- a/shgx-system/src/main/resources/mapper/system/sys/SysUserRoleMapper.xml +++ b/shgx-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/shgx-system/src/main/resources/mapper/system/mold/MoldInfoMapper.xml b/shgx-system/src/main/resources/mapper/system/mold/MoldInfoMapper.xml deleted file mode 100644 index 0642609..0000000 --- a/shgx-system/src/main/resources/mapper/system/mold/MoldInfoMapper.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - select mold_id, mold_code, mold_name, product_code, product_name, specification, material, design_life, use_life, mold_type, manufacturer, production_date, status, create_by, create_time, update_by, update_time, remark from mold_info - - - - - - - - insert into mold_info - - mold_code, - mold_name, - product_code, - product_name, - specification, - material, - design_life, - use_life, - mold_type, - manufacturer, - production_date, - status, - create_by, - create_time, - update_by, - update_time, - remark, - - - #{moldCode}, - #{moldName}, - #{productCode}, - #{productName}, - #{specification}, - #{material}, - #{designLife}, - #{useLife}, - #{moldType}, - #{manufacturer}, - #{productionDate}, - #{status}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - - update mold_info - - mold_code = #{moldCode}, - mold_name = #{moldName}, - product_code = #{productCode}, - product_name = #{productName}, - specification = #{specification}, - material = #{material}, - design_life = #{designLife}, - use_life = #{useLife}, - mold_type = #{moldType}, - manufacturer = #{manufacturer}, - production_date = #{productionDate}, - status = #{status}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where mold_id = #{moldId} - - - - delete from mold_info where mold_id = #{moldId} - - - - delete from mold_info where mold_id in - - #{moldId} - - - \ No newline at end of file diff --git a/shgx-system/src/main/resources/mapper/system/mold/MoldInventoryChangeLogMapper.xml b/shgx-system/src/main/resources/mapper/system/mold/MoldInventoryChangeLogMapper.xml deleted file mode 100644 index 5e9e27b..0000000 --- a/shgx-system/src/main/resources/mapper/system/mold/MoldInventoryChangeLogMapper.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - select change_id, injection_machine_code, mold_code, change_type, change_time, from_location, to_location, create_by, create_time, update_by, update_time, remark from mold_inventory_change_log - - - - - - - - insert into mold_inventory_change_log - - injection_machine_code, - mold_code, - change_type, - change_time, - from_location, - to_location, - create_by, - create_time, - update_by, - update_time, - remark, - - - #{injectionMachineCode}, - #{moldCode}, - #{changeType}, - #{changeTime}, - #{fromLocation}, - #{toLocation}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - - update mold_inventory_change_log - - injection_machine_code = #{injectionMachineCode}, - mold_code = #{moldCode}, - change_type = #{changeType}, - change_time = #{changeTime}, - from_location = #{fromLocation}, - to_location = #{toLocation}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where change_id = #{changeId} - - - - delete from mold_inventory_change_log where change_id = #{changeId} - - - - delete from mold_inventory_change_log where change_id in - - #{changeId} - - - \ No newline at end of file diff --git a/shgx-system/src/main/resources/mapper/system/mold/MoldStatusLogMapper.xml b/shgx-system/src/main/resources/mapper/system/mold/MoldStatusLogMapper.xml deleted file mode 100644 index b42310e..0000000 --- a/shgx-system/src/main/resources/mapper/system/mold/MoldStatusLogMapper.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - select id, mold_code, status, change_time, remark from mold_status_log - - - - - - - - insert into mold_status_log - - id, - mold_code, - status, - change_time, - remark, - - - #{id}, - #{moldCode}, - #{status}, - #{changeTime}, - #{remark}, - - - - - update mold_status_log - - mold_code = #{moldCode}, - status = #{status}, - change_time = #{changeTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from mold_status_log where id = #{id} - - - - delete from mold_status_log where id in - - #{id} - - - \ No newline at end of file diff --git a/shgx-system/src/main/resources/mapper/system/mold/MoldWarehouseLocationLiveMapper.xml b/shgx-system/src/main/resources/mapper/system/mold/MoldWarehouseLocationLiveMapper.xml deleted file mode 100644 index b25ca52..0000000 --- a/shgx-system/src/main/resources/mapper/system/mold/MoldWarehouseLocationLiveMapper.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - select id, mold_code, mold_name, warehouse_code, position_code, status, create_by, create_time, update_by, update_time, remark from mold_warehouse_location_live - - - - - - - - insert into mold_warehouse_location_live - - id, - mold_code, - mold_name, - warehouse_code, - position_code, - status, - create_by, - create_time, - update_by, - update_time, - remark, - - - #{id}, - #{moldCode}, - #{moldName}, - #{warehouseCode}, - #{positionCode}, - #{status}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - - update mold_warehouse_location_live - - mold_code = #{moldCode}, - mold_name = #{moldName}, - warehouse_code = #{warehouseCode}, - position_code = #{positionCode}, - status = #{status}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from mold_warehouse_location_live where id = #{id} - - - - delete from mold_warehouse_location_live where id in - - #{id} - - - \ No newline at end of file diff --git a/shgx-system/src/main/resources/mapper/system/mold/MoldWarehouseLocationMapper.xml b/shgx-system/src/main/resources/mapper/system/mold/MoldWarehouseLocationMapper.xml deleted file mode 100644 index 82a6af8..0000000 --- a/shgx-system/src/main/resources/mapper/system/mold/MoldWarehouseLocationMapper.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - select location_id, warehouse_code, shelf_layer, position_code, location_status, capacity, current_quantity, create_time, update_by, update_time, remark from mold_warehouse_location - - - - - - - - insert into mold_warehouse_location - - warehouse_code, - shelf_layer, - position_code, - location_status, - capacity, - current_quantity, - create_time, - update_by, - update_time, - remark, - - - #{warehouseCode}, - #{shelfLayer}, - #{positionCode}, - #{locationStatus}, - #{capacity}, - #{currentQuantity}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - - update mold_warehouse_location - - warehouse_code = #{warehouseCode}, - shelf_layer = #{shelfLayer}, - position_code = #{positionCode}, - location_status = #{locationStatus}, - capacity = #{capacity}, - current_quantity = #{currentQuantity}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where location_id = #{locationId} - - - - delete from mold_warehouse_location where location_id = #{locationId} - - - - delete from mold_warehouse_location where location_id in - - #{locationId} - - - \ No newline at end of file