From a9780c49f8cf587af26cc83d439320ad02b8668f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 15 Oct 2025 09:17:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-system/src/main/java/com/ard/system/noflyzone/domain/ArdNoFlyZone.java | 2
ard-system/src/main/java/com/ard/system/system/mapper/SysDictTypeMapper.java | 2
ard-framework/src/main/java/com/ard/framework/manager/factory/AsyncFactory.java | 8
ard-system/src/main/java/com/ard/system/system/service/ISysLogininforService.java | 4
ard-admin/src/main/java/com/ard/web/controller/data/ArdNoFlyZoneController.java | 6
ard-admin/src/main/java/com/ard/web/controller/system/SysDeptController.java | 2
ard-system/src/main/java/com/ard/system/data/domain/ArdModelManagement.java | 2
ard-work/src/main/java/com/ard/work/component/forest/MyAddressSource.java | 2
ard-system/src/main/java/com/ard/system/system/domain/SysLogininfor.java | 2
ard-system/src/main/resources/mapper/system/SysUserPostMapper.xml | 2
ard-admin/src/main/java/com/ard/web/controller/common/CaptchaController.java | 2
ard-system/src/main/java/com/ard/system/system/domain/SysRoleDept.java | 2
ard-system/src/main/java/com/ard/system/system/service/impl/SysOperLogServiceImpl.java | 8
ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java | 2
ard-system/src/main/resources/mapper/system/SysMenuMapper.xml | 2
ard-system/src/main/resources/mapper/system/SysLogininforMapper.xml | 2
ard-system/src/main/java/com/ard/system/system/vo/MetaVo.java | 2
ard-system/src/main/java/com/ard/system/system/service/ISysNoticeService.java | 4
ard-admin/src/main/java/com/ard/web/controller/system/SysNoticeController.java | 4
ard-system/src/main/java/com/ard/system/data/domain/ArdTileManagement.java | 2
ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysDictTypeController.java | 2
ard-system/src/main/java/com/ard/system/authorize/service/AuthorizeService.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysUserController.java | 8
ard-system/src/main/java/com/ard/system/noflyzone/mapper/ArdNoFlyZoneMapper.java | 4
ard-framework/src/main/java/com/ard/framework/web/service/SysRegisterService.java | 4
ard-system/src/main/resources/mapper/system/SysUserRoleMapper.xml | 2
ard-system/src/main/java/com/ard/system/system/mapper/SysPostMapper.java | 4
ard-system/src/main/java/com/ard/system/system/mapper/SysRoleMenuMapper.java | 4
ard-system/src/main/java/com/ard/system/system/service/impl/SysDictDataServiceImpl.java | 6
ard-system/src/main/java/com/ard/system/system/mapper/SysRoleDeptMapper.java | 4
ard-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml | 2
ard-system/src/main/java/com/ard/system/noflyzone/service/IArdNoFlyZoneService.java | 4
ard-system/src/main/java/com/ard/system/data/service/impl/ArdMapManagementServiceImpl.java | 6
ard-admin/src/main/java/com/ard/web/controller/system/SysProfileController.java | 2
ard-system/src/main/java/com/ard/system/system/service/impl/SysConfigServiceImpl.java | 8
ard-system/src/main/java/com/ard/system/system/domain/SysRoleMenu.java | 2
ard-system/src/main/java/com/ard/system/system/service/impl/SysDictTypeServiceImpl.java | 8
ard-system/src/main/java/com/ard/system/system/service/impl/SysRoleServiceImpl.java | 18 +-
ard-admin/src/main/java/com/ard/web/controller/monitor/SysLogininforController.java | 4
ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java | 4
ard-system/src/main/java/com/ard/system/system/service/ISysPostService.java | 4
ard-system/src/main/java/com/ard/system/system/service/impl/SysPostServiceImpl.java | 10
ard-system/src/main/java/com/ard/system/authorize/common/Md5Utils.java | 2
ard-system/src/main/java/com/ard/system/system/service/impl/SysMenuServiceImpl.java | 14
ard-system/src/main/java/com/ard/system/system/service/ISysUserService.java | 2
ard-system/src/main/java/com/ard/system/data/domain/ArdMapManagement.java | 0
ard-system/src/main/java/com/ard/system/system/domain/SysPost.java | 2
ard-system/src/main/resources/mapper/system/SysOperLogMapper.xml | 2
ard-admin/src/main/java/com/ard/web/controller/data/ArdMapManagementController.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/AuthorizationController.java | 2
ard-framework/src/main/java/com/ard/framework/aspectj/LogAspect.java | 2
ard-system/src/main/java/com/ard/system/system/mapper/SysMenuMapper.java | 2
ard-system/src/main/java/com/ard/system/system/vo/RouterVo.java | 2
ard-system/src/main/java/com/ard/system/data/service/IArdTileManagementService.java | 4
ard-system/src/main/java/com/ard/system/system/domain/SysNotice.java | 2
ard-system/src/main/java/com/ard/system/system/mapper/SysDeptMapper.java | 2
ard-system/src/main/java/com/ard/system/system/mapper/SysLogininforMapper.java | 4
ard-system/src/main/resources/mapper/system/SysPostMapper.xml | 2
ard-system/src/main/java/com/ard/system/data/service/impl/ArdTileManagementServiceImpl.java | 8
ard-admin/src/main/java/com/ard/web/controller/system/SysMenuController.java | 2
ard-system/src/main/java/com/ard/system/data/mapper/ArdMapManagementMapper.java | 2
ard-system/src/main/java/com/ard/system/data/service/IArdModelManagementService.java | 4
ard-system/src/main/java/com/ard/system/system/domain/SysCache.java | 2
ard-framework/src/main/java/com/ard/framework/web/service/SysLoginService.java | 4
ard-system/src/main/java/com/ard/system/noflyzone/domain/FeatureCollection.java | 2
ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml | 8
ard-admin/src/main/java/com/ard/web/controller/system/SysConfigController.java | 4
ard-system/src/main/java/com/ard/system/system/service/impl/SysLogininforServiceImpl.java | 8
ard-system/src/main/java/com/ard/system/system/domain/SysUserRole.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysPostController.java | 4
ard-system/src/main/java/com/ard/system/system/mapper/SysNoticeMapper.java | 4
ard-system/src/main/java/com/ard/system/data/service/impl/ArdModelManagementServiceImpl.java | 8
ard-system/src/main/java/com/ard/system/system/service/impl/SysNoticeServiceImpl.java | 8
ard-system/src/main/resources/mapper/system/SysDictTypeMapper.xml | 2
ard-system/src/main/resources/mapper/system/SysNoticeMapper.xml | 2
ard-system/src/main/resources/mapper/data/ArdMapManagementMapper.xml | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysLoginController.java | 2
ard-system/src/main/java/com/ard/system/noflyzone/domain/FeatureCollectionTypeHandler.java | 2
ard-system/src/main/java/com/ard/system/system/service/ISysConfigService.java | 4
ard-admin/src/main/java/com/ard/web/controller/system/SysDictDataController.java | 4
ard-system/src/main/java/com/ard/system/system/service/ISysMenuService.java | 4
ard-admin/src/main/java/com/ard/web/controller/monitor/SysOperlogController.java | 4
ard-system/src/main/java/com/ard/system/authorize/service/impl/AuthorizeServiceImpl.java | 12
ard-system/src/main/java/com/ard/system/system/service/ISysUserOnlineService.java | 4
ard-admin/src/main/java/com/ard/web/controller/data/ArdTileManagementController.java | 4
ard-system/src/main/java/com/ard/system/system/domain/SysUserOnline.java | 2
ard-system/src/main/java/com/ard/system/data/mapper/ArdModelManagementMapper.java | 4
ard-system/src/main/resources/mapper/system/SysRoleMapper.xml | 2
ard-system/src/main/java/com/ard/system/system/service/ISysDeptService.java | 2
ard-system/src/main/resources/mapper/system/SysDeptMapper.xml | 2
ard-admin/src/main/java/com/ard/web/controller/data/ArdModelManagementController.java | 4
ard-framework/src/main/java/com/ard/framework/web/service/SysPermissionService.java | 4
ard-system/src/main/java/com/ard/system/system/service/impl/SysUserServiceImpl.java | 24 +-
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java | 2
ard-system/src/main/java/com/ard/system/system/mapper/SysOperLogMapper.java | 4
ard-system/src/main/java/com/ard/system/system/service/ISysDictDataService.java | 2
ard-system/src/main/java/com/ard/system/system/service/impl/SysDeptServiceImpl.java | 8
ard-system/src/main/resources/mapper/data/ArdModelManagementMapper.xml | 2
ard-system/src/main/resources/mapper/data/ArdTileManagementMapper.xml | 2
ard-system/src/main/java/com/ard/system/system/service/impl/SysUserOnlineServiceImpl.java | 6
ard-system/src/main/resources/mapper/system/SysUserMapper.xml | 2
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysRegisterController.java | 2
ard-system/src/main/java/com/ard/system/system/mapper/SysUserRoleMapper.java | 4
ard-system/src/main/java/com/ard/system/system/mapper/SysDictDataMapper.java | 2
ard-system/src/main/java/com/ard/system/system/service/ISysRoleService.java | 4
ard-system/src/main/java/com/ard/system/system/domain/SysUserPost.java | 2
ard-system/src/main/resources/mapper/system/SysDictDataMapper.xml | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysRoleController.java | 8
ard-framework/src/main/java/com/ard/framework/web/service/UserDetailsServiceImpl.java | 2
ard-system/src/main/java/com/ard/system/authorize/common/DateTimeUtil.java | 2
ard-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml | 2
ard-system/src/main/java/com/ard/system/system/service/ISysDictTypeService.java | 2
ard-system/src/main/java/com/ard/system/system/mapper/SysRoleMapper.java | 2
ard-admin/src/main/java/com/ard/web/controller/monitor/SysUserOnlineController.java | 4
ard-system/src/main/java/com/ard/system/authorize/domain/AuthorizeInfo.java | 2
ard-system/src/main/java/com/ard/system/system/mapper/SysConfigMapper.java | 4
ard-system/src/main/java/com/ard/system/system/service/ISysOperLogService.java | 4
ard-system/src/main/java/com/ard/system/data/service/IArdMapManagementService.java | 2
ard-system/src/main/java/com/ard/system/system/mapper/SysUserPostMapper.java | 4
ard-system/src/main/resources/mapper/noflyzone/ArdNoFlyZoneMapper.xml | 4
ard-system/src/main/java/com/ard/system/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java | 8
ard-system/src/main/java/com/ard/system/data/mapper/ArdTileManagementMapper.java | 4
ard-system/src/main/java/com/ard/system/system/mapper/SysUserMapper.java | 2
ard-system/src/main/java/com/ard/system/authorize/domain/ParsLicenseInfo.java | 2
ard-system/src/main/java/com/ard/system/system/domain/SysOperLog.java | 2
ard-system/src/main/java/com/ard/system/system/domain/SysConfig.java | 2
ard-system/src/main/resources/mapper/system/SysConfigMapper.xml | 2
129 files changed, 246 insertions(+), 246 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/common/CaptchaController.java b/ard-admin/src/main/java/com/ard/web/controller/common/CaptchaController.java
index bbcaf97..ff92abc 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/common/CaptchaController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/common/CaptchaController.java
@@ -18,7 +18,7 @@
import com.ard.common.core.redis.RedisCache;
import com.ard.common.utils.sign.Base64;
import com.ard.common.utils.uuid.IdUtils;
-import com.ard.system.service.system.ISysConfigService;
+import com.ard.system.system.service.ISysConfigService;
/**
* 验证码操作处理
diff --git a/ard-admin/src/main/java/com/ard/web/controller/data/ArdMapManagementController.java b/ard-admin/src/main/java/com/ard/web/controller/data/ArdMapManagementController.java
index d13a03d..7fc9ba8 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/data/ArdMapManagementController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/data/ArdMapManagementController.java
@@ -4,7 +4,7 @@
import javax.servlet.http.HttpServletResponse;
import com.ard.system.data.domain.ArdMapManagement;
-import com.ard.system.service.data.IArdMapManagementService;
+import com.ard.system.data.service.IArdMapManagementService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/ard-admin/src/main/java/com/ard/web/controller/data/ArdModelManagementController.java b/ard-admin/src/main/java/com/ard/web/controller/data/ArdModelManagementController.java
index ef32a24..9a1829b 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/data/ArdModelManagementController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/data/ArdModelManagementController.java
@@ -3,8 +3,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
-import com.ard.system.domain.data.ArdModelManagement;
-import com.ard.system.service.data.IArdModelManagementService;
+import com.ard.system.data.domain.ArdModelManagement;
+import com.ard.system.data.service.IArdModelManagementService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/ard-admin/src/main/java/com/ard/web/controller/data/ArdNoFlyZoneController.java b/ard-admin/src/main/java/com/ard/web/controller/data/ArdNoFlyZoneController.java
index b701ebe..27a195c 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/data/ArdNoFlyZoneController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/data/ArdNoFlyZoneController.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson2.JSON;
import com.ard.common.utils.uuid.IdUtils;
-import com.ard.system.domain.noflyzone.FeatureCollection;
+import com.ard.system.noflyzone.domain.FeatureCollection;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -16,8 +16,8 @@
import com.ard.common.core.controller.BaseController;
import com.ard.common.core.domain.AjaxResult;
import com.ard.common.enums.BusinessType;
-import com.ard.system.domain.noflyzone.ArdNoFlyZone;
-import com.ard.system.service.noflyzone.IArdNoFlyZoneService;
+import com.ard.system.noflyzone.domain.ArdNoFlyZone;
+import com.ard.system.noflyzone.service.IArdNoFlyZoneService;
import com.ard.common.utils.poi.ExcelUtil;
import com.ard.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
diff --git a/ard-admin/src/main/java/com/ard/web/controller/data/ArdTileManagementController.java b/ard-admin/src/main/java/com/ard/web/controller/data/ArdTileManagementController.java
index 04e12f8..0112a19 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/data/ArdTileManagementController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/data/ArdTileManagementController.java
@@ -3,8 +3,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
-import com.ard.system.domain.data.ArdTileManagement;
-import com.ard.system.service.data.IArdTileManagementService;
+import com.ard.system.data.domain.ArdTileManagement;
+import com.ard.system.data.service.IArdTileManagementService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java b/ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java
index 93d23e5..2ea707a 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java
@@ -20,7 +20,7 @@
import com.ard.common.constant.CacheConstants;
import com.ard.common.core.domain.AjaxResult;
import com.ard.common.utils.StringUtils;
-import com.ard.system.domain.system.SysCache;
+import com.ard.system.system.domain.SysCache;
/**
* 缓存监控
diff --git a/ard-admin/src/main/java/com/ard/web/controller/monitor/SysLogininforController.java b/ard-admin/src/main/java/com/ard/web/controller/monitor/SysLogininforController.java
index 7bdf098..c6a6348 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/monitor/SysLogininforController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/monitor/SysLogininforController.java
@@ -17,8 +17,8 @@
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.poi.ExcelUtil;
import com.ard.framework.web.service.SysPasswordService;
-import com.ard.system.domain.system.SysLogininfor;
-import com.ard.system.service.system.ISysLogininforService;
+import com.ard.system.system.domain.SysLogininfor;
+import com.ard.system.system.service.ISysLogininforService;
/**
* 系统访问记录
diff --git a/ard-admin/src/main/java/com/ard/web/controller/monitor/SysOperlogController.java b/ard-admin/src/main/java/com/ard/web/controller/monitor/SysOperlogController.java
index 0354560..a712cae 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/monitor/SysOperlogController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/monitor/SysOperlogController.java
@@ -16,8 +16,8 @@
import com.ard.common.core.page.TableDataInfo;
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.poi.ExcelUtil;
-import com.ard.system.domain.system.SysOperLog;
-import com.ard.system.service.system.ISysOperLogService;
+import com.ard.system.system.domain.SysOperLog;
+import com.ard.system.system.service.ISysOperLogService;
/**
* 操作日志记录
diff --git a/ard-admin/src/main/java/com/ard/web/controller/monitor/SysUserOnlineController.java b/ard-admin/src/main/java/com/ard/web/controller/monitor/SysUserOnlineController.java
index 12b78c1..6165bae 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/monitor/SysUserOnlineController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/monitor/SysUserOnlineController.java
@@ -20,8 +20,8 @@
import com.ard.common.core.redis.RedisCache;
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.StringUtils;
-import com.ard.system.domain.system.SysUserOnline;
-import com.ard.system.service.system.ISysUserOnlineService;
+import com.ard.system.system.domain.SysUserOnline;
+import com.ard.system.system.service.ISysUserOnlineService;
/**
* 在线用户监控
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/AuthorizationController.java b/ard-admin/src/main/java/com/ard/web/controller/system/AuthorizationController.java
index 151a6fd..ee44081 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/AuthorizationController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/AuthorizationController.java
@@ -1,7 +1,7 @@
package com.ard.web.controller.system;
import com.alibaba.fastjson2.JSONObject;
-import com.ard.system.service.authorize.AuthorizeService;
+import com.ard.system.authorize.service.AuthorizeService;
import com.ard.common.annotation.Anonymous;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysConfigController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysConfigController.java
index 7e2837d..fe5bda4 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysConfigController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysConfigController.java
@@ -19,8 +19,8 @@
import com.ard.common.core.page.TableDataInfo;
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.poi.ExcelUtil;
-import com.ard.system.domain.system.SysConfig;
-import com.ard.system.service.system.ISysConfigService;
+import com.ard.system.system.domain.SysConfig;
+import com.ard.system.system.service.ISysConfigService;
/**
* 参数配置 信息操作处理
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysDeptController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysDeptController.java
index 377cc49..915e5bb 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysDeptController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysDeptController.java
@@ -20,7 +20,7 @@
import com.ard.common.core.domain.entity.SysDept;
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.StringUtils;
-import com.ard.system.service.system.ISysDeptService;
+import com.ard.system.system.service.ISysDeptService;
/**
* 部门信息
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysDictDataController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysDictDataController.java
index b0856a7..bbe2345 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysDictDataController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysDictDataController.java
@@ -22,8 +22,8 @@
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.StringUtils;
import com.ard.common.utils.poi.ExcelUtil;
-import com.ard.system.service.system.ISysDictDataService;
-import com.ard.system.service.system.ISysDictTypeService;
+import com.ard.system.system.service.ISysDictDataService;
+import com.ard.system.system.service.ISysDictTypeService;
/**
* 数据字典信息
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysDictTypeController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysDictTypeController.java
index b1e36cf..73f6c5f 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysDictTypeController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysDictTypeController.java
@@ -20,7 +20,7 @@
import com.ard.common.core.page.TableDataInfo;
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.poi.ExcelUtil;
-import com.ard.system.service.system.ISysDictTypeService;
+import com.ard.system.system.service.ISysDictTypeService;
/**
* 数据字典信息
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysLoginController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysLoginController.java
index ac37dc4..0a9558c 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysLoginController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysLoginController.java
@@ -22,7 +22,7 @@
import com.ard.framework.web.service.SysLoginService;
import com.ard.framework.web.service.SysPermissionService;
import com.ard.framework.web.service.TokenService;
-import com.ard.system.service.system.ISysMenuService;
+import com.ard.system.system.service.ISysMenuService;
/**
* 登录验证
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysMenuController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysMenuController.java
index ae2b867..474738c 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysMenuController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysMenuController.java
@@ -19,7 +19,7 @@
import com.ard.common.core.domain.entity.SysMenu;
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.StringUtils;
-import com.ard.system.service.system.ISysMenuService;
+import com.ard.system.system.service.ISysMenuService;
/**
* 菜单信息
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysNoticeController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysNoticeController.java
index 30d8ab4..05ce741 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysNoticeController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysNoticeController.java
@@ -17,8 +17,8 @@
import com.ard.common.core.domain.AjaxResult;
import com.ard.common.core.page.TableDataInfo;
import com.ard.common.enums.BusinessType;
-import com.ard.system.domain.system.SysNotice;
-import com.ard.system.service.system.ISysNoticeService;
+import com.ard.system.system.domain.SysNotice;
+import com.ard.system.system.service.ISysNoticeService;
/**
* 公告 信息操作处理
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysPostController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysPostController.java
index 686345f..11fd74a 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysPostController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysPostController.java
@@ -19,8 +19,8 @@
import com.ard.common.core.page.TableDataInfo;
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.poi.ExcelUtil;
-import com.ard.system.domain.system.SysPost;
-import com.ard.system.service.system.ISysPostService;
+import com.ard.system.system.domain.SysPost;
+import com.ard.system.system.service.ISysPostService;
/**
* 岗位信息操作处理
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysProfileController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysProfileController.java
index 90728a3..b2925e1 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysProfileController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysProfileController.java
@@ -21,7 +21,7 @@
import com.ard.common.utils.file.FileUploadUtils;
import com.ard.common.utils.file.MimeTypeUtils;
import com.ard.framework.web.service.TokenService;
-import com.ard.system.service.system.ISysUserService;
+import com.ard.system.system.service.ISysUserService;
/**
* 个人信息 业务处理
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysRegisterController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysRegisterController.java
index ae8210a..22295ee 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysRegisterController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysRegisterController.java
@@ -9,7 +9,7 @@
import com.ard.common.core.domain.model.RegisterBody;
import com.ard.common.utils.StringUtils;
import com.ard.framework.web.service.SysRegisterService;
-import com.ard.system.service.system.ISysConfigService;
+import com.ard.system.system.service.ISysConfigService;
/**
* 注册验证
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysRoleController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysRoleController.java
index c4f47c7..21d7b6a 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysRoleController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysRoleController.java
@@ -26,10 +26,10 @@
import com.ard.common.utils.poi.ExcelUtil;
import com.ard.framework.web.service.SysPermissionService;
import com.ard.framework.web.service.TokenService;
-import com.ard.system.domain.system.SysUserRole;
-import com.ard.system.service.system.ISysDeptService;
-import com.ard.system.service.system.ISysRoleService;
-import com.ard.system.service.system.ISysUserService;
+import com.ard.system.system.domain.SysUserRole;
+import com.ard.system.system.service.ISysDeptService;
+import com.ard.system.system.service.ISysRoleService;
+import com.ard.system.system.service.ISysUserService;
/**
* 角色信息
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysUserController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysUserController.java
index b97d953..aec7efa 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysUserController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysUserController.java
@@ -30,10 +30,10 @@
import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.StringUtils;
import com.ard.common.utils.poi.ExcelUtil;
-import com.ard.system.service.system.ISysDeptService;
-import com.ard.system.service.system.ISysPostService;
-import com.ard.system.service.system.ISysRoleService;
-import com.ard.system.service.system.ISysUserService;
+import com.ard.system.system.service.ISysDeptService;
+import com.ard.system.system.service.ISysPostService;
+import com.ard.system.system.service.ISysRoleService;
+import com.ard.system.system.service.ISysUserService;
/**
* 用户信息
diff --git a/ard-framework/src/main/java/com/ard/framework/aspectj/LogAspect.java b/ard-framework/src/main/java/com/ard/framework/aspectj/LogAspect.java
index 7932226..6ad5248 100644
--- a/ard-framework/src/main/java/com/ard/framework/aspectj/LogAspect.java
+++ b/ard-framework/src/main/java/com/ard/framework/aspectj/LogAspect.java
@@ -29,7 +29,7 @@
import com.ard.common.utils.ip.IpUtils;
import com.ard.framework.manager.AsyncManager;
import com.ard.framework.manager.factory.AsyncFactory;
-import com.ard.system.domain.system.SysOperLog;
+import com.ard.system.system.domain.SysOperLog;
/**
* 操作日志记录处理
diff --git a/ard-framework/src/main/java/com/ard/framework/manager/factory/AsyncFactory.java b/ard-framework/src/main/java/com/ard/framework/manager/factory/AsyncFactory.java
index e0aa02e..52d8fb1 100644
--- a/ard-framework/src/main/java/com/ard/framework/manager/factory/AsyncFactory.java
+++ b/ard-framework/src/main/java/com/ard/framework/manager/factory/AsyncFactory.java
@@ -10,10 +10,10 @@
import com.ard.common.utils.ip.AddressUtils;
import com.ard.common.utils.ip.IpUtils;
import com.ard.common.utils.spring.SpringUtils;
-import com.ard.system.domain.system.SysLogininfor;
-import com.ard.system.domain.system.SysOperLog;
-import com.ard.system.service.system.ISysLogininforService;
-import com.ard.system.service.system.ISysOperLogService;
+import com.ard.system.system.domain.SysLogininfor;
+import com.ard.system.system.domain.SysOperLog;
+import com.ard.system.system.service.ISysLogininforService;
+import com.ard.system.system.service.ISysOperLogService;
import eu.bitwalker.useragentutils.UserAgent;
/**
diff --git a/ard-framework/src/main/java/com/ard/framework/web/service/SysLoginService.java b/ard-framework/src/main/java/com/ard/framework/web/service/SysLoginService.java
index 01d5784..c1bed8b 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/service/SysLoginService.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/service/SysLoginService.java
@@ -30,8 +30,8 @@
import com.ard.framework.manager.AsyncManager;
import com.ard.framework.manager.factory.AsyncFactory;
import com.ard.framework.security.context.AuthenticationContextHolder;
-import com.ard.system.service.system.ISysConfigService;
-import com.ard.system.service.system.ISysUserService;
+import com.ard.system.system.service.ISysConfigService;
+import com.ard.system.system.service.ISysUserService;
/**
* 登录校验方法
diff --git a/ard-framework/src/main/java/com/ard/framework/web/service/SysPermissionService.java b/ard-framework/src/main/java/com/ard/framework/web/service/SysPermissionService.java
index 8dcc3fa..847af0c 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/service/SysPermissionService.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/service/SysPermissionService.java
@@ -10,8 +10,8 @@
import com.ard.common.core.domain.entity.SysRole;
import com.ard.common.core.domain.entity.SysUser;
import com.ard.common.utils.StringUtils;
-import com.ard.system.service.system.ISysMenuService;
-import com.ard.system.service.system.ISysRoleService;
+import com.ard.system.system.service.ISysMenuService;
+import com.ard.system.system.service.ISysRoleService;
/**
* 用户权限处理
diff --git a/ard-framework/src/main/java/com/ard/framework/web/service/SysRegisterService.java b/ard-framework/src/main/java/com/ard/framework/web/service/SysRegisterService.java
index 691a279..4803db0 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/service/SysRegisterService.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/service/SysRegisterService.java
@@ -15,8 +15,8 @@
import com.ard.common.utils.StringUtils;
import com.ard.framework.manager.AsyncManager;
import com.ard.framework.manager.factory.AsyncFactory;
-import com.ard.system.service.system.ISysConfigService;
-import com.ard.system.service.system.ISysUserService;
+import com.ard.system.system.service.ISysConfigService;
+import com.ard.system.system.service.ISysUserService;
/**
* 注册校验方法
diff --git a/ard-framework/src/main/java/com/ard/framework/web/service/UserDetailsServiceImpl.java b/ard-framework/src/main/java/com/ard/framework/web/service/UserDetailsServiceImpl.java
index 917634c..c80a31b 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/service/UserDetailsServiceImpl.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/service/UserDetailsServiceImpl.java
@@ -13,7 +13,7 @@
import com.ard.common.exception.ServiceException;
import com.ard.common.utils.MessageUtils;
import com.ard.common.utils.StringUtils;
-import com.ard.system.service.system.ISysUserService;
+import com.ard.system.system.service.ISysUserService;
/**
* 用户验证处理
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
index 322084d..95572cb 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
@@ -26,7 +26,7 @@
import com.ard.sample.manage.model.param.DeviceQueryParam;
import com.ard.sample.manage.model.receiver.*;
import com.ard.sample.manage.service.*;
-import com.ard.system.service.system.ISysDeptService;
+import com.ard.system.system.service.ISysDeptService;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/ard-system/src/main/java/com/ard/system/common/DateTimeUtil.java b/ard-system/src/main/java/com/ard/system/authorize/common/DateTimeUtil.java
similarity index 99%
rename from ard-system/src/main/java/com/ard/system/common/DateTimeUtil.java
rename to ard-system/src/main/java/com/ard/system/authorize/common/DateTimeUtil.java
index 67beb43..a30c712 100644
--- a/ard-system/src/main/java/com/ard/system/common/DateTimeUtil.java
+++ b/ard-system/src/main/java/com/ard/system/authorize/common/DateTimeUtil.java
@@ -1,4 +1,4 @@
-package com.ard.system.common;
+package com.ard.system.authorize.common;
import org.apache.commons.lang3.time.DateUtils;
diff --git a/ard-system/src/main/java/com/ard/system/common/Md5Utils.java b/ard-system/src/main/java/com/ard/system/authorize/common/Md5Utils.java
similarity index 96%
rename from ard-system/src/main/java/com/ard/system/common/Md5Utils.java
rename to ard-system/src/main/java/com/ard/system/authorize/common/Md5Utils.java
index ac5be99..6ddb04b 100644
--- a/ard-system/src/main/java/com/ard/system/common/Md5Utils.java
+++ b/ard-system/src/main/java/com/ard/system/authorize/common/Md5Utils.java
@@ -1,4 +1,4 @@
-package com.ard.system.common;
+package com.ard.system.authorize.common;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/ard-system/src/main/java/com/ard/system/domain/authorize/AuthorizeInfo.java b/ard-system/src/main/java/com/ard/system/authorize/domain/AuthorizeInfo.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/system/domain/authorize/AuthorizeInfo.java
rename to ard-system/src/main/java/com/ard/system/authorize/domain/AuthorizeInfo.java
index 7a68fba..4a9fe80 100644
--- a/ard-system/src/main/java/com/ard/system/domain/authorize/AuthorizeInfo.java
+++ b/ard-system/src/main/java/com/ard/system/authorize/domain/AuthorizeInfo.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.authorize;
+package com.ard.system.authorize.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/ard-system/src/main/java/com/ard/system/domain/authorize/ParsLicenseInfo.java b/ard-system/src/main/java/com/ard/system/authorize/domain/ParsLicenseInfo.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/system/domain/authorize/ParsLicenseInfo.java
rename to ard-system/src/main/java/com/ard/system/authorize/domain/ParsLicenseInfo.java
index 47e19f6..45fb93c 100644
--- a/ard-system/src/main/java/com/ard/system/domain/authorize/ParsLicenseInfo.java
+++ b/ard-system/src/main/java/com/ard/system/authorize/domain/ParsLicenseInfo.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.authorize;
+package com.ard.system.authorize.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/ard-system/src/main/java/com/ard/system/service/authorize/AuthorizeService.java b/ard-system/src/main/java/com/ard/system/authorize/service/AuthorizeService.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/system/service/authorize/AuthorizeService.java
rename to ard-system/src/main/java/com/ard/system/authorize/service/AuthorizeService.java
index 449c89a..0967efb 100644
--- a/ard-system/src/main/java/com/ard/system/service/authorize/AuthorizeService.java
+++ b/ard-system/src/main/java/com/ard/system/authorize/service/AuthorizeService.java
@@ -1,4 +1,4 @@
-package com.ard.system.service.authorize;
+package com.ard.system.authorize.service;
import com.alibaba.fastjson2.JSONObject;
import org.springframework.web.multipart.MultipartFile;
diff --git a/ard-system/src/main/java/com/ard/system/service/authorize/impl/AuthorizeServiceImpl.java b/ard-system/src/main/java/com/ard/system/authorize/service/impl/AuthorizeServiceImpl.java
similarity index 96%
rename from ard-system/src/main/java/com/ard/system/service/authorize/impl/AuthorizeServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/authorize/service/impl/AuthorizeServiceImpl.java
index d2fa2e9..6d8e217 100644
--- a/ard-system/src/main/java/com/ard/system/service/authorize/impl/AuthorizeServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/authorize/service/impl/AuthorizeServiceImpl.java
@@ -1,14 +1,14 @@
-package com.ard.system.service.authorize.impl;
+package com.ard.system.authorize.service.impl;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
-import com.ard.system.common.AuthorizeUtil;
-import com.ard.system.common.DateTimeUtil;
-import com.ard.system.domain.authorize.AuthorizeInfo;
-import com.ard.system.domain.authorize.ParsLicenseInfo;
+import com.ard.system.authorize.common.AuthorizeUtil;
+import com.ard.system.authorize.common.DateTimeUtil;
+import com.ard.system.authorize.domain.AuthorizeInfo;
+import com.ard.system.authorize.domain.ParsLicenseInfo;
import com.ard.common.constant.CacheConstants;
import com.ard.common.core.redis.RedisCache;
-import com.ard.system.service.authorize.AuthorizeService;
+import com.ard.system.authorize.service.AuthorizeService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.IOUtils;
import org.springframework.stereotype.Service;
diff --git a/ard-system/src/main/java/com/ard/system/domain/data/ArdMapManagement.java b/ard-system/src/main/java/com/ard/system/data/domain/ArdMapManagement.java
similarity index 100%
rename from ard-system/src/main/java/com/ard/system/domain/data/ArdMapManagement.java
rename to ard-system/src/main/java/com/ard/system/data/domain/ArdMapManagement.java
diff --git a/ard-system/src/main/java/com/ard/system/domain/data/ArdModelManagement.java b/ard-system/src/main/java/com/ard/system/data/domain/ArdModelManagement.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/domain/data/ArdModelManagement.java
rename to ard-system/src/main/java/com/ard/system/data/domain/ArdModelManagement.java
index 766cafc..bc96943 100644
--- a/ard-system/src/main/java/com/ard/system/domain/data/ArdModelManagement.java
+++ b/ard-system/src/main/java/com/ard/system/data/domain/ArdModelManagement.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.data;
+package com.ard.system.data.domain;
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
diff --git a/ard-system/src/main/java/com/ard/system/domain/data/ArdTileManagement.java b/ard-system/src/main/java/com/ard/system/data/domain/ArdTileManagement.java
similarity index 96%
rename from ard-system/src/main/java/com/ard/system/domain/data/ArdTileManagement.java
rename to ard-system/src/main/java/com/ard/system/data/domain/ArdTileManagement.java
index c742cc9..a9b6ff2 100644
--- a/ard-system/src/main/java/com/ard/system/domain/data/ArdTileManagement.java
+++ b/ard-system/src/main/java/com/ard/system/data/domain/ArdTileManagement.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.data;
+package com.ard.system.data.domain;
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
diff --git a/ard-system/src/main/java/com/ard/system/mapper/data/ArdMapManagementMapper.java b/ard-system/src/main/java/com/ard/system/data/mapper/ArdMapManagementMapper.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/mapper/data/ArdMapManagementMapper.java
rename to ard-system/src/main/java/com/ard/system/data/mapper/ArdMapManagementMapper.java
index 7899675..77d1e49 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/data/ArdMapManagementMapper.java
+++ b/ard-system/src/main/java/com/ard/system/data/mapper/ArdMapManagementMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.mapper.data;
+package com.ard.system.data.mapper;
import com.ard.system.data.domain.ArdMapManagement;
diff --git a/ard-system/src/main/java/com/ard/system/mapper/data/ArdModelManagementMapper.java b/ard-system/src/main/java/com/ard/system/data/mapper/ArdModelManagementMapper.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/system/mapper/data/ArdModelManagementMapper.java
rename to ard-system/src/main/java/com/ard/system/data/mapper/ArdModelManagementMapper.java
index 3d0d496..06aa254 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/data/ArdModelManagementMapper.java
+++ b/ard-system/src/main/java/com/ard/system/data/mapper/ArdModelManagementMapper.java
@@ -1,6 +1,6 @@
-package com.ard.system.mapper.data;
+package com.ard.system.data.mapper;
-import com.ard.system.domain.data.ArdModelManagement;
+import com.ard.system.data.domain.ArdModelManagement;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/system/mapper/data/ArdTileManagementMapper.java b/ard-system/src/main/java/com/ard/system/data/mapper/ArdTileManagementMapper.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/system/mapper/data/ArdTileManagementMapper.java
rename to ard-system/src/main/java/com/ard/system/data/mapper/ArdTileManagementMapper.java
index 99c71a3..b45d13d 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/data/ArdTileManagementMapper.java
+++ b/ard-system/src/main/java/com/ard/system/data/mapper/ArdTileManagementMapper.java
@@ -1,6 +1,6 @@
-package com.ard.system.mapper.data;
+package com.ard.system.data.mapper;
-import com.ard.system.domain.data.ArdTileManagement;
+import com.ard.system.data.domain.ArdTileManagement;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/system/service/data/IArdMapManagementService.java b/ard-system/src/main/java/com/ard/system/data/service/IArdMapManagementService.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/service/data/IArdMapManagementService.java
rename to ard-system/src/main/java/com/ard/system/data/service/IArdMapManagementService.java
index 077d5de..ecc9a87 100644
--- a/ard-system/src/main/java/com/ard/system/service/data/IArdMapManagementService.java
+++ b/ard-system/src/main/java/com/ard/system/data/service/IArdMapManagementService.java
@@ -1,4 +1,4 @@
-package com.ard.system.service.data;
+package com.ard.system.data.service;
import com.ard.system.data.domain.ArdMapManagement;
diff --git a/ard-system/src/main/java/com/ard/system/service/data/IArdModelManagementService.java b/ard-system/src/main/java/com/ard/system/data/service/IArdModelManagementService.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/system/service/data/IArdModelManagementService.java
rename to ard-system/src/main/java/com/ard/system/data/service/IArdModelManagementService.java
index a03000d..f5d540a 100644
--- a/ard-system/src/main/java/com/ard/system/service/data/IArdModelManagementService.java
+++ b/ard-system/src/main/java/com/ard/system/data/service/IArdModelManagementService.java
@@ -1,6 +1,6 @@
-package com.ard.system.service.data;
+package com.ard.system.data.service;
-import com.ard.system.domain.data.ArdModelManagement;
+import com.ard.system.data.domain.ArdModelManagement;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/system/service/data/IArdTileManagementService.java b/ard-system/src/main/java/com/ard/system/data/service/IArdTileManagementService.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/system/service/data/IArdTileManagementService.java
rename to ard-system/src/main/java/com/ard/system/data/service/IArdTileManagementService.java
index 68a5533..07be44e 100644
--- a/ard-system/src/main/java/com/ard/system/service/data/IArdTileManagementService.java
+++ b/ard-system/src/main/java/com/ard/system/data/service/IArdTileManagementService.java
@@ -1,6 +1,6 @@
-package com.ard.system.service.data;
+package com.ard.system.data.service;
-import com.ard.system.domain.data.ArdTileManagement;
+import com.ard.system.data.domain.ArdTileManagement;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/system/service/data/impl/ArdMapManagementServiceImpl.java b/ard-system/src/main/java/com/ard/system/data/service/impl/ArdMapManagementServiceImpl.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/system/service/data/impl/ArdMapManagementServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/data/service/impl/ArdMapManagementServiceImpl.java
index c6425c9..ee692d8 100644
--- a/ard-system/src/main/java/com/ard/system/service/data/impl/ArdMapManagementServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/data/service/impl/ArdMapManagementServiceImpl.java
@@ -1,9 +1,9 @@
-package com.ard.system.service.data.impl;
+package com.ard.system.data.service.impl;
import com.ard.common.utils.uuid.IdUtils;
import com.ard.system.data.domain.ArdMapManagement;
-import com.ard.system.mapper.data.ArdMapManagementMapper;
-import com.ard.system.service.data.IArdMapManagementService;
+import com.ard.system.data.mapper.ArdMapManagementMapper;
+import com.ard.system.data.service.IArdMapManagementService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/ard-system/src/main/java/com/ard/system/service/data/impl/ArdModelManagementServiceImpl.java b/ard-system/src/main/java/com/ard/system/data/service/impl/ArdModelManagementServiceImpl.java
similarity index 91%
rename from ard-system/src/main/java/com/ard/system/service/data/impl/ArdModelManagementServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/data/service/impl/ArdModelManagementServiceImpl.java
index 61608dd..c86d408 100644
--- a/ard-system/src/main/java/com/ard/system/service/data/impl/ArdModelManagementServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/data/service/impl/ArdModelManagementServiceImpl.java
@@ -1,11 +1,11 @@
-package com.ard.system.service.data.impl;
+package com.ard.system.data.service.impl;
import java.util.List;
import com.ard.common.utils.uuid.IdUtils;
-import com.ard.system.domain.data.ArdModelManagement;
-import com.ard.system.mapper.data.ArdModelManagementMapper;
-import com.ard.system.service.data.IArdModelManagementService;
+import com.ard.system.data.domain.ArdModelManagement;
+import com.ard.system.data.mapper.ArdModelManagementMapper;
+import com.ard.system.data.service.IArdModelManagementService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/ard-system/src/main/java/com/ard/system/service/data/impl/ArdTileManagementServiceImpl.java b/ard-system/src/main/java/com/ard/system/data/service/impl/ArdTileManagementServiceImpl.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/system/service/data/impl/ArdTileManagementServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/data/service/impl/ArdTileManagementServiceImpl.java
index cbe83c9..4cb3128 100644
--- a/ard-system/src/main/java/com/ard/system/service/data/impl/ArdTileManagementServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/data/service/impl/ArdTileManagementServiceImpl.java
@@ -1,11 +1,11 @@
-package com.ard.system.service.data.impl;
+package com.ard.system.data.service.impl;
import java.util.List;
import com.ard.common.utils.uuid.IdUtils;
-import com.ard.system.domain.data.ArdTileManagement;
-import com.ard.system.mapper.data.ArdTileManagementMapper;
-import com.ard.system.service.data.IArdTileManagementService;
+import com.ard.system.data.domain.ArdTileManagement;
+import com.ard.system.data.mapper.ArdTileManagementMapper;
+import com.ard.system.data.service.IArdTileManagementService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/ard-system/src/main/java/com/ard/system/domain/noflyzone/ArdNoFlyZone.java b/ard-system/src/main/java/com/ard/system/noflyzone/domain/ArdNoFlyZone.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/system/domain/noflyzone/ArdNoFlyZone.java
rename to ard-system/src/main/java/com/ard/system/noflyzone/domain/ArdNoFlyZone.java
index a2805e2..4705a16 100644
--- a/ard-system/src/main/java/com/ard/system/domain/noflyzone/ArdNoFlyZone.java
+++ b/ard-system/src/main/java/com/ard/system/noflyzone/domain/ArdNoFlyZone.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.noflyzone;
+package com.ard.system.noflyzone.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/ard-system/src/main/java/com/ard/system/domain/noflyzone/FeatureCollection.java b/ard-system/src/main/java/com/ard/system/noflyzone/domain/FeatureCollection.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/system/domain/noflyzone/FeatureCollection.java
rename to ard-system/src/main/java/com/ard/system/noflyzone/domain/FeatureCollection.java
index 803bf40..744f5ac 100644
--- a/ard-system/src/main/java/com/ard/system/domain/noflyzone/FeatureCollection.java
+++ b/ard-system/src/main/java/com/ard/system/noflyzone/domain/FeatureCollection.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.noflyzone;
+package com.ard.system.noflyzone.domain;
import lombok.Data;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/system/domain/noflyzone/FeatureCollectionTypeHandler.java b/ard-system/src/main/java/com/ard/system/noflyzone/domain/FeatureCollectionTypeHandler.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/domain/noflyzone/FeatureCollectionTypeHandler.java
rename to ard-system/src/main/java/com/ard/system/noflyzone/domain/FeatureCollectionTypeHandler.java
index d8440a7..2c988fd 100644
--- a/ard-system/src/main/java/com/ard/system/domain/noflyzone/FeatureCollectionTypeHandler.java
+++ b/ard-system/src/main/java/com/ard/system/noflyzone/domain/FeatureCollectionTypeHandler.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.noflyzone;
+package com.ard.system.noflyzone.domain;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/ard-system/src/main/java/com/ard/system/mapper/noflyzone/ArdNoFlyZoneMapper.java b/ard-system/src/main/java/com/ard/system/noflyzone/mapper/ArdNoFlyZoneMapper.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/system/mapper/noflyzone/ArdNoFlyZoneMapper.java
rename to ard-system/src/main/java/com/ard/system/noflyzone/mapper/ArdNoFlyZoneMapper.java
index 6115e1e..08b2515 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/noflyzone/ArdNoFlyZoneMapper.java
+++ b/ard-system/src/main/java/com/ard/system/noflyzone/mapper/ArdNoFlyZoneMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.mapper.noflyzone;
+package com.ard.system.noflyzone.mapper;
import java.util.List;
-import com.ard.system.domain.noflyzone.ArdNoFlyZone;
+import com.ard.system.noflyzone.domain.ArdNoFlyZone;
/**
* 禁飞区管理Mapper接口
diff --git a/ard-system/src/main/java/com/ard/system/service/noflyzone/IArdNoFlyZoneService.java b/ard-system/src/main/java/com/ard/system/noflyzone/service/IArdNoFlyZoneService.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/system/service/noflyzone/IArdNoFlyZoneService.java
rename to ard-system/src/main/java/com/ard/system/noflyzone/service/IArdNoFlyZoneService.java
index d11fed5..577187b 100644
--- a/ard-system/src/main/java/com/ard/system/service/noflyzone/IArdNoFlyZoneService.java
+++ b/ard-system/src/main/java/com/ard/system/noflyzone/service/IArdNoFlyZoneService.java
@@ -1,7 +1,7 @@
-package com.ard.system.service.noflyzone;
+package com.ard.system.noflyzone.service;
import java.util.List;
-import com.ard.system.domain.noflyzone.ArdNoFlyZone;
+import com.ard.system.noflyzone.domain.ArdNoFlyZone;
/**
* 禁飞区管理Service接口
diff --git a/ard-system/src/main/java/com/ard/system/service/noflyzone/impl/ArdNoFlyZoneServiceImpl.java b/ard-system/src/main/java/com/ard/system/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java
similarity index 91%
rename from ard-system/src/main/java/com/ard/system/service/noflyzone/impl/ArdNoFlyZoneServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java
index f401263..d198b9f 100644
--- a/ard-system/src/main/java/com/ard/system/service/noflyzone/impl/ArdNoFlyZoneServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ard.system.service.noflyzone.impl;
+package com.ard.system.noflyzone.service.impl;
import java.util.List;
import com.ard.common.utils.DateUtils;
import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.uuid.IdUtils;
-import com.ard.system.service.noflyzone.IArdNoFlyZoneService;
+import com.ard.system.noflyzone.service.IArdNoFlyZoneService;
import org.springframework.stereotype.Service;
-import com.ard.system.mapper.noflyzone.ArdNoFlyZoneMapper;
-import com.ard.system.domain.noflyzone.ArdNoFlyZone;
+import com.ard.system.noflyzone.mapper.ArdNoFlyZoneMapper;
+import com.ard.system.noflyzone.domain.ArdNoFlyZone;
import javax.annotation.Resource;
diff --git a/ard-system/src/main/java/com/ard/system/domain/system/SysCache.java b/ard-system/src/main/java/com/ard/system/system/domain/SysCache.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/domain/system/SysCache.java
rename to ard-system/src/main/java/com/ard/system/system/domain/SysCache.java
index 9893322..76478bc 100644
--- a/ard-system/src/main/java/com/ard/system/domain/system/SysCache.java
+++ b/ard-system/src/main/java/com/ard/system/system/domain/SysCache.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.system;
+package com.ard.system.system.domain;
import com.ard.common.utils.StringUtils;
diff --git a/ard-system/src/main/java/com/ard/system/domain/system/SysConfig.java b/ard-system/src/main/java/com/ard/system/system/domain/SysConfig.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/domain/system/SysConfig.java
rename to ard-system/src/main/java/com/ard/system/system/domain/SysConfig.java
index 2108dfd..6daa7bb 100644
--- a/ard-system/src/main/java/com/ard/system/domain/system/SysConfig.java
+++ b/ard-system/src/main/java/com/ard/system/system/domain/SysConfig.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.system;
+package com.ard.system.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
diff --git a/ard-system/src/main/java/com/ard/system/domain/system/SysLogininfor.java b/ard-system/src/main/java/com/ard/system/system/domain/SysLogininfor.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/domain/system/SysLogininfor.java
rename to ard-system/src/main/java/com/ard/system/system/domain/SysLogininfor.java
index 1fa7b22..d7d784d 100644
--- a/ard-system/src/main/java/com/ard/system/domain/system/SysLogininfor.java
+++ b/ard-system/src/main/java/com/ard/system/system/domain/SysLogininfor.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.system;
+package com.ard.system.system.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/ard-system/src/main/java/com/ard/system/domain/system/SysNotice.java b/ard-system/src/main/java/com/ard/system/system/domain/SysNotice.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/domain/system/SysNotice.java
rename to ard-system/src/main/java/com/ard/system/system/domain/SysNotice.java
index 4791e52..9fb4d69 100644
--- a/ard-system/src/main/java/com/ard/system/domain/system/SysNotice.java
+++ b/ard-system/src/main/java/com/ard/system/system/domain/SysNotice.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.system;
+package com.ard.system.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
diff --git a/ard-system/src/main/java/com/ard/system/domain/system/SysOperLog.java b/ard-system/src/main/java/com/ard/system/system/domain/SysOperLog.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/domain/system/SysOperLog.java
rename to ard-system/src/main/java/com/ard/system/system/domain/SysOperLog.java
index 3cf57f3..7af053c 100644
--- a/ard-system/src/main/java/com/ard/system/domain/system/SysOperLog.java
+++ b/ard-system/src/main/java/com/ard/system/system/domain/SysOperLog.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.system;
+package com.ard.system.system.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/ard-system/src/main/java/com/ard/system/domain/system/SysPost.java b/ard-system/src/main/java/com/ard/system/system/domain/SysPost.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/domain/system/SysPost.java
rename to ard-system/src/main/java/com/ard/system/system/domain/SysPost.java
index 8ee3368..cc63881 100644
--- a/ard-system/src/main/java/com/ard/system/domain/system/SysPost.java
+++ b/ard-system/src/main/java/com/ard/system/system/domain/SysPost.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.system;
+package com.ard.system.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
diff --git a/ard-system/src/main/java/com/ard/system/domain/system/SysRoleDept.java b/ard-system/src/main/java/com/ard/system/system/domain/SysRoleDept.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/domain/system/SysRoleDept.java
rename to ard-system/src/main/java/com/ard/system/system/domain/SysRoleDept.java
index 67d9476..ce109a6 100644
--- a/ard-system/src/main/java/com/ard/system/domain/system/SysRoleDept.java
+++ b/ard-system/src/main/java/com/ard/system/system/domain/SysRoleDept.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.system;
+package com.ard.system.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/ard-system/src/main/java/com/ard/system/domain/system/SysRoleMenu.java b/ard-system/src/main/java/com/ard/system/system/domain/SysRoleMenu.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/domain/system/SysRoleMenu.java
rename to ard-system/src/main/java/com/ard/system/system/domain/SysRoleMenu.java
index 0786883..caf67db 100644
--- a/ard-system/src/main/java/com/ard/system/domain/system/SysRoleMenu.java
+++ b/ard-system/src/main/java/com/ard/system/system/domain/SysRoleMenu.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.system;
+package com.ard.system.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/ard-system/src/main/java/com/ard/system/domain/system/SysUserOnline.java b/ard-system/src/main/java/com/ard/system/system/domain/SysUserOnline.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/domain/system/SysUserOnline.java
rename to ard-system/src/main/java/com/ard/system/system/domain/SysUserOnline.java
index 68a9a2a..a359c6f 100644
--- a/ard-system/src/main/java/com/ard/system/domain/system/SysUserOnline.java
+++ b/ard-system/src/main/java/com/ard/system/system/domain/SysUserOnline.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.system;
+package com.ard.system.system.domain;
/**
* 当前在线会话
diff --git a/ard-system/src/main/java/com/ard/system/domain/system/SysUserPost.java b/ard-system/src/main/java/com/ard/system/system/domain/SysUserPost.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/domain/system/SysUserPost.java
rename to ard-system/src/main/java/com/ard/system/system/domain/SysUserPost.java
index 8b086b0..70684cb 100644
--- a/ard-system/src/main/java/com/ard/system/domain/system/SysUserPost.java
+++ b/ard-system/src/main/java/com/ard/system/system/domain/SysUserPost.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.system;
+package com.ard.system.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/ard-system/src/main/java/com/ard/system/domain/system/SysUserRole.java b/ard-system/src/main/java/com/ard/system/system/domain/SysUserRole.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/domain/system/SysUserRole.java
rename to ard-system/src/main/java/com/ard/system/system/domain/SysUserRole.java
index 2bd82e1..d34bc8a 100644
--- a/ard-system/src/main/java/com/ard/system/domain/system/SysUserRole.java
+++ b/ard-system/src/main/java/com/ard/system/system/domain/SysUserRole.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.system;
+package com.ard.system.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/ard-system/src/main/java/com/ard/system/mapper/system/SysConfigMapper.java b/ard-system/src/main/java/com/ard/system/system/mapper/SysConfigMapper.java
similarity index 94%
rename from ard-system/src/main/java/com/ard/system/mapper/system/SysConfigMapper.java
rename to ard-system/src/main/java/com/ard/system/system/mapper/SysConfigMapper.java
index dd2827e..d942f5d 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/system/SysConfigMapper.java
+++ b/ard-system/src/main/java/com/ard/system/system/mapper/SysConfigMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.mapper.system;
+package com.ard.system.system.mapper;
import java.util.List;
-import com.ard.system.domain.system.SysConfig;
+import com.ard.system.system.domain.SysConfig;
/**
* 参数配置 数据层
diff --git a/ard-system/src/main/java/com/ard/system/mapper/system/SysDeptMapper.java b/ard-system/src/main/java/com/ard/system/system/mapper/SysDeptMapper.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/mapper/system/SysDeptMapper.java
rename to ard-system/src/main/java/com/ard/system/system/mapper/SysDeptMapper.java
index 7e19a61..905bbf6 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/system/SysDeptMapper.java
+++ b/ard-system/src/main/java/com/ard/system/system/mapper/SysDeptMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.mapper.system;
+package com.ard.system.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
diff --git a/ard-system/src/main/java/com/ard/system/mapper/system/SysDictDataMapper.java b/ard-system/src/main/java/com/ard/system/system/mapper/SysDictDataMapper.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/mapper/system/SysDictDataMapper.java
rename to ard-system/src/main/java/com/ard/system/system/mapper/SysDictDataMapper.java
index 0ac4c84..d90e1b6 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/system/SysDictDataMapper.java
+++ b/ard-system/src/main/java/com/ard/system/system/mapper/SysDictDataMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.mapper.system;
+package com.ard.system.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
diff --git a/ard-system/src/main/java/com/ard/system/mapper/system/SysDictTypeMapper.java b/ard-system/src/main/java/com/ard/system/system/mapper/SysDictTypeMapper.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/mapper/system/SysDictTypeMapper.java
rename to ard-system/src/main/java/com/ard/system/system/mapper/SysDictTypeMapper.java
index c207b40..dcbc69a 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/system/SysDictTypeMapper.java
+++ b/ard-system/src/main/java/com/ard/system/system/mapper/SysDictTypeMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.mapper.system;
+package com.ard.system.system.mapper;
import java.util.List;
import com.ard.common.core.domain.entity.SysDictType;
diff --git a/ard-system/src/main/java/com/ard/system/mapper/system/SysLogininforMapper.java b/ard-system/src/main/java/com/ard/system/system/mapper/SysLogininforMapper.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/system/mapper/system/SysLogininforMapper.java
rename to ard-system/src/main/java/com/ard/system/system/mapper/SysLogininforMapper.java
index c982e09..34b8c23 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/system/SysLogininforMapper.java
+++ b/ard-system/src/main/java/com/ard/system/system/mapper/SysLogininforMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.mapper.system;
+package com.ard.system.system.mapper;
import java.util.List;
-import com.ard.system.domain.system.SysLogininfor;
+import com.ard.system.system.domain.SysLogininfor;
/**
* 系统访问日志情况信息 数据层
diff --git a/ard-system/src/main/java/com/ard/system/mapper/system/SysMenuMapper.java b/ard-system/src/main/java/com/ard/system/system/mapper/SysMenuMapper.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/mapper/system/SysMenuMapper.java
rename to ard-system/src/main/java/com/ard/system/system/mapper/SysMenuMapper.java
index 392da5d..5073d67 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/system/SysMenuMapper.java
+++ b/ard-system/src/main/java/com/ard/system/system/mapper/SysMenuMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.mapper.system;
+package com.ard.system.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
diff --git a/ard-system/src/main/java/com/ard/system/mapper/system/SysNoticeMapper.java b/ard-system/src/main/java/com/ard/system/system/mapper/SysNoticeMapper.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/system/mapper/system/SysNoticeMapper.java
rename to ard-system/src/main/java/com/ard/system/system/mapper/SysNoticeMapper.java
index 65fee4b..fee2ebd 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/system/SysNoticeMapper.java
+++ b/ard-system/src/main/java/com/ard/system/system/mapper/SysNoticeMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.mapper.system;
+package com.ard.system.system.mapper;
import java.util.List;
-import com.ard.system.domain.system.SysNotice;
+import com.ard.system.system.domain.SysNotice;
/**
* 通知公告表 数据层
diff --git a/ard-system/src/main/java/com/ard/system/mapper/system/SysOperLogMapper.java b/ard-system/src/main/java/com/ard/system/system/mapper/SysOperLogMapper.java
similarity index 91%
rename from ard-system/src/main/java/com/ard/system/mapper/system/SysOperLogMapper.java
rename to ard-system/src/main/java/com/ard/system/system/mapper/SysOperLogMapper.java
index b9b8bb6..63f3fdd 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/system/SysOperLogMapper.java
+++ b/ard-system/src/main/java/com/ard/system/system/mapper/SysOperLogMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.mapper.system;
+package com.ard.system.system.mapper;
import java.util.List;
-import com.ard.system.domain.system.SysOperLog;
+import com.ard.system.system.domain.SysOperLog;
/**
* 操作日志 数据层
diff --git a/ard-system/src/main/java/com/ard/system/mapper/system/SysPostMapper.java b/ard-system/src/main/java/com/ard/system/system/mapper/SysPostMapper.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/mapper/system/SysPostMapper.java
rename to ard-system/src/main/java/com/ard/system/system/mapper/SysPostMapper.java
index dc97602..372a077 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/system/SysPostMapper.java
+++ b/ard-system/src/main/java/com/ard/system/system/mapper/SysPostMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.mapper.system;
+package com.ard.system.system.mapper;
import java.util.List;
-import com.ard.system.domain.system.SysPost;
+import com.ard.system.system.domain.SysPost;
/**
* 岗位信息 数据层
diff --git a/ard-system/src/main/java/com/ard/system/mapper/system/SysRoleDeptMapper.java b/ard-system/src/main/java/com/ard/system/system/mapper/SysRoleDeptMapper.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/system/mapper/system/SysRoleDeptMapper.java
rename to ard-system/src/main/java/com/ard/system/system/mapper/SysRoleDeptMapper.java
index 6891bb5..a462968 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/system/SysRoleDeptMapper.java
+++ b/ard-system/src/main/java/com/ard/system/system/mapper/SysRoleDeptMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.mapper.system;
+package com.ard.system.system.mapper;
import java.util.List;
-import com.ard.system.domain.system.SysRoleDept;
+import com.ard.system.system.domain.SysRoleDept;
/**
* 角色与部门关联表 数据层
diff --git a/ard-system/src/main/java/com/ard/system/mapper/system/SysRoleMapper.java b/ard-system/src/main/java/com/ard/system/system/mapper/SysRoleMapper.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/mapper/system/SysRoleMapper.java
rename to ard-system/src/main/java/com/ard/system/system/mapper/SysRoleMapper.java
index e757017..6205b00 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/system/SysRoleMapper.java
+++ b/ard-system/src/main/java/com/ard/system/system/mapper/SysRoleMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.mapper.system;
+package com.ard.system.system.mapper;
import java.util.List;
import com.ard.common.core.domain.entity.SysRole;
diff --git a/ard-system/src/main/java/com/ard/system/mapper/system/SysRoleMenuMapper.java b/ard-system/src/main/java/com/ard/system/system/mapper/SysRoleMenuMapper.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/system/mapper/system/SysRoleMenuMapper.java
rename to ard-system/src/main/java/com/ard/system/system/mapper/SysRoleMenuMapper.java
index 9375625..145cfda 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/system/SysRoleMenuMapper.java
+++ b/ard-system/src/main/java/com/ard/system/system/mapper/SysRoleMenuMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.mapper.system;
+package com.ard.system.system.mapper;
import java.util.List;
-import com.ard.system.domain.system.SysRoleMenu;
+import com.ard.system.system.domain.SysRoleMenu;
/**
* 角色与菜单关联表 数据层
diff --git a/ard-system/src/main/java/com/ard/system/mapper/system/SysUserMapper.java b/ard-system/src/main/java/com/ard/system/system/mapper/SysUserMapper.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/mapper/system/SysUserMapper.java
rename to ard-system/src/main/java/com/ard/system/system/mapper/SysUserMapper.java
index cd5d106..4eb73ef 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/system/SysUserMapper.java
+++ b/ard-system/src/main/java/com/ard/system/system/mapper/SysUserMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.mapper.system;
+package com.ard.system.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
diff --git a/ard-system/src/main/java/com/ard/system/mapper/system/SysUserPostMapper.java b/ard-system/src/main/java/com/ard/system/system/mapper/SysUserPostMapper.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/system/mapper/system/SysUserPostMapper.java
rename to ard-system/src/main/java/com/ard/system/system/mapper/SysUserPostMapper.java
index c1b452c..fd7a5aa 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/system/SysUserPostMapper.java
+++ b/ard-system/src/main/java/com/ard/system/system/mapper/SysUserPostMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.mapper.system;
+package com.ard.system.system.mapper;
import java.util.List;
-import com.ard.system.domain.system.SysUserPost;
+import com.ard.system.system.domain.SysUserPost;
/**
* 用户与岗位关联表 数据层
diff --git a/ard-system/src/main/java/com/ard/system/mapper/system/SysUserRoleMapper.java b/ard-system/src/main/java/com/ard/system/system/mapper/SysUserRoleMapper.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/system/mapper/system/SysUserRoleMapper.java
rename to ard-system/src/main/java/com/ard/system/system/mapper/SysUserRoleMapper.java
index a45be86..a8be408 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/system/SysUserRoleMapper.java
+++ b/ard-system/src/main/java/com/ard/system/system/mapper/SysUserRoleMapper.java
@@ -1,8 +1,8 @@
-package com.ard.system.mapper.system;
+package com.ard.system.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
-import com.ard.system.domain.system.SysUserRole;
+import com.ard.system.system.domain.SysUserRole;
/**
* 用户与角色关联表 数据层
diff --git a/ard-system/src/main/java/com/ard/system/service/system/ISysConfigService.java b/ard-system/src/main/java/com/ard/system/system/service/ISysConfigService.java
similarity index 94%
rename from ard-system/src/main/java/com/ard/system/service/system/ISysConfigService.java
rename to ard-system/src/main/java/com/ard/system/system/service/ISysConfigService.java
index 13d3281..80ccd04 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/ISysConfigService.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/ISysConfigService.java
@@ -1,7 +1,7 @@
-package com.ard.system.service.system;
+package com.ard.system.system.service;
import java.util.List;
-import com.ard.system.domain.system.SysConfig;
+import com.ard.system.system.domain.SysConfig;
/**
* 参数配置 服务层
diff --git a/ard-system/src/main/java/com/ard/system/service/system/ISysDeptService.java b/ard-system/src/main/java/com/ard/system/system/service/ISysDeptService.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/service/system/ISysDeptService.java
rename to ard-system/src/main/java/com/ard/system/system/service/ISysDeptService.java
index d7bfc76..fbf5a26 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/ISysDeptService.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/ISysDeptService.java
@@ -1,4 +1,4 @@
-package com.ard.system.service.system;
+package com.ard.system.system.service;
import java.util.List;
import com.ard.common.core.domain.TreeSelect;
diff --git a/ard-system/src/main/java/com/ard/system/service/system/ISysDictDataService.java b/ard-system/src/main/java/com/ard/system/system/service/ISysDictDataService.java
similarity index 96%
rename from ard-system/src/main/java/com/ard/system/service/system/ISysDictDataService.java
rename to ard-system/src/main/java/com/ard/system/system/service/ISysDictDataService.java
index 2e707da..72d85a2 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/ISysDictDataService.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/ISysDictDataService.java
@@ -1,4 +1,4 @@
-package com.ard.system.service.system;
+package com.ard.system.system.service;
import java.util.List;
import com.ard.common.core.domain.entity.SysDictData;
diff --git a/ard-system/src/main/java/com/ard/system/service/system/ISysDictTypeService.java b/ard-system/src/main/java/com/ard/system/system/service/ISysDictTypeService.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/service/system/ISysDictTypeService.java
rename to ard-system/src/main/java/com/ard/system/system/service/ISysDictTypeService.java
index 93ab48e..518e51f 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/ISysDictTypeService.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/ISysDictTypeService.java
@@ -1,4 +1,4 @@
-package com.ard.system.service.system;
+package com.ard.system.system.service;
import java.util.List;
import com.ard.common.core.domain.entity.SysDictData;
diff --git a/ard-system/src/main/java/com/ard/system/service/system/ISysLogininforService.java b/ard-system/src/main/java/com/ard/system/system/service/ISysLogininforService.java
similarity index 89%
rename from ard-system/src/main/java/com/ard/system/service/system/ISysLogininforService.java
rename to ard-system/src/main/java/com/ard/system/system/service/ISysLogininforService.java
index 18b99d8..52a21f9 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/ISysLogininforService.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/ISysLogininforService.java
@@ -1,7 +1,7 @@
-package com.ard.system.service.system;
+package com.ard.system.system.service;
import java.util.List;
-import com.ard.system.domain.system.SysLogininfor;
+import com.ard.system.system.domain.SysLogininfor;
/**
* 系统访问日志情况信息 服务层
diff --git a/ard-system/src/main/java/com/ard/system/service/system/ISysMenuService.java b/ard-system/src/main/java/com/ard/system/system/service/ISysMenuService.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/service/system/ISysMenuService.java
rename to ard-system/src/main/java/com/ard/system/system/service/ISysMenuService.java
index 2a3353e..ca63d7d 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/ISysMenuService.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/ISysMenuService.java
@@ -1,10 +1,10 @@
-package com.ard.system.service.system;
+package com.ard.system.system.service;
import java.util.List;
import java.util.Set;
import com.ard.common.core.domain.TreeSelect;
import com.ard.common.core.domain.entity.SysMenu;
-import com.ard.system.domain.vo.RouterVo;
+import com.ard.system.system.vo.RouterVo;
/**
* 菜单 业务层
diff --git a/ard-system/src/main/java/com/ard/system/service/system/ISysNoticeService.java b/ard-system/src/main/java/com/ard/system/system/service/ISysNoticeService.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/system/service/system/ISysNoticeService.java
rename to ard-system/src/main/java/com/ard/system/system/service/ISysNoticeService.java
index 1893c19..7b2d203 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/ISysNoticeService.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/ISysNoticeService.java
@@ -1,7 +1,7 @@
-package com.ard.system.service.system;
+package com.ard.system.system.service;
import java.util.List;
-import com.ard.system.domain.system.SysNotice;
+import com.ard.system.system.domain.SysNotice;
/**
* 公告 服务层
diff --git a/ard-system/src/main/java/com/ard/system/service/system/ISysOperLogService.java b/ard-system/src/main/java/com/ard/system/system/service/ISysOperLogService.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/system/service/system/ISysOperLogService.java
rename to ard-system/src/main/java/com/ard/system/system/service/ISysOperLogService.java
index 2ec2fb9..3326b3c 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/ISysOperLogService.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/ISysOperLogService.java
@@ -1,7 +1,7 @@
-package com.ard.system.service.system;
+package com.ard.system.system.service;
import java.util.List;
-import com.ard.system.domain.system.SysOperLog;
+import com.ard.system.system.domain.SysOperLog;
/**
* 操作日志 服务层
diff --git a/ard-system/src/main/java/com/ard/system/service/system/ISysPostService.java b/ard-system/src/main/java/com/ard/system/system/service/ISysPostService.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/service/system/ISysPostService.java
rename to ard-system/src/main/java/com/ard/system/system/service/ISysPostService.java
index bac16c1..dd30b10 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/ISysPostService.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/ISysPostService.java
@@ -1,7 +1,7 @@
-package com.ard.system.service.system;
+package com.ard.system.system.service;
import java.util.List;
-import com.ard.system.domain.system.SysPost;
+import com.ard.system.system.domain.SysPost;
/**
* 岗位信息 服务层
diff --git a/ard-system/src/main/java/com/ard/system/service/system/ISysRoleService.java b/ard-system/src/main/java/com/ard/system/system/service/ISysRoleService.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/service/system/ISysRoleService.java
rename to ard-system/src/main/java/com/ard/system/system/service/ISysRoleService.java
index 944cab6..77fce4a 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/ISysRoleService.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/ISysRoleService.java
@@ -1,9 +1,9 @@
-package com.ard.system.service.system;
+package com.ard.system.system.service;
import java.util.List;
import java.util.Set;
import com.ard.common.core.domain.entity.SysRole;
-import com.ard.system.domain.system.SysUserRole;
+import com.ard.system.system.domain.SysUserRole;
/**
* 角色业务层
diff --git a/ard-system/src/main/java/com/ard/system/service/system/ISysUserOnlineService.java b/ard-system/src/main/java/com/ard/system/system/service/ISysUserOnlineService.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/system/service/system/ISysUserOnlineService.java
rename to ard-system/src/main/java/com/ard/system/system/service/ISysUserOnlineService.java
index 1fe515d..113ad86 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/ISysUserOnlineService.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/ISysUserOnlineService.java
@@ -1,7 +1,7 @@
-package com.ard.system.service.system;
+package com.ard.system.system.service;
import com.ard.common.core.domain.model.LoginUser;
-import com.ard.system.domain.system.SysUserOnline;
+import com.ard.system.system.domain.SysUserOnline;
/**
* 在线用户 服务层
diff --git a/ard-system/src/main/java/com/ard/system/service/system/ISysUserService.java b/ard-system/src/main/java/com/ard/system/system/service/ISysUserService.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/service/system/ISysUserService.java
rename to ard-system/src/main/java/com/ard/system/system/service/ISysUserService.java
index f3adaa3..35c6d00 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/ISysUserService.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/ISysUserService.java
@@ -1,4 +1,4 @@
-package com.ard.system.service.system;
+package com.ard.system.system.service;
import java.util.List;
import com.ard.common.core.domain.entity.SysUser;
diff --git a/ard-system/src/main/java/com/ard/system/service/system/impl/SysConfigServiceImpl.java b/ard-system/src/main/java/com/ard/system/system/service/impl/SysConfigServiceImpl.java
similarity index 96%
rename from ard-system/src/main/java/com/ard/system/service/system/impl/SysConfigServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/system/service/impl/SysConfigServiceImpl.java
index 8c8e7a6..6c88703 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/impl/SysConfigServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/impl/SysConfigServiceImpl.java
@@ -1,10 +1,10 @@
-package com.ard.system.service.system.impl;
+package com.ard.system.system.service.impl;
import java.util.Collection;
import java.util.List;
import javax.annotation.PostConstruct;
-import com.ard.system.service.system.ISysConfigService;
+import com.ard.system.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.common.annotation.DataSource;
@@ -15,8 +15,8 @@
import com.ard.common.enums.DataSourceType;
import com.ard.common.exception.ServiceException;
import com.ard.common.utils.StringUtils;
-import com.ard.system.domain.system.SysConfig;
-import com.ard.system.mapper.system.SysConfigMapper;
+import com.ard.system.system.domain.SysConfig;
+import com.ard.system.system.mapper.SysConfigMapper;
/**
* 参数配置 服务层实现
diff --git a/ard-system/src/main/java/com/ard/system/service/system/impl/SysDeptServiceImpl.java b/ard-system/src/main/java/com/ard/system/system/service/impl/SysDeptServiceImpl.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/service/system/impl/SysDeptServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/system/service/impl/SysDeptServiceImpl.java
index 47b55ef..1e137a2 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/impl/SysDeptServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/impl/SysDeptServiceImpl.java
@@ -1,11 +1,11 @@
-package com.ard.system.service.system.impl;
+package com.ard.system.system.service.impl;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
-import com.ard.system.service.system.ISysDeptService;
+import com.ard.system.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.common.annotation.DataScope;
@@ -19,8 +19,8 @@
import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.StringUtils;
import com.ard.common.utils.spring.SpringUtils;
-import com.ard.system.mapper.system.SysDeptMapper;
-import com.ard.system.mapper.system.SysRoleMapper;
+import com.ard.system.system.mapper.SysDeptMapper;
+import com.ard.system.system.mapper.SysRoleMapper;
/**
* 部门管理 服务实现
diff --git a/ard-system/src/main/java/com/ard/system/service/system/impl/SysDictDataServiceImpl.java b/ard-system/src/main/java/com/ard/system/system/service/impl/SysDictDataServiceImpl.java
similarity index 94%
rename from ard-system/src/main/java/com/ard/system/service/system/impl/SysDictDataServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/system/service/impl/SysDictDataServiceImpl.java
index 8451a57..8c0cbd4 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/impl/SysDictDataServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/impl/SysDictDataServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ard.system.service.system.impl;
+package com.ard.system.system.service.impl;
import java.util.List;
-import com.ard.system.service.system.ISysDictDataService;
+import com.ard.system.system.service.ISysDictDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.common.core.domain.entity.SysDictData;
import com.ard.common.utils.DictUtils;
-import com.ard.system.mapper.system.SysDictDataMapper;
+import com.ard.system.system.mapper.SysDictDataMapper;
/**
* 字典 业务层处理
diff --git a/ard-system/src/main/java/com/ard/system/service/system/impl/SysDictTypeServiceImpl.java b/ard-system/src/main/java/com/ard/system/system/service/impl/SysDictTypeServiceImpl.java
similarity index 96%
rename from ard-system/src/main/java/com/ard/system/service/system/impl/SysDictTypeServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/system/service/impl/SysDictTypeServiceImpl.java
index f4ea582..b2a80d3 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/impl/SysDictTypeServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/impl/SysDictTypeServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ard.system.service.system.impl;
+package com.ard.system.system.service.impl;
import java.util.Comparator;
import java.util.List;
@@ -6,7 +6,7 @@
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
-import com.ard.system.service.system.ISysDictTypeService;
+import com.ard.system.system.service.ISysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -16,8 +16,8 @@
import com.ard.common.exception.ServiceException;
import com.ard.common.utils.DictUtils;
import com.ard.common.utils.StringUtils;
-import com.ard.system.mapper.system.SysDictDataMapper;
-import com.ard.system.mapper.system.SysDictTypeMapper;
+import com.ard.system.system.mapper.SysDictDataMapper;
+import com.ard.system.system.mapper.SysDictTypeMapper;
/**
* 字典 业务层处理
diff --git a/ard-system/src/main/java/com/ard/system/service/system/impl/SysLogininforServiceImpl.java b/ard-system/src/main/java/com/ard/system/system/service/impl/SysLogininforServiceImpl.java
similarity index 86%
rename from ard-system/src/main/java/com/ard/system/service/system/impl/SysLogininforServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/system/service/impl/SysLogininforServiceImpl.java
index 8b11771..a485286 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/impl/SysLogininforServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/impl/SysLogininforServiceImpl.java
@@ -1,12 +1,12 @@
-package com.ard.system.service.system.impl;
+package com.ard.system.system.service.impl;
import java.util.List;
-import com.ard.system.service.system.ISysLogininforService;
+import com.ard.system.system.service.ISysLogininforService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ard.system.domain.system.SysLogininfor;
-import com.ard.system.mapper.system.SysLogininforMapper;
+import com.ard.system.system.domain.SysLogininfor;
+import com.ard.system.system.mapper.SysLogininforMapper;
/**
* 系统访问日志情况信息 服务层处理
diff --git a/ard-system/src/main/java/com/ard/system/service/system/impl/SysMenuServiceImpl.java b/ard-system/src/main/java/com/ard/system/system/service/impl/SysMenuServiceImpl.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/service/system/impl/SysMenuServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/system/service/impl/SysMenuServiceImpl.java
index d76e861..d1ffcdc 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/impl/SysMenuServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/impl/SysMenuServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ard.system.service.system.impl;
+package com.ard.system.system.service.impl;
import java.util.ArrayList;
import java.util.Arrays;
@@ -9,7 +9,7 @@
import java.util.Set;
import java.util.stream.Collectors;
-import com.ard.system.service.system.ISysMenuService;
+import com.ard.system.system.service.ISysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.common.constant.Constants;
@@ -20,11 +20,11 @@
import com.ard.common.core.domain.entity.SysUser;
import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.StringUtils;
-import com.ard.system.domain.vo.MetaVo;
-import com.ard.system.domain.vo.RouterVo;
-import com.ard.system.mapper.system.SysMenuMapper;
-import com.ard.system.mapper.system.SysRoleMapper;
-import com.ard.system.mapper.system.SysRoleMenuMapper;
+import com.ard.system.system.vo.MetaVo;
+import com.ard.system.system.vo.RouterVo;
+import com.ard.system.system.mapper.SysMenuMapper;
+import com.ard.system.system.mapper.SysRoleMapper;
+import com.ard.system.system.mapper.SysRoleMenuMapper;
/**
* 菜单 业务层处理
diff --git a/ard-system/src/main/java/com/ard/system/service/system/impl/SysNoticeServiceImpl.java b/ard-system/src/main/java/com/ard/system/system/service/impl/SysNoticeServiceImpl.java
similarity index 89%
rename from ard-system/src/main/java/com/ard/system/service/system/impl/SysNoticeServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/system/service/impl/SysNoticeServiceImpl.java
index 97f5620..7c3374f 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/impl/SysNoticeServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/impl/SysNoticeServiceImpl.java
@@ -1,12 +1,12 @@
-package com.ard.system.service.system.impl;
+package com.ard.system.system.service.impl;
import java.util.List;
-import com.ard.system.service.system.ISysNoticeService;
+import com.ard.system.system.service.ISysNoticeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ard.system.domain.system.SysNotice;
-import com.ard.system.mapper.system.SysNoticeMapper;
+import com.ard.system.system.domain.SysNotice;
+import com.ard.system.system.mapper.SysNoticeMapper;
/**
* 公告 服务层实现
diff --git a/ard-system/src/main/java/com/ard/system/service/system/impl/SysOperLogServiceImpl.java b/ard-system/src/main/java/com/ard/system/system/service/impl/SysOperLogServiceImpl.java
similarity index 87%
rename from ard-system/src/main/java/com/ard/system/service/system/impl/SysOperLogServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/system/service/impl/SysOperLogServiceImpl.java
index 9589070..b7ad135 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/impl/SysOperLogServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/impl/SysOperLogServiceImpl.java
@@ -1,12 +1,12 @@
-package com.ard.system.service.system.impl;
+package com.ard.system.system.service.impl;
import java.util.List;
-import com.ard.system.service.system.ISysOperLogService;
+import com.ard.system.system.service.ISysOperLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ard.system.domain.system.SysOperLog;
-import com.ard.system.mapper.system.SysOperLogMapper;
+import com.ard.system.system.domain.SysOperLog;
+import com.ard.system.system.mapper.SysOperLogMapper;
/**
* 操作日志 服务层处理
diff --git a/ard-system/src/main/java/com/ard/system/service/system/impl/SysPostServiceImpl.java b/ard-system/src/main/java/com/ard/system/system/service/impl/SysPostServiceImpl.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/system/service/system/impl/SysPostServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/system/service/impl/SysPostServiceImpl.java
index ce82715..cd2ad3f 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/impl/SysPostServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/impl/SysPostServiceImpl.java
@@ -1,16 +1,16 @@
-package com.ard.system.service.system.impl;
+package com.ard.system.system.service.impl;
import java.util.List;
-import com.ard.system.service.system.ISysPostService;
+import com.ard.system.system.service.ISysPostService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.common.constant.UserConstants;
import com.ard.common.exception.ServiceException;
import com.ard.common.utils.StringUtils;
-import com.ard.system.domain.system.SysPost;
-import com.ard.system.mapper.system.SysPostMapper;
-import com.ard.system.mapper.system.SysUserPostMapper;
+import com.ard.system.system.domain.SysPost;
+import com.ard.system.system.mapper.SysPostMapper;
+import com.ard.system.system.mapper.SysUserPostMapper;
/**
* 岗位信息 服务层处理
diff --git a/ard-system/src/main/java/com/ard/system/service/system/impl/SysRoleServiceImpl.java b/ard-system/src/main/java/com/ard/system/system/service/impl/SysRoleServiceImpl.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/service/system/impl/SysRoleServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/system/service/impl/SysRoleServiceImpl.java
index 50a9e49..9bba1b9 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/impl/SysRoleServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/impl/SysRoleServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ard.system.service.system.impl;
+package com.ard.system.system.service.impl;
import java.util.ArrayList;
import java.util.Arrays;
@@ -6,7 +6,7 @@
import java.util.List;
import java.util.Set;
-import com.ard.system.service.system.ISysRoleService;
+import com.ard.system.system.service.ISysRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -18,13 +18,13 @@
import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.StringUtils;
import com.ard.common.utils.spring.SpringUtils;
-import com.ard.system.domain.system.SysRoleDept;
-import com.ard.system.domain.system.SysRoleMenu;
-import com.ard.system.domain.system.SysUserRole;
-import com.ard.system.mapper.system.SysRoleDeptMapper;
-import com.ard.system.mapper.system.SysRoleMapper;
-import com.ard.system.mapper.system.SysRoleMenuMapper;
-import com.ard.system.mapper.system.SysUserRoleMapper;
+import com.ard.system.system.domain.SysRoleDept;
+import com.ard.system.system.domain.SysRoleMenu;
+import com.ard.system.system.domain.SysUserRole;
+import com.ard.system.system.mapper.SysRoleDeptMapper;
+import com.ard.system.system.mapper.SysRoleMapper;
+import com.ard.system.system.mapper.SysRoleMenuMapper;
+import com.ard.system.system.mapper.SysUserRoleMapper;
/**
* 角色 业务层处理
diff --git a/ard-system/src/main/java/com/ard/system/service/system/impl/SysUserOnlineServiceImpl.java b/ard-system/src/main/java/com/ard/system/system/service/impl/SysUserOnlineServiceImpl.java
similarity index 94%
rename from ard-system/src/main/java/com/ard/system/service/system/impl/SysUserOnlineServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/system/service/impl/SysUserOnlineServiceImpl.java
index 8801250..e70b2de 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/impl/SysUserOnlineServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/impl/SysUserOnlineServiceImpl.java
@@ -1,10 +1,10 @@
-package com.ard.system.service.system.impl;
+package com.ard.system.system.service.impl;
-import com.ard.system.service.system.ISysUserOnlineService;
+import com.ard.system.system.service.ISysUserOnlineService;
import org.springframework.stereotype.Service;
import com.ard.common.core.domain.model.LoginUser;
import com.ard.common.utils.StringUtils;
-import com.ard.system.domain.system.SysUserOnline;
+import com.ard.system.system.domain.SysUserOnline;
/**
* 在线用户 服务层处理
diff --git a/ard-system/src/main/java/com/ard/system/service/system/impl/SysUserServiceImpl.java b/ard-system/src/main/java/com/ard/system/system/service/impl/SysUserServiceImpl.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/service/system/impl/SysUserServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/system/service/impl/SysUserServiceImpl.java
index 151afb8..fc91016 100644
--- a/ard-system/src/main/java/com/ard/system/service/system/impl/SysUserServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/system/service/impl/SysUserServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ard.system.service.system.impl;
+package com.ard.system.system.service.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import javax.validation.Validator;
-import com.ard.system.service.system.ISysConfigService;
-import com.ard.system.service.system.ISysDeptService;
-import com.ard.system.service.system.ISysUserService;
+import com.ard.system.system.service.ISysConfigService;
+import com.ard.system.system.service.ISysDeptService;
+import com.ard.system.system.service.ISysUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,14 +23,14 @@
import com.ard.common.utils.StringUtils;
import com.ard.common.utils.bean.BeanValidators;
import com.ard.common.utils.spring.SpringUtils;
-import com.ard.system.domain.system.SysPost;
-import com.ard.system.domain.system.SysUserPost;
-import com.ard.system.domain.system.SysUserRole;
-import com.ard.system.mapper.system.SysPostMapper;
-import com.ard.system.mapper.system.SysRoleMapper;
-import com.ard.system.mapper.system.SysUserMapper;
-import com.ard.system.mapper.system.SysUserPostMapper;
-import com.ard.system.mapper.system.SysUserRoleMapper;
+import com.ard.system.system.domain.SysPost;
+import com.ard.system.system.domain.SysUserPost;
+import com.ard.system.system.domain.SysUserRole;
+import com.ard.system.system.mapper.SysPostMapper;
+import com.ard.system.system.mapper.SysRoleMapper;
+import com.ard.system.system.mapper.SysUserMapper;
+import com.ard.system.system.mapper.SysUserPostMapper;
+import com.ard.system.system.mapper.SysUserRoleMapper;
/**
* 用户 业务层处理
diff --git a/ard-system/src/main/java/com/ard/system/domain/vo/MetaVo.java b/ard-system/src/main/java/com/ard/system/system/vo/MetaVo.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/domain/vo/MetaVo.java
rename to ard-system/src/main/java/com/ard/system/system/vo/MetaVo.java
index cf24099..1162cb6 100644
--- a/ard-system/src/main/java/com/ard/system/domain/vo/MetaVo.java
+++ b/ard-system/src/main/java/com/ard/system/system/vo/MetaVo.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.vo;
+package com.ard.system.system.vo;
import com.ard.common.utils.StringUtils;
diff --git a/ard-system/src/main/java/com/ard/system/domain/vo/RouterVo.java b/ard-system/src/main/java/com/ard/system/system/vo/RouterVo.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/domain/vo/RouterVo.java
rename to ard-system/src/main/java/com/ard/system/system/vo/RouterVo.java
index ea94ed6..076529c 100644
--- a/ard-system/src/main/java/com/ard/system/domain/vo/RouterVo.java
+++ b/ard-system/src/main/java/com/ard/system/system/vo/RouterVo.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain.vo;
+package com.ard.system.system.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
diff --git a/ard-system/src/main/resources/mapper/data/ArdMapManagementMapper.xml b/ard-system/src/main/resources/mapper/data/ArdMapManagementMapper.xml
index 3650021..0a55ac8 100644
--- a/ard-system/src/main/resources/mapper/data/ArdMapManagementMapper.xml
+++ b/ard-system/src/main/resources/mapper/data/ArdMapManagementMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.data.ArdMapManagementMapper">
+<mapper namespace="com.ard.system.data.mapper.ArdMapManagementMapper">
<resultMap type="ArdMapManagement" id="ArdMapManagementResult">
<result property="id" column="id" />
diff --git a/ard-system/src/main/resources/mapper/data/ArdModelManagementMapper.xml b/ard-system/src/main/resources/mapper/data/ArdModelManagementMapper.xml
index c0ea39b..16f924b 100644
--- a/ard-system/src/main/resources/mapper/data/ArdModelManagementMapper.xml
+++ b/ard-system/src/main/resources/mapper/data/ArdModelManagementMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.data.ArdModelManagementMapper">
+<mapper namespace="com.ard.system.data.mapper.ArdModelManagementMapper">
<resultMap type="ArdModelManagement" id="ArdModelManagementResult">
<result property="id" column="id" />
diff --git a/ard-system/src/main/resources/mapper/data/ArdTileManagementMapper.xml b/ard-system/src/main/resources/mapper/data/ArdTileManagementMapper.xml
index 3aecd68..596e99d 100644
--- a/ard-system/src/main/resources/mapper/data/ArdTileManagementMapper.xml
+++ b/ard-system/src/main/resources/mapper/data/ArdTileManagementMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.data.ArdTileManagementMapper">
+<mapper namespace="com.ard.system.data.mapper.ArdTileManagementMapper">
<resultMap type="ArdTileManagement" id="ArdTileManagementResult">
<result property="id" column="id" />
diff --git a/ard-system/src/main/resources/mapper/noflyzone/ArdNoFlyZoneMapper.xml b/ard-system/src/main/resources/mapper/noflyzone/ArdNoFlyZoneMapper.xml
index dca6c6c..e0673cb 100644
--- a/ard-system/src/main/resources/mapper/noflyzone/ArdNoFlyZoneMapper.xml
+++ b/ard-system/src/main/resources/mapper/noflyzone/ArdNoFlyZoneMapper.xml
@@ -2,12 +2,12 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.noflyzone.ArdNoFlyZoneMapper">
+<mapper namespace="com.ard.system.noflyzone.mapper.ArdNoFlyZoneMapper">
<resultMap type="ArdNoFlyZone" id="ArdNoFlyZoneResult">
<result property="id" column="id" />
<result property="name" column="name" />
- <result property="geojson" column="geojson" typeHandler="com.ard.system.domain.noflyzone.FeatureCollectionTypeHandler"/>
+ <result property="geojson" column="geojson" typeHandler="com.ard.system.noflyzone.domain.FeatureCollectionTypeHandler"/>
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
diff --git a/ard-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ard-system/src/main/resources/mapper/system/SysConfigMapper.xml
index b4f3144..ceae830 100644
--- a/ard-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.system.SysConfigMapper">
+<mapper namespace="com.ard.system.system.mapper.SysConfigMapper">
<resultMap type="SysConfig" id="SysConfigResult">
<id property="configId" column="config_id" />
diff --git a/ard-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ard-system/src/main/resources/mapper/system/SysDeptMapper.xml
index fd3836f..96a9fce 100644
--- a/ard-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.system.SysDeptMapper">
+<mapper namespace="com.ard.system.system.mapper.SysDeptMapper">
<resultMap type="SysDept" id="SysDeptResult">
<id property="deptId" column="dept_id" />
diff --git a/ard-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ard-system/src/main/resources/mapper/system/SysDictDataMapper.xml
index 7081f29..29e1af7 100644
--- a/ard-system/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.system.SysDictDataMapper">
+<mapper namespace="com.ard.system.system.mapper.SysDictDataMapper">
<resultMap type="SysDictData" id="SysDictDataResult">
<id property="dictCode" column="dict_code" />
diff --git a/ard-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ard-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
index 6787ea1..80da7d5 100644
--- a/ard-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.system.SysDictTypeMapper">
+<mapper namespace="com.ard.system.system.mapper.SysDictTypeMapper">
<resultMap type="SysDictType" id="SysDictTypeResult">
<id property="dictId" column="dict_id" />
diff --git a/ard-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ard-system/src/main/resources/mapper/system/SysLogininforMapper.xml
index 1607722..d94463f 100644
--- a/ard-system/src/main/resources/mapper/system/SysLogininforMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysLogininforMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.system.SysLogininforMapper">
+<mapper namespace="com.ard.system.system.mapper.SysLogininforMapper">
<resultMap type="SysLogininfor" id="SysLogininforResult">
<id property="infoId" column="info_id" />
diff --git a/ard-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ard-system/src/main/resources/mapper/system/SysMenuMapper.xml
index 73af4d7..f7c38c7 100644
--- a/ard-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.system.SysMenuMapper">
+<mapper namespace="com.ard.system.system.mapper.SysMenuMapper">
<resultMap type="SysMenu" id="SysMenuResult">
<id property="menuId" column="menu_id" />
diff --git a/ard-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ard-system/src/main/resources/mapper/system/SysNoticeMapper.xml
index db60b22..a998b45 100644
--- a/ard-system/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.system.SysNoticeMapper">
+<mapper namespace="com.ard.system.system.mapper.SysNoticeMapper">
<resultMap type="SysNotice" id="SysNoticeResult">
<result property="noticeId" column="notice_id" />
diff --git a/ard-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ard-system/src/main/resources/mapper/system/SysOperLogMapper.xml
index f5c00c3..2a5be82 100644
--- a/ard-system/src/main/resources/mapper/system/SysOperLogMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysOperLogMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.system.SysOperLogMapper">
+<mapper namespace="com.ard.system.system.mapper.SysOperLogMapper">
<resultMap type="SysOperLog" id="SysOperLogResult">
<id property="operId" column="oper_id" />
diff --git a/ard-system/src/main/resources/mapper/system/SysPostMapper.xml b/ard-system/src/main/resources/mapper/system/SysPostMapper.xml
index 957c099..a8578a5 100644
--- a/ard-system/src/main/resources/mapper/system/SysPostMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysPostMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.system.SysPostMapper">
+<mapper namespace="com.ard.system.system.mapper.SysPostMapper">
<resultMap type="SysPost" id="SysPostResult">
<id property="postId" column="post_id" />
diff --git a/ard-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ard-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
index 3f8df05..efd30c9 100644
--- a/ard-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.system.SysRoleDeptMapper">
+<mapper namespace="com.ard.system.system.mapper.SysRoleDeptMapper">
<resultMap type="SysRoleDept" id="SysRoleDeptResult">
<result property="roleId" column="role_id" />
diff --git a/ard-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ard-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 0fb44f9..9421f97 100644
--- a/ard-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.system.SysRoleMapper">
+<mapper namespace="com.ard.system.system.mapper.SysRoleMapper">
<resultMap type="SysRole" id="SysRoleResult">
<id property="roleId" column="role_id" />
diff --git a/ard-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ard-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
index ec5c618..466521c 100644
--- a/ard-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.system.SysRoleMenuMapper">
+<mapper namespace="com.ard.system.system.mapper.SysRoleMenuMapper">
<resultMap type="SysRoleMenu" id="SysRoleMenuResult">
<result property="roleId" column="role_id" />
diff --git a/ard-system/src/main/resources/mapper/system/SysUserMapper.xml b/ard-system/src/main/resources/mapper/system/SysUserMapper.xml
index 89cb757..17f20bd 100644
--- a/ard-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.system.SysUserMapper">
+<mapper namespace="com.ard.system.system.mapper.SysUserMapper">
<resultMap type="SysUser" id="SysUserResult">
<id property="userId" column="user_id" />
diff --git a/ard-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ard-system/src/main/resources/mapper/system/SysUserPostMapper.xml
index 41a5f7c..e288d20 100644
--- a/ard-system/src/main/resources/mapper/system/SysUserPostMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysUserPostMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.system.SysUserPostMapper">
+<mapper namespace="com.ard.system.system.mapper.SysUserPostMapper">
<resultMap type="SysUserPost" id="SysUserPostResult">
<result property="userId" column="user_id" />
diff --git a/ard-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ard-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
index 51b257b..74e017a 100644
--- a/ard-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.system.SysUserRoleMapper">
+<mapper namespace="com.ard.system.system.mapper.SysUserRoleMapper">
<resultMap type="SysUserRole" id="SysUserRoleResult">
<result property="userId" column="user_id" />
diff --git a/ard-work/src/main/java/com/ard/work/component/forest/MyAddressSource.java b/ard-work/src/main/java/com/ard/work/component/forest/MyAddressSource.java
index 1b1e497..079e96c 100644
--- a/ard-work/src/main/java/com/ard/work/component/forest/MyAddressSource.java
+++ b/ard-work/src/main/java/com/ard/work/component/forest/MyAddressSource.java
@@ -17,7 +17,7 @@
@Override
public ForestAddress getAddress(ForestRequest request) {
String serverKey = request.varAsString("serverId");
- ArdServerInfo serverInfo = ardServerService.selectArdServerManagementById(serverKey);
+ ArdServerInfo serverInfo = ardServerService.selectArdServerInfoById(serverKey);
// 返回 Forest 地址对象
return new ForestAddress(serverInfo.getHost(), serverInfo.getHttpPort());
}
diff --git a/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java b/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java
index 3a1ec4b..b161c81 100644
--- a/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java
+++ b/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java
@@ -140,7 +140,7 @@
@PostConstruct
public void initConnectServers() {
try {
- var serverList = ardServerService.selectArdServerManagementList(new ArdServerInfo()); // ← 从数据库查询所有服务器配置
+ var serverList = ardServerService.selectArdServerInfoList(new ArdServerInfo()); // ← 从数据库查询所有服务器配置
if (serverList == null || serverList.isEmpty()) {
log.warn("未在数据库中找到边缘服务器配置，跳过连接初始化");
return;
@@ -160,7 +160,7 @@
public void reconnectFailedServers() {
TyTcpServerCache.getTcpServerCacheMap().forEach((key, state) -> {
if (Boolean.FALSE.equals(state)) { // 连接失败的服务器
- ArdServerInfo serverInfo = ardServerService.selectArdServerManagementById(key);
+ ArdServerInfo serverInfo = ardServerService.selectArdServerInfoById(key);
if (serverInfo != null) {
connectServer(serverInfo);
}
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
index 6858383..2ec580b 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
@@ -98,7 +98,7 @@
*/
@Override
public List<BoxInfoReceiver> getBoxList() {
- List<ArdServerInfo> ardServerInfos = ardServerService.selectArdServerManagementList(new ArdServerInfo());
+ List<ArdServerInfo> ardServerInfos = ardServerService.selectArdServerInfoList(new ArdServerInfo());
return getBoxList(ardServerInfos);
}
diff --git a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
index c7f2d99..0a3a216 100644
--- a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ard.work.mapper.ArdDroneInfoMapper">
- <resultMap type="ArdDroneInfo" id="ArdDroneResult">
+ <resultMap type="ArdDroneInfo" id="ArdDroneInfoResult">
<result property="id" column="id" />
<result property="boxSn" column="box_sn" />
<result property="boxName" column="box_name" />
@@ -51,7 +51,7 @@
from ard_drone_info
</sql>
- <select id="selectArdDroneList" parameterType="ArdDroneInfo" resultMap="ArdDroneResult">
+ <select id="selectArdDroneList" parameterType="ArdDroneInfo" resultMap="ArdDroneInfoResult">
<include refid="selectArdDroneVo"/>
<where>
<if test="boxSn != null and boxSn != ''"> and box_sn = #{boxSn}</if>
@@ -64,11 +64,11 @@
</where>
</select>
- <select id="selectArdDroneById" parameterType="String" resultMap="ArdDroneResult">
+ <select id="selectArdDroneById" parameterType="String" resultMap="ArdDroneInfoResult">
<include refid="selectArdDroneVo"/>
where id = #{id}
</select>
- <select id="selectArdDroneByBoxSn" parameterType="String" resultMap="ArdDroneResult">
+ <select id="selectArdDroneByBoxSn" parameterType="String" resultMap="ArdDroneInfoResult">
<include refid="selectArdDroneVo"/>
where box_sn = #{boxSn}
</select>
diff --git a/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
index f7022d2..a162d73 100644
--- a/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ard.work.mapper.ArdServerInfoMapper">
- <resultMap type="ArdServerInfo" id="ArdServerManagementResult">
+ <resultMap type="ArdServerInfo" id="ArdServerInfoResult">
<result property="id" column="id" />
<result property="serverName" column="server_name" />
<result property="host" column="host" />
--
Gitblit v1.9.3