From 37bba38bc0f583ceed7b4d97a4197140fadd9083 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Wed, 15 Oct 2025 09:23:53 +0800
Subject: [PATCH] 优化包结构
---
ard-framework/src/main/java/com/ard/framework/manager/factory/AsyncFactory.java | 8
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/data/domain/ArdModelManagement.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/mapper/SysRoleDeptMapper.java | 4
ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java | 2
ard-system/src/main/java/com/ard/system/service/ISysNoticeService.java | 4
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/service/impl/SysMenuServiceImpl.java | 14
ard-admin/src/main/java/com/ard/web/controller/system/SysNoticeController.java | 4
ard-system/src/main/java/com/ard/data/domain/ArdTileManagement.java | 2
ard-system/src/main/java/com/ard/data/mapper/ArdMapManagementMapper.java | 4
ard-system/src/main/java/com/ard/system/service/ISysOperLogService.java | 4
ard-system/src/main/java/com/ard/system/domain/SysCache.java | 2
ard-system/src/main/java/com/ard/system/service/ISysUserOnlineService.java | 4
ard-admin/src/main/java/com/ard/web/controller/system/SysDictTypeController.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysUserController.java | 8
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/mapper/SysPostMapper.java | 4
ard-system/src/main/java/com/ard/system/service/ISysDictTypeService.java | 2
ard-system/src/main/java/com/ard/data/service/impl/ArdMapManagementServiceImpl.java | 8
ard-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml | 2
ard-system/src/main/java/com/ard/data/mapper/ArdModelManagementMapper.java | 4
ard-admin/src/main/java/com/ard/web/controller/system/SysProfileController.java | 2
ard-admin/src/main/java/com/ard/web/controller/monitor/SysLogininforController.java | 4
ard-system/src/main/java/com/ard/system/service/impl/SysOperLogServiceImpl.java | 8
ard-system/src/main/java/com/ard/system/mapper/SysRoleMapper.java | 2
ard-system/src/main/java/com/ard/system/domain/SysPost.java | 2
ard-system/src/main/java/com/ard/system/mapper/SysUserPostMapper.java | 4
ard-system/src/main/resources/mapper/system/SysOperLogMapper.xml | 2
ard-admin/src/main/java/com/ard/web/controller/data/ArdMapManagementController.java | 4
ard-system/src/main/java/com/ard/system/mapper/SysUserMapper.java | 2
ard-system/src/main/java/com/ard/system/service/ISysDictDataService.java | 2
ard-system/src/main/java/com/ard/system/domain/SysLogininfor.java | 2
ard-system/src/main/java/com/ard/data/noflyzone/domain/FeatureCollection.java | 2
ard-system/src/main/java/com/ard/system/domain/SysConfig.java | 2
ard-framework/src/main/java/com/ard/framework/aspectj/LogAspect.java | 2
ard-system/src/main/java/com/ard/system/domain/SysUserRole.java | 2
ard-system/src/main/java/com/ard/data/noflyzone/mapper/ArdNoFlyZoneMapper.java | 4
ard-system/src/main/java/com/ard/system/vo/RouterVo.java | 2
ard-system/src/main/java/com/ard/data/noflyzone/service/IArdNoFlyZoneService.java | 4
ard-system/src/main/resources/mapper/system/SysPostMapper.xml | 2
ard-system/src/main/java/com/ard/system/service/impl/SysRoleServiceImpl.java | 18 +-
ard-system/src/main/java/com/ard/system/service/impl/SysConfigServiceImpl.java | 8
ard-admin/src/main/java/com/ard/web/controller/system/SysMenuController.java | 2
ard-system/src/main/java/com/ard/data/service/IArdModelManagementService.java | 4
ard-system/src/main/java/com/ard/system/mapper/SysDictDataMapper.java | 2
ard-system/src/main/java/com/ard/system/mapper/SysUserRoleMapper.java | 4
ard-system/src/main/java/com/ard/system/service/ISysConfigService.java | 4
ard-framework/src/main/java/com/ard/framework/web/service/SysLoginService.java | 4
ard-system/src/main/java/com/ard/system/mapper/SysNoticeMapper.java | 4
ard-system/src/main/java/com/ard/data/noflyzone/domain/FeatureCollectionTypeHandler.java | 2
ard-system/src/main/java/com/ard/system/service/impl/SysUserOnlineServiceImpl.java | 6
ard-system/src/main/java/com/ard/system/service/impl/SysDictDataServiceImpl.java | 6
ard-admin/src/main/java/com/ard/web/controller/system/SysConfigController.java | 4
ard-system/src/main/java/com/ard/system/service/ISysDeptService.java | 2
ard-system/src/main/java/com/ard/system/service/impl/SysDictTypeServiceImpl.java | 8
ard-system/src/main/java/com/ard/system/service/impl/SysPostServiceImpl.java | 10
ard-admin/src/main/java/com/ard/web/controller/system/SysPostController.java | 4
ard-system/src/main/java/com/ard/system/mapper/SysConfigMapper.java | 4
ard-system/src/main/resources/mapper/system/SysDictTypeMapper.xml | 2
ard-system/src/main/java/com/ard/data/mapper/ArdTileManagementMapper.java | 4
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/service/ISysMenuService.java | 4
ard-system/src/main/java/com/ard/system/domain/SysOperLog.java | 2
ard-system/src/main/java/com/ard/system/mapper/SysLogininforMapper.java | 4
ard-system/src/main/java/com/ard/system/domain/SysRoleMenu.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysDictDataController.java | 4
ard-admin/src/main/java/com/ard/web/controller/monitor/SysOperlogController.java | 4
ard-system/src/main/java/com/ard/system/domain/SysUserOnline.java | 2
ard-admin/src/main/java/com/ard/web/controller/data/ArdTileManagementController.java | 4
ard-system/src/main/java/com/ard/data/service/impl/ArdModelManagementServiceImpl.java | 8
ard-system/src/main/java/com/ard/data/service/IArdMapManagementService.java | 4
ard-system/src/main/java/com/ard/data/service/impl/ArdTileManagementServiceImpl.java | 8
ard-system/src/main/resources/mapper/system/SysRoleMapper.xml | 2
ard-system/src/main/java/com/ard/data/service/IArdTileManagementService.java | 4
ard-system/src/main/resources/mapper/system/SysDeptMapper.xml | 2
ard-system/src/main/java/com/ard/system/mapper/SysOperLogMapper.java | 4
ard-system/src/main/java/com/ard/data/domain/ArdMapManagement.java | 2
ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java | 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/vo/MetaVo.java | 2
ard-system/src/main/java/com/ard/system/domain/SysRoleDept.java | 2
ard-system/src/main/java/com/ard/system/service/ISysRoleService.java | 4
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java | 2
ard-system/src/main/java/com/ard/system/service/impl/SysLogininforServiceImpl.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/service/ISysPostService.java | 4
ard-system/src/main/resources/mapper/system/SysUserMapper.xml | 2
ard-system/src/main/java/com/ard/system/mapper/SysDictTypeMapper.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysRegisterController.java | 2
ard-system/src/main/java/com/ard/system/domain/SysNotice.java | 2
ard-system/src/main/java/com/ard/system/mapper/SysDeptMapper.java | 2
ard-system/src/main/java/com/ard/system/mapper/SysRoleMenuMapper.java | 4
ard-system/src/main/java/com/ard/system/service/ISysUserService.java | 2
ard-system/src/main/java/com/ard/system/service/impl/SysNoticeServiceImpl.java | 8
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/data/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java | 8
ard-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml | 2
ard-admin/src/main/java/com/ard/web/controller/monitor/SysUserOnlineController.java | 4
ard-system/src/main/java/com/ard/system/domain/SysUserPost.java | 2
ard-system/src/main/resources/mapper/noflyzone/ArdNoFlyZoneMapper.xml | 4
ard-system/src/main/java/com/ard/system/mapper/SysMenuMapper.java | 2
ard-system/src/main/java/com/ard/system/service/impl/SysDeptServiceImpl.java | 8
ard-system/src/main/java/com/ard/system/service/ISysLogininforService.java | 4
ard-system/src/main/java/com/ard/system/service/impl/SysUserServiceImpl.java | 24 +-
ard-system/src/main/resources/mapper/system/SysConfigMapper.xml | 2
117 files changed, 230 insertions(+), 230 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 ff92abc..f264278 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.system.service.ISysConfigService;
+import com.ard.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 7fc9ba8..b53f64e 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
@@ -3,8 +3,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
-import com.ard.system.data.domain.ArdMapManagement;
-import com.ard.system.data.service.IArdMapManagementService;
+import com.ard.data.domain.ArdMapManagement;
+import com.ard.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 9a1829b..272aced 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.data.domain.ArdModelManagement;
-import com.ard.system.data.service.IArdModelManagementService;
+import com.ard.data.domain.ArdModelManagement;
+import com.ard.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 27a195c..0c91912 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.noflyzone.domain.FeatureCollection;
+import com.ard.data.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.noflyzone.domain.ArdNoFlyZone;
-import com.ard.system.noflyzone.service.IArdNoFlyZoneService;
+import com.ard.data.noflyzone.domain.ArdNoFlyZone;
+import com.ard.data.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 0112a19..a656350 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.data.domain.ArdTileManagement;
-import com.ard.system.data.service.IArdTileManagementService;
+import com.ard.data.domain.ArdTileManagement;
+import com.ard.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 2ea707a..dec29e2 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.system.domain.SysCache;
+import com.ard.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 c6a6348..1cebd93 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.system.domain.SysLogininfor;
-import com.ard.system.system.service.ISysLogininforService;
+import com.ard.system.domain.SysLogininfor;
+import com.ard.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 a712cae..4343e17 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.system.domain.SysOperLog;
-import com.ard.system.system.service.ISysOperLogService;
+import com.ard.system.domain.SysOperLog;
+import com.ard.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 6165bae..3e7b2da 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.system.domain.SysUserOnline;
-import com.ard.system.system.service.ISysUserOnlineService;
+import com.ard.system.domain.SysUserOnline;
+import com.ard.system.service.ISysUserOnlineService;
/**
* 在线用户监控
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 fe5bda4..1e23abc 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.system.domain.SysConfig;
-import com.ard.system.system.service.ISysConfigService;
+import com.ard.system.domain.SysConfig;
+import com.ard.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 915e5bb..8414417 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.system.service.ISysDeptService;
+import com.ard.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 bbe2345..3f20dd7 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.system.service.ISysDictDataService;
-import com.ard.system.system.service.ISysDictTypeService;
+import com.ard.system.service.ISysDictDataService;
+import com.ard.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 73f6c5f..548d2bb 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.system.service.ISysDictTypeService;
+import com.ard.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 0a9558c..9ba7d34 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.system.service.ISysMenuService;
+import com.ard.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 474738c..d785d89 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.system.service.ISysMenuService;
+import com.ard.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 05ce741..13ea9b7 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.system.domain.SysNotice;
-import com.ard.system.system.service.ISysNoticeService;
+import com.ard.system.domain.SysNotice;
+import com.ard.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 11fd74a..5202be8 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.system.domain.SysPost;
-import com.ard.system.system.service.ISysPostService;
+import com.ard.system.domain.SysPost;
+import com.ard.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 b2925e1..572c205 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.system.service.ISysUserService;
+import com.ard.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 22295ee..95cb7f0 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.system.service.ISysConfigService;
+import com.ard.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 21d7b6a..749453c 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.system.domain.SysUserRole;
-import com.ard.system.system.service.ISysDeptService;
-import com.ard.system.system.service.ISysRoleService;
-import com.ard.system.system.service.ISysUserService;
+import com.ard.system.domain.SysUserRole;
+import com.ard.system.service.ISysDeptService;
+import com.ard.system.service.ISysRoleService;
+import com.ard.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 aec7efa..0b9de9b 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.system.service.ISysDeptService;
-import com.ard.system.system.service.ISysPostService;
-import com.ard.system.system.service.ISysRoleService;
-import com.ard.system.system.service.ISysUserService;
+import com.ard.system.service.ISysDeptService;
+import com.ard.system.service.ISysPostService;
+import com.ard.system.service.ISysRoleService;
+import com.ard.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 6ad5248..43e1fc4 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.system.domain.SysOperLog;
+import com.ard.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 52d8fb1..9c20c34 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.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 com.ard.system.domain.SysLogininfor;
+import com.ard.system.domain.SysOperLog;
+import com.ard.system.service.ISysLogininforService;
+import com.ard.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 c1bed8b..d7fec9a 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.system.service.ISysConfigService;
-import com.ard.system.system.service.ISysUserService;
+import com.ard.system.service.ISysConfigService;
+import com.ard.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 847af0c..2aa845b 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.system.service.ISysMenuService;
-import com.ard.system.system.service.ISysRoleService;
+import com.ard.system.service.ISysMenuService;
+import com.ard.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 4803db0..9aae269 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.system.service.ISysConfigService;
-import com.ard.system.system.service.ISysUserService;
+import com.ard.system.service.ISysConfigService;
+import com.ard.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 c80a31b..172ca65 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.system.service.ISysUserService;
+import com.ard.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 95572cb..f8494fc 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.system.service.ISysDeptService;
+import com.ard.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/data/domain/ArdMapManagement.java b/ard-system/src/main/java/com/ard/data/domain/ArdMapManagement.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/data/domain/ArdMapManagement.java
rename to ard-system/src/main/java/com/ard/data/domain/ArdMapManagement.java
index 721c245..b5b0fc0 100644
--- a/ard-system/src/main/java/com/ard/system/data/domain/ArdMapManagement.java
+++ b/ard-system/src/main/java/com/ard/data/domain/ArdMapManagement.java
@@ -1,4 +1,4 @@
-package com.ard.system.data.domain;
+package com.ard.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/data/domain/ArdModelManagement.java b/ard-system/src/main/java/com/ard/data/domain/ArdModelManagement.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/data/domain/ArdModelManagement.java
rename to ard-system/src/main/java/com/ard/data/domain/ArdModelManagement.java
index bc96943..a2267b5 100644
--- a/ard-system/src/main/java/com/ard/system/data/domain/ArdModelManagement.java
+++ b/ard-system/src/main/java/com/ard/data/domain/ArdModelManagement.java
@@ -1,4 +1,4 @@
-package com.ard.system.data.domain;
+package com.ard.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/data/domain/ArdTileManagement.java b/ard-system/src/main/java/com/ard/data/domain/ArdTileManagement.java
similarity index 96%
rename from ard-system/src/main/java/com/ard/system/data/domain/ArdTileManagement.java
rename to ard-system/src/main/java/com/ard/data/domain/ArdTileManagement.java
index a9b6ff2..321b41d 100644
--- a/ard-system/src/main/java/com/ard/system/data/domain/ArdTileManagement.java
+++ b/ard-system/src/main/java/com/ard/data/domain/ArdTileManagement.java
@@ -1,4 +1,4 @@
-package com.ard.system.data.domain;
+package com.ard.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/data/mapper/ArdMapManagementMapper.java b/ard-system/src/main/java/com/ard/data/mapper/ArdMapManagementMapper.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/system/data/mapper/ArdMapManagementMapper.java
rename to ard-system/src/main/java/com/ard/data/mapper/ArdMapManagementMapper.java
index 77d1e49..d3e8555 100644
--- a/ard-system/src/main/java/com/ard/system/data/mapper/ArdMapManagementMapper.java
+++ b/ard-system/src/main/java/com/ard/data/mapper/ArdMapManagementMapper.java
@@ -1,6 +1,6 @@
-package com.ard.system.data.mapper;
+package com.ard.data.mapper;
-import com.ard.system.data.domain.ArdMapManagement;
+import com.ard.data.domain.ArdMapManagement;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/system/data/mapper/ArdModelManagementMapper.java b/ard-system/src/main/java/com/ard/data/mapper/ArdModelManagementMapper.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/system/data/mapper/ArdModelManagementMapper.java
rename to ard-system/src/main/java/com/ard/data/mapper/ArdModelManagementMapper.java
index 06aa254..387cae0 100644
--- a/ard-system/src/main/java/com/ard/system/data/mapper/ArdModelManagementMapper.java
+++ b/ard-system/src/main/java/com/ard/data/mapper/ArdModelManagementMapper.java
@@ -1,6 +1,6 @@
-package com.ard.system.data.mapper;
+package com.ard.data.mapper;
-import com.ard.system.data.domain.ArdModelManagement;
+import com.ard.data.domain.ArdModelManagement;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/system/data/mapper/ArdTileManagementMapper.java b/ard-system/src/main/java/com/ard/data/mapper/ArdTileManagementMapper.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/system/data/mapper/ArdTileManagementMapper.java
rename to ard-system/src/main/java/com/ard/data/mapper/ArdTileManagementMapper.java
index b45d13d..85f912c 100644
--- a/ard-system/src/main/java/com/ard/system/data/mapper/ArdTileManagementMapper.java
+++ b/ard-system/src/main/java/com/ard/data/mapper/ArdTileManagementMapper.java
@@ -1,6 +1,6 @@
-package com.ard.system.data.mapper;
+package com.ard.data.mapper;
-import com.ard.system.data.domain.ArdTileManagement;
+import com.ard.data.domain.ArdTileManagement;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/system/noflyzone/domain/ArdNoFlyZone.java b/ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/system/noflyzone/domain/ArdNoFlyZone.java
rename to ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java
index 4705a16..ea87870 100644
--- a/ard-system/src/main/java/com/ard/system/noflyzone/domain/ArdNoFlyZone.java
+++ b/ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java
@@ -1,4 +1,4 @@
-package com.ard.system.noflyzone.domain;
+package com.ard.data.noflyzone.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/ard-system/src/main/java/com/ard/system/noflyzone/domain/FeatureCollection.java b/ard-system/src/main/java/com/ard/data/noflyzone/domain/FeatureCollection.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/system/noflyzone/domain/FeatureCollection.java
rename to ard-system/src/main/java/com/ard/data/noflyzone/domain/FeatureCollection.java
index 744f5ac..4caf0ba 100644
--- a/ard-system/src/main/java/com/ard/system/noflyzone/domain/FeatureCollection.java
+++ b/ard-system/src/main/java/com/ard/data/noflyzone/domain/FeatureCollection.java
@@ -1,4 +1,4 @@
-package com.ard.system.noflyzone.domain;
+package com.ard.data.noflyzone.domain;
import lombok.Data;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/system/noflyzone/domain/FeatureCollectionTypeHandler.java b/ard-system/src/main/java/com/ard/data/noflyzone/domain/FeatureCollectionTypeHandler.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/noflyzone/domain/FeatureCollectionTypeHandler.java
rename to ard-system/src/main/java/com/ard/data/noflyzone/domain/FeatureCollectionTypeHandler.java
index 2c988fd..888d20b 100644
--- a/ard-system/src/main/java/com/ard/system/noflyzone/domain/FeatureCollectionTypeHandler.java
+++ b/ard-system/src/main/java/com/ard/data/noflyzone/domain/FeatureCollectionTypeHandler.java
@@ -1,4 +1,4 @@
-package com.ard.system.noflyzone.domain;
+package com.ard.data.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/noflyzone/mapper/ArdNoFlyZoneMapper.java b/ard-system/src/main/java/com/ard/data/noflyzone/mapper/ArdNoFlyZoneMapper.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/system/noflyzone/mapper/ArdNoFlyZoneMapper.java
rename to ard-system/src/main/java/com/ard/data/noflyzone/mapper/ArdNoFlyZoneMapper.java
index 08b2515..0a0acc3 100644
--- a/ard-system/src/main/java/com/ard/system/noflyzone/mapper/ArdNoFlyZoneMapper.java
+++ b/ard-system/src/main/java/com/ard/data/noflyzone/mapper/ArdNoFlyZoneMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.noflyzone.mapper;
+package com.ard.data.noflyzone.mapper;
import java.util.List;
-import com.ard.system.noflyzone.domain.ArdNoFlyZone;
+import com.ard.data.noflyzone.domain.ArdNoFlyZone;
/**
* 禁飞区管理Mapper接口
diff --git a/ard-system/src/main/java/com/ard/system/noflyzone/service/IArdNoFlyZoneService.java b/ard-system/src/main/java/com/ard/data/noflyzone/service/IArdNoFlyZoneService.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/system/noflyzone/service/IArdNoFlyZoneService.java
rename to ard-system/src/main/java/com/ard/data/noflyzone/service/IArdNoFlyZoneService.java
index 577187b..4287024 100644
--- a/ard-system/src/main/java/com/ard/system/noflyzone/service/IArdNoFlyZoneService.java
+++ b/ard-system/src/main/java/com/ard/data/noflyzone/service/IArdNoFlyZoneService.java
@@ -1,7 +1,7 @@
-package com.ard.system.noflyzone.service;
+package com.ard.data.noflyzone.service;
import java.util.List;
-import com.ard.system.noflyzone.domain.ArdNoFlyZone;
+import com.ard.data.noflyzone.domain.ArdNoFlyZone;
/**
* 禁飞区管理Service接口
diff --git a/ard-system/src/main/java/com/ard/system/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java b/ard-system/src/main/java/com/ard/data/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java
similarity index 91%
rename from ard-system/src/main/java/com/ard/system/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java
rename to ard-system/src/main/java/com/ard/data/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java
index d198b9f..a2549c6 100644
--- a/ard-system/src/main/java/com/ard/system/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/data/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ard.system.noflyzone.service.impl;
+package com.ard.data.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.noflyzone.service.IArdNoFlyZoneService;
+import com.ard.data.noflyzone.service.IArdNoFlyZoneService;
import org.springframework.stereotype.Service;
-import com.ard.system.noflyzone.mapper.ArdNoFlyZoneMapper;
-import com.ard.system.noflyzone.domain.ArdNoFlyZone;
+import com.ard.data.noflyzone.mapper.ArdNoFlyZoneMapper;
+import com.ard.data.noflyzone.domain.ArdNoFlyZone;
import javax.annotation.Resource;
diff --git a/ard-system/src/main/java/com/ard/system/data/service/IArdMapManagementService.java b/ard-system/src/main/java/com/ard/data/service/IArdMapManagementService.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/system/data/service/IArdMapManagementService.java
rename to ard-system/src/main/java/com/ard/data/service/IArdMapManagementService.java
index ecc9a87..a141a13 100644
--- a/ard-system/src/main/java/com/ard/system/data/service/IArdMapManagementService.java
+++ b/ard-system/src/main/java/com/ard/data/service/IArdMapManagementService.java
@@ -1,6 +1,6 @@
-package com.ard.system.data.service;
+package com.ard.data.service;
-import com.ard.system.data.domain.ArdMapManagement;
+import com.ard.data.domain.ArdMapManagement;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/system/data/service/IArdModelManagementService.java b/ard-system/src/main/java/com/ard/data/service/IArdModelManagementService.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/system/data/service/IArdModelManagementService.java
rename to ard-system/src/main/java/com/ard/data/service/IArdModelManagementService.java
index f5d540a..718eeb5 100644
--- a/ard-system/src/main/java/com/ard/system/data/service/IArdModelManagementService.java
+++ b/ard-system/src/main/java/com/ard/data/service/IArdModelManagementService.java
@@ -1,6 +1,6 @@
-package com.ard.system.data.service;
+package com.ard.data.service;
-import com.ard.system.data.domain.ArdModelManagement;
+import com.ard.data.domain.ArdModelManagement;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/system/data/service/IArdTileManagementService.java b/ard-system/src/main/java/com/ard/data/service/IArdTileManagementService.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/system/data/service/IArdTileManagementService.java
rename to ard-system/src/main/java/com/ard/data/service/IArdTileManagementService.java
index 07be44e..8323d05 100644
--- a/ard-system/src/main/java/com/ard/system/data/service/IArdTileManagementService.java
+++ b/ard-system/src/main/java/com/ard/data/service/IArdTileManagementService.java
@@ -1,6 +1,6 @@
-package com.ard.system.data.service;
+package com.ard.data.service;
-import com.ard.system.data.domain.ArdTileManagement;
+import com.ard.data.domain.ArdTileManagement;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/system/data/service/impl/ArdMapManagementServiceImpl.java b/ard-system/src/main/java/com/ard/data/service/impl/ArdMapManagementServiceImpl.java
similarity index 91%
rename from ard-system/src/main/java/com/ard/system/data/service/impl/ArdMapManagementServiceImpl.java
rename to ard-system/src/main/java/com/ard/data/service/impl/ArdMapManagementServiceImpl.java
index ee692d8..d2e0f9f 100644
--- a/ard-system/src/main/java/com/ard/system/data/service/impl/ArdMapManagementServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/data/service/impl/ArdMapManagementServiceImpl.java
@@ -1,9 +1,9 @@
-package com.ard.system.data.service.impl;
+package com.ard.data.service.impl;
import com.ard.common.utils.uuid.IdUtils;
-import com.ard.system.data.domain.ArdMapManagement;
-import com.ard.system.data.mapper.ArdMapManagementMapper;
-import com.ard.system.data.service.IArdMapManagementService;
+import com.ard.data.domain.ArdMapManagement;
+import com.ard.data.mapper.ArdMapManagementMapper;
+import com.ard.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/data/service/impl/ArdModelManagementServiceImpl.java b/ard-system/src/main/java/com/ard/data/service/impl/ArdModelManagementServiceImpl.java
similarity index 91%
rename from ard-system/src/main/java/com/ard/system/data/service/impl/ArdModelManagementServiceImpl.java
rename to ard-system/src/main/java/com/ard/data/service/impl/ArdModelManagementServiceImpl.java
index c86d408..5f67652 100644
--- a/ard-system/src/main/java/com/ard/system/data/service/impl/ArdModelManagementServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/data/service/impl/ArdModelManagementServiceImpl.java
@@ -1,11 +1,11 @@
-package com.ard.system.data.service.impl;
+package com.ard.data.service.impl;
import java.util.List;
import com.ard.common.utils.uuid.IdUtils;
-import com.ard.system.data.domain.ArdModelManagement;
-import com.ard.system.data.mapper.ArdModelManagementMapper;
-import com.ard.system.data.service.IArdModelManagementService;
+import com.ard.data.domain.ArdModelManagement;
+import com.ard.data.mapper.ArdModelManagementMapper;
+import com.ard.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/data/service/impl/ArdTileManagementServiceImpl.java b/ard-system/src/main/java/com/ard/data/service/impl/ArdTileManagementServiceImpl.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/system/data/service/impl/ArdTileManagementServiceImpl.java
rename to ard-system/src/main/java/com/ard/data/service/impl/ArdTileManagementServiceImpl.java
index 4cb3128..26abf05 100644
--- a/ard-system/src/main/java/com/ard/system/data/service/impl/ArdTileManagementServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/data/service/impl/ArdTileManagementServiceImpl.java
@@ -1,11 +1,11 @@
-package com.ard.system.data.service.impl;
+package com.ard.data.service.impl;
import java.util.List;
import com.ard.common.utils.uuid.IdUtils;
-import com.ard.system.data.domain.ArdTileManagement;
-import com.ard.system.data.mapper.ArdTileManagementMapper;
-import com.ard.system.data.service.IArdTileManagementService;
+import com.ard.data.domain.ArdTileManagement;
+import com.ard.data.mapper.ArdTileManagementMapper;
+import com.ard.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/system/domain/SysCache.java b/ard-system/src/main/java/com/ard/system/domain/SysCache.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/system/domain/SysCache.java
rename to ard-system/src/main/java/com/ard/system/domain/SysCache.java
index 76478bc..7a556b8 100644
--- a/ard-system/src/main/java/com/ard/system/system/domain/SysCache.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysCache.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.domain;
+package com.ard.system.domain;
import com.ard.common.utils.StringUtils;
diff --git a/ard-system/src/main/java/com/ard/system/system/domain/SysConfig.java b/ard-system/src/main/java/com/ard/system/domain/SysConfig.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/system/domain/SysConfig.java
rename to ard-system/src/main/java/com/ard/system/domain/SysConfig.java
index 6daa7bb..3a432a4 100644
--- a/ard-system/src/main/java/com/ard/system/system/domain/SysConfig.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysConfig.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.domain;
+package com.ard.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
diff --git a/ard-system/src/main/java/com/ard/system/system/domain/SysLogininfor.java b/ard-system/src/main/java/com/ard/system/domain/SysLogininfor.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/system/domain/SysLogininfor.java
rename to ard-system/src/main/java/com/ard/system/domain/SysLogininfor.java
index d7d784d..f02267c 100644
--- a/ard-system/src/main/java/com/ard/system/system/domain/SysLogininfor.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysLogininfor.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.domain;
+package com.ard.system.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/ard-system/src/main/java/com/ard/system/system/domain/SysNotice.java b/ard-system/src/main/java/com/ard/system/domain/SysNotice.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/system/domain/SysNotice.java
rename to ard-system/src/main/java/com/ard/system/domain/SysNotice.java
index 9fb4d69..27b23ab 100644
--- a/ard-system/src/main/java/com/ard/system/system/domain/SysNotice.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysNotice.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.domain;
+package com.ard.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
diff --git a/ard-system/src/main/java/com/ard/system/system/domain/SysOperLog.java b/ard-system/src/main/java/com/ard/system/domain/SysOperLog.java
similarity index 99%
rename from ard-system/src/main/java/com/ard/system/system/domain/SysOperLog.java
rename to ard-system/src/main/java/com/ard/system/domain/SysOperLog.java
index 7af053c..0d4794f 100644
--- a/ard-system/src/main/java/com/ard/system/system/domain/SysOperLog.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysOperLog.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.domain;
+package com.ard.system.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/ard-system/src/main/java/com/ard/system/system/domain/SysPost.java b/ard-system/src/main/java/com/ard/system/domain/SysPost.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/system/domain/SysPost.java
rename to ard-system/src/main/java/com/ard/system/domain/SysPost.java
index cc63881..08dc845 100644
--- a/ard-system/src/main/java/com/ard/system/system/domain/SysPost.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysPost.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.domain;
+package com.ard.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
diff --git a/ard-system/src/main/java/com/ard/system/system/domain/SysRoleDept.java b/ard-system/src/main/java/com/ard/system/domain/SysRoleDept.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/system/domain/SysRoleDept.java
rename to ard-system/src/main/java/com/ard/system/domain/SysRoleDept.java
index ce109a6..e73c591 100644
--- a/ard-system/src/main/java/com/ard/system/system/domain/SysRoleDept.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysRoleDept.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.domain;
+package com.ard.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/system/domain/SysRoleMenu.java b/ard-system/src/main/java/com/ard/system/domain/SysRoleMenu.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/system/domain/SysRoleMenu.java
rename to ard-system/src/main/java/com/ard/system/domain/SysRoleMenu.java
index caf67db..1e9ef62 100644
--- a/ard-system/src/main/java/com/ard/system/system/domain/SysRoleMenu.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysRoleMenu.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.domain;
+package com.ard.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/system/domain/SysUserOnline.java b/ard-system/src/main/java/com/ard/system/domain/SysUserOnline.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/system/domain/SysUserOnline.java
rename to ard-system/src/main/java/com/ard/system/domain/SysUserOnline.java
index a359c6f..5ffe7c7 100644
--- a/ard-system/src/main/java/com/ard/system/system/domain/SysUserOnline.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysUserOnline.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.domain;
+package com.ard.system.domain;
/**
* 当前在线会话
diff --git a/ard-system/src/main/java/com/ard/system/system/domain/SysUserPost.java b/ard-system/src/main/java/com/ard/system/domain/SysUserPost.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/system/domain/SysUserPost.java
rename to ard-system/src/main/java/com/ard/system/domain/SysUserPost.java
index 70684cb..74cf441 100644
--- a/ard-system/src/main/java/com/ard/system/system/domain/SysUserPost.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysUserPost.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.domain;
+package com.ard.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/system/domain/SysUserRole.java b/ard-system/src/main/java/com/ard/system/domain/SysUserRole.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/system/domain/SysUserRole.java
rename to ard-system/src/main/java/com/ard/system/domain/SysUserRole.java
index d34bc8a..13176f0 100644
--- a/ard-system/src/main/java/com/ard/system/system/domain/SysUserRole.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysUserRole.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.domain;
+package com.ard.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/system/mapper/SysConfigMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysConfigMapper.java
similarity index 94%
rename from ard-system/src/main/java/com/ard/system/system/mapper/SysConfigMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/SysConfigMapper.java
index d942f5d..ba13619 100644
--- a/ard-system/src/main/java/com/ard/system/system/mapper/SysConfigMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysConfigMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.system.mapper;
+package com.ard.system.mapper;
import java.util.List;
-import com.ard.system.system.domain.SysConfig;
+import com.ard.system.domain.SysConfig;
/**
* 参数配置 数据层
diff --git a/ard-system/src/main/java/com/ard/system/system/mapper/SysDeptMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysDeptMapper.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/system/mapper/SysDeptMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/SysDeptMapper.java
index 905bbf6..6eaf635 100644
--- a/ard-system/src/main/java/com/ard/system/system/mapper/SysDeptMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysDeptMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.mapper;
+package com.ard.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
diff --git a/ard-system/src/main/java/com/ard/system/system/mapper/SysDictDataMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysDictDataMapper.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/system/mapper/SysDictDataMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/SysDictDataMapper.java
index d90e1b6..ab33e70 100644
--- a/ard-system/src/main/java/com/ard/system/system/mapper/SysDictDataMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysDictDataMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.mapper;
+package com.ard.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
diff --git a/ard-system/src/main/java/com/ard/system/system/mapper/SysDictTypeMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysDictTypeMapper.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/system/mapper/SysDictTypeMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/SysDictTypeMapper.java
index dcbc69a..ed318b4 100644
--- a/ard-system/src/main/java/com/ard/system/system/mapper/SysDictTypeMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysDictTypeMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.mapper;
+package com.ard.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/system/mapper/SysLogininforMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysLogininforMapper.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/system/system/mapper/SysLogininforMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/SysLogininforMapper.java
index 34b8c23..91b5105 100644
--- a/ard-system/src/main/java/com/ard/system/system/mapper/SysLogininforMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysLogininforMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.system.mapper;
+package com.ard.system.mapper;
import java.util.List;
-import com.ard.system.system.domain.SysLogininfor;
+import com.ard.system.domain.SysLogininfor;
/**
* 系统访问日志情况信息 数据层
diff --git a/ard-system/src/main/java/com/ard/system/system/mapper/SysMenuMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysMenuMapper.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/system/mapper/SysMenuMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/SysMenuMapper.java
index 5073d67..9964aa6 100644
--- a/ard-system/src/main/java/com/ard/system/system/mapper/SysMenuMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysMenuMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.mapper;
+package com.ard.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
diff --git a/ard-system/src/main/java/com/ard/system/system/mapper/SysNoticeMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysNoticeMapper.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/system/system/mapper/SysNoticeMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/SysNoticeMapper.java
index fee2ebd..c04a66d 100644
--- a/ard-system/src/main/java/com/ard/system/system/mapper/SysNoticeMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysNoticeMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.system.mapper;
+package com.ard.system.mapper;
import java.util.List;
-import com.ard.system.system.domain.SysNotice;
+import com.ard.system.domain.SysNotice;
/**
* 通知公告表 数据层
diff --git a/ard-system/src/main/java/com/ard/system/system/mapper/SysOperLogMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysOperLogMapper.java
similarity index 91%
rename from ard-system/src/main/java/com/ard/system/system/mapper/SysOperLogMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/SysOperLogMapper.java
index 63f3fdd..96a935b 100644
--- a/ard-system/src/main/java/com/ard/system/system/mapper/SysOperLogMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysOperLogMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.system.mapper;
+package com.ard.system.mapper;
import java.util.List;
-import com.ard.system.system.domain.SysOperLog;
+import com.ard.system.domain.SysOperLog;
/**
* 操作日志 数据层
diff --git a/ard-system/src/main/java/com/ard/system/system/mapper/SysPostMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysPostMapper.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/system/mapper/SysPostMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/SysPostMapper.java
index 372a077..0b4c55c 100644
--- a/ard-system/src/main/java/com/ard/system/system/mapper/SysPostMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysPostMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.system.mapper;
+package com.ard.system.mapper;
import java.util.List;
-import com.ard.system.system.domain.SysPost;
+import com.ard.system.domain.SysPost;
/**
* 岗位信息 数据层
diff --git a/ard-system/src/main/java/com/ard/system/system/mapper/SysRoleDeptMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysRoleDeptMapper.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/system/system/mapper/SysRoleDeptMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/SysRoleDeptMapper.java
index a462968..c5d2afc 100644
--- a/ard-system/src/main/java/com/ard/system/system/mapper/SysRoleDeptMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysRoleDeptMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.system.mapper;
+package com.ard.system.mapper;
import java.util.List;
-import com.ard.system.system.domain.SysRoleDept;
+import com.ard.system.domain.SysRoleDept;
/**
* 角色与部门关联表 数据层
diff --git a/ard-system/src/main/java/com/ard/system/system/mapper/SysRoleMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysRoleMapper.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/system/mapper/SysRoleMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/SysRoleMapper.java
index 6205b00..ebf8377 100644
--- a/ard-system/src/main/java/com/ard/system/system/mapper/SysRoleMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysRoleMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.mapper;
+package com.ard.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/system/mapper/SysRoleMenuMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysRoleMenuMapper.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/system/system/mapper/SysRoleMenuMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/SysRoleMenuMapper.java
index 145cfda..4e9b440 100644
--- a/ard-system/src/main/java/com/ard/system/system/mapper/SysRoleMenuMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysRoleMenuMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.system.mapper;
+package com.ard.system.mapper;
import java.util.List;
-import com.ard.system.system.domain.SysRoleMenu;
+import com.ard.system.domain.SysRoleMenu;
/**
* 角色与菜单关联表 数据层
diff --git a/ard-system/src/main/java/com/ard/system/system/mapper/SysUserMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysUserMapper.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/system/mapper/SysUserMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/SysUserMapper.java
index 4eb73ef..b5826a9 100644
--- a/ard-system/src/main/java/com/ard/system/system/mapper/SysUserMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysUserMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.mapper;
+package com.ard.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
diff --git a/ard-system/src/main/java/com/ard/system/system/mapper/SysUserPostMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysUserPostMapper.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/system/system/mapper/SysUserPostMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/SysUserPostMapper.java
index fd7a5aa..aa36127 100644
--- a/ard-system/src/main/java/com/ard/system/system/mapper/SysUserPostMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysUserPostMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.system.mapper;
+package com.ard.system.mapper;
import java.util.List;
-import com.ard.system.system.domain.SysUserPost;
+import com.ard.system.domain.SysUserPost;
/**
* 用户与岗位关联表 数据层
diff --git a/ard-system/src/main/java/com/ard/system/system/mapper/SysUserRoleMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysUserRoleMapper.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/system/system/mapper/SysUserRoleMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/SysUserRoleMapper.java
index a8be408..eccaa51 100644
--- a/ard-system/src/main/java/com/ard/system/system/mapper/SysUserRoleMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysUserRoleMapper.java
@@ -1,8 +1,8 @@
-package com.ard.system.system.mapper;
+package com.ard.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
-import com.ard.system.system.domain.SysUserRole;
+import com.ard.system.domain.SysUserRole;
/**
* 用户与角色关联表 数据层
diff --git a/ard-system/src/main/java/com/ard/system/system/service/ISysConfigService.java b/ard-system/src/main/java/com/ard/system/service/ISysConfigService.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/system/service/ISysConfigService.java
rename to ard-system/src/main/java/com/ard/system/service/ISysConfigService.java
index 80ccd04..67a8d80 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/ISysConfigService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysConfigService.java
@@ -1,7 +1,7 @@
-package com.ard.system.system.service;
+package com.ard.system.service;
import java.util.List;
-import com.ard.system.system.domain.SysConfig;
+import com.ard.system.domain.SysConfig;
/**
* 参数配置 服务层
diff --git a/ard-system/src/main/java/com/ard/system/system/service/ISysDeptService.java b/ard-system/src/main/java/com/ard/system/service/ISysDeptService.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/system/service/ISysDeptService.java
rename to ard-system/src/main/java/com/ard/system/service/ISysDeptService.java
index fbf5a26..abbac63 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/ISysDeptService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysDeptService.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.service;
+package com.ard.system.service;
import java.util.List;
import com.ard.common.core.domain.TreeSelect;
diff --git a/ard-system/src/main/java/com/ard/system/system/service/ISysDictDataService.java b/ard-system/src/main/java/com/ard/system/service/ISysDictDataService.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/system/service/ISysDictDataService.java
rename to ard-system/src/main/java/com/ard/system/service/ISysDictDataService.java
index 72d85a2..00e8c3b 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/ISysDictDataService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysDictDataService.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.service;
+package com.ard.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/system/service/ISysDictTypeService.java b/ard-system/src/main/java/com/ard/system/service/ISysDictTypeService.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/system/service/ISysDictTypeService.java
rename to ard-system/src/main/java/com/ard/system/service/ISysDictTypeService.java
index 518e51f..3304348 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/ISysDictTypeService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysDictTypeService.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.service;
+package com.ard.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/system/service/ISysLogininforService.java b/ard-system/src/main/java/com/ard/system/service/ISysLogininforService.java
similarity index 89%
rename from ard-system/src/main/java/com/ard/system/system/service/ISysLogininforService.java
rename to ard-system/src/main/java/com/ard/system/service/ISysLogininforService.java
index 52a21f9..29cd89d 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/ISysLogininforService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysLogininforService.java
@@ -1,7 +1,7 @@
-package com.ard.system.system.service;
+package com.ard.system.service;
import java.util.List;
-import com.ard.system.system.domain.SysLogininfor;
+import com.ard.system.domain.SysLogininfor;
/**
* 系统访问日志情况信息 服务层
diff --git a/ard-system/src/main/java/com/ard/system/system/service/ISysMenuService.java b/ard-system/src/main/java/com/ard/system/service/ISysMenuService.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/system/service/ISysMenuService.java
rename to ard-system/src/main/java/com/ard/system/service/ISysMenuService.java
index ca63d7d..4cd7eb2 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/ISysMenuService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysMenuService.java
@@ -1,10 +1,10 @@
-package com.ard.system.system.service;
+package com.ard.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.system.vo.RouterVo;
+import com.ard.system.vo.RouterVo;
/**
* 菜单 业务层
diff --git a/ard-system/src/main/java/com/ard/system/system/service/ISysNoticeService.java b/ard-system/src/main/java/com/ard/system/service/ISysNoticeService.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/system/system/service/ISysNoticeService.java
rename to ard-system/src/main/java/com/ard/system/service/ISysNoticeService.java
index 7b2d203..3eaa5e6 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/ISysNoticeService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysNoticeService.java
@@ -1,7 +1,7 @@
-package com.ard.system.system.service;
+package com.ard.system.service;
import java.util.List;
-import com.ard.system.system.domain.SysNotice;
+import com.ard.system.domain.SysNotice;
/**
* 公告 服务层
diff --git a/ard-system/src/main/java/com/ard/system/system/service/ISysOperLogService.java b/ard-system/src/main/java/com/ard/system/service/ISysOperLogService.java
similarity index 91%
rename from ard-system/src/main/java/com/ard/system/system/service/ISysOperLogService.java
rename to ard-system/src/main/java/com/ard/system/service/ISysOperLogService.java
index 3326b3c..6137656 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/ISysOperLogService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysOperLogService.java
@@ -1,7 +1,7 @@
-package com.ard.system.system.service;
+package com.ard.system.service;
import java.util.List;
-import com.ard.system.system.domain.SysOperLog;
+import com.ard.system.domain.SysOperLog;
/**
* 操作日志 服务层
diff --git a/ard-system/src/main/java/com/ard/system/system/service/ISysPostService.java b/ard-system/src/main/java/com/ard/system/service/ISysPostService.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/system/service/ISysPostService.java
rename to ard-system/src/main/java/com/ard/system/service/ISysPostService.java
index dd30b10..3177095 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/ISysPostService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysPostService.java
@@ -1,7 +1,7 @@
-package com.ard.system.system.service;
+package com.ard.system.service;
import java.util.List;
-import com.ard.system.system.domain.SysPost;
+import com.ard.system.domain.SysPost;
/**
* 岗位信息 服务层
diff --git a/ard-system/src/main/java/com/ard/system/system/service/ISysRoleService.java b/ard-system/src/main/java/com/ard/system/service/ISysRoleService.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/system/service/ISysRoleService.java
rename to ard-system/src/main/java/com/ard/system/service/ISysRoleService.java
index 77fce4a..770a16e 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/ISysRoleService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysRoleService.java
@@ -1,9 +1,9 @@
-package com.ard.system.system.service;
+package com.ard.system.service;
import java.util.List;
import java.util.Set;
import com.ard.common.core.domain.entity.SysRole;
-import com.ard.system.system.domain.SysUserRole;
+import com.ard.system.domain.SysUserRole;
/**
* 角色业务层
diff --git a/ard-system/src/main/java/com/ard/system/system/service/ISysUserOnlineService.java b/ard-system/src/main/java/com/ard/system/service/ISysUserOnlineService.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/system/system/service/ISysUserOnlineService.java
rename to ard-system/src/main/java/com/ard/system/service/ISysUserOnlineService.java
index 113ad86..caa0ec9 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/ISysUserOnlineService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysUserOnlineService.java
@@ -1,7 +1,7 @@
-package com.ard.system.system.service;
+package com.ard.system.service;
import com.ard.common.core.domain.model.LoginUser;
-import com.ard.system.system.domain.SysUserOnline;
+import com.ard.system.domain.SysUserOnline;
/**
* 在线用户 服务层
diff --git a/ard-system/src/main/java/com/ard/system/system/service/ISysUserService.java b/ard-system/src/main/java/com/ard/system/service/ISysUserService.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/system/service/ISysUserService.java
rename to ard-system/src/main/java/com/ard/system/service/ISysUserService.java
index 35c6d00..c4cb956 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/ISysUserService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysUserService.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.service;
+package com.ard.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/system/service/impl/SysConfigServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysConfigServiceImpl.java
similarity index 96%
rename from ard-system/src/main/java/com/ard/system/system/service/impl/SysConfigServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/impl/SysConfigServiceImpl.java
index 6c88703..de0d4c3 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/impl/SysConfigServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysConfigServiceImpl.java
@@ -1,10 +1,10 @@
-package com.ard.system.system.service.impl;
+package com.ard.system.service.impl;
import java.util.Collection;
import java.util.List;
import javax.annotation.PostConstruct;
-import com.ard.system.system.service.ISysConfigService;
+import com.ard.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.system.domain.SysConfig;
-import com.ard.system.system.mapper.SysConfigMapper;
+import com.ard.system.domain.SysConfig;
+import com.ard.system.mapper.SysConfigMapper;
/**
* 参数配置 服务层实现
diff --git a/ard-system/src/main/java/com/ard/system/system/service/impl/SysDeptServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysDeptServiceImpl.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/system/service/impl/SysDeptServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/impl/SysDeptServiceImpl.java
index 1e137a2..1c564dd 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/impl/SysDeptServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysDeptServiceImpl.java
@@ -1,11 +1,11 @@
-package com.ard.system.system.service.impl;
+package com.ard.system.service.impl;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
-import com.ard.system.system.service.ISysDeptService;
+import com.ard.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.system.mapper.SysDeptMapper;
-import com.ard.system.system.mapper.SysRoleMapper;
+import com.ard.system.mapper.SysDeptMapper;
+import com.ard.system.mapper.SysRoleMapper;
/**
* 部门管理 服务实现
diff --git a/ard-system/src/main/java/com/ard/system/system/service/impl/SysDictDataServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysDictDataServiceImpl.java
similarity index 94%
rename from ard-system/src/main/java/com/ard/system/system/service/impl/SysDictDataServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/impl/SysDictDataServiceImpl.java
index 8c0cbd4..bd57554 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/impl/SysDictDataServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysDictDataServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ard.system.system.service.impl;
+package com.ard.system.service.impl;
import java.util.List;
-import com.ard.system.system.service.ISysDictDataService;
+import com.ard.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.system.mapper.SysDictDataMapper;
+import com.ard.system.mapper.SysDictDataMapper;
/**
* 字典 业务层处理
diff --git a/ard-system/src/main/java/com/ard/system/system/service/impl/SysDictTypeServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysDictTypeServiceImpl.java
similarity index 96%
rename from ard-system/src/main/java/com/ard/system/system/service/impl/SysDictTypeServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/impl/SysDictTypeServiceImpl.java
index b2a80d3..24dd65e 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysDictTypeServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.service.impl;
+package com.ard.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.system.service.ISysDictTypeService;
+import com.ard.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.system.mapper.SysDictDataMapper;
-import com.ard.system.system.mapper.SysDictTypeMapper;
+import com.ard.system.mapper.SysDictDataMapper;
+import com.ard.system.mapper.SysDictTypeMapper;
/**
* 字典 业务层处理
diff --git a/ard-system/src/main/java/com/ard/system/system/service/impl/SysLogininforServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysLogininforServiceImpl.java
similarity index 86%
rename from ard-system/src/main/java/com/ard/system/system/service/impl/SysLogininforServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/impl/SysLogininforServiceImpl.java
index a485286..bec74d6 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/impl/SysLogininforServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysLogininforServiceImpl.java
@@ -1,12 +1,12 @@
-package com.ard.system.system.service.impl;
+package com.ard.system.service.impl;
import java.util.List;
-import com.ard.system.system.service.ISysLogininforService;
+import com.ard.system.service.ISysLogininforService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ard.system.system.domain.SysLogininfor;
-import com.ard.system.system.mapper.SysLogininforMapper;
+import com.ard.system.domain.SysLogininfor;
+import com.ard.system.mapper.SysLogininforMapper;
/**
* 系统访问日志情况信息 服务层处理
diff --git a/ard-system/src/main/java/com/ard/system/system/service/impl/SysMenuServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysMenuServiceImpl.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/system/service/impl/SysMenuServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/impl/SysMenuServiceImpl.java
index d1ffcdc..7598b1e 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/impl/SysMenuServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysMenuServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.service.impl;
+package com.ard.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.system.service.ISysMenuService;
+import com.ard.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.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;
+import com.ard.system.vo.MetaVo;
+import com.ard.system.vo.RouterVo;
+import com.ard.system.mapper.SysMenuMapper;
+import com.ard.system.mapper.SysRoleMapper;
+import com.ard.system.mapper.SysRoleMenuMapper;
/**
* 菜单 业务层处理
diff --git a/ard-system/src/main/java/com/ard/system/system/service/impl/SysNoticeServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysNoticeServiceImpl.java
similarity index 89%
rename from ard-system/src/main/java/com/ard/system/system/service/impl/SysNoticeServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/impl/SysNoticeServiceImpl.java
index 7c3374f..f01210c 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/impl/SysNoticeServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysNoticeServiceImpl.java
@@ -1,12 +1,12 @@
-package com.ard.system.system.service.impl;
+package com.ard.system.service.impl;
import java.util.List;
-import com.ard.system.system.service.ISysNoticeService;
+import com.ard.system.service.ISysNoticeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ard.system.system.domain.SysNotice;
-import com.ard.system.system.mapper.SysNoticeMapper;
+import com.ard.system.domain.SysNotice;
+import com.ard.system.mapper.SysNoticeMapper;
/**
* 公告 服务层实现
diff --git a/ard-system/src/main/java/com/ard/system/system/service/impl/SysOperLogServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysOperLogServiceImpl.java
similarity index 87%
rename from ard-system/src/main/java/com/ard/system/system/service/impl/SysOperLogServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/impl/SysOperLogServiceImpl.java
index b7ad135..af47cf1 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/impl/SysOperLogServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysOperLogServiceImpl.java
@@ -1,12 +1,12 @@
-package com.ard.system.system.service.impl;
+package com.ard.system.service.impl;
import java.util.List;
-import com.ard.system.system.service.ISysOperLogService;
+import com.ard.system.service.ISysOperLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ard.system.system.domain.SysOperLog;
-import com.ard.system.system.mapper.SysOperLogMapper;
+import com.ard.system.domain.SysOperLog;
+import com.ard.system.mapper.SysOperLogMapper;
/**
* 操作日志 服务层处理
diff --git a/ard-system/src/main/java/com/ard/system/system/service/impl/SysPostServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysPostServiceImpl.java
similarity index 94%
rename from ard-system/src/main/java/com/ard/system/system/service/impl/SysPostServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/impl/SysPostServiceImpl.java
index cd2ad3f..d5e5e48 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/impl/SysPostServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysPostServiceImpl.java
@@ -1,16 +1,16 @@
-package com.ard.system.system.service.impl;
+package com.ard.system.service.impl;
import java.util.List;
-import com.ard.system.system.service.ISysPostService;
+import com.ard.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.system.domain.SysPost;
-import com.ard.system.system.mapper.SysPostMapper;
-import com.ard.system.system.mapper.SysUserPostMapper;
+import com.ard.system.domain.SysPost;
+import com.ard.system.mapper.SysPostMapper;
+import com.ard.system.mapper.SysUserPostMapper;
/**
* 岗位信息 服务层处理
diff --git a/ard-system/src/main/java/com/ard/system/system/service/impl/SysRoleServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysRoleServiceImpl.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/system/service/impl/SysRoleServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/impl/SysRoleServiceImpl.java
index 9bba1b9..60f4b70 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/impl/SysRoleServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysRoleServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.service.impl;
+package com.ard.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.system.service.ISysRoleService;
+import com.ard.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.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;
+import com.ard.system.domain.SysRoleDept;
+import com.ard.system.domain.SysRoleMenu;
+import com.ard.system.domain.SysUserRole;
+import com.ard.system.mapper.SysRoleDeptMapper;
+import com.ard.system.mapper.SysRoleMapper;
+import com.ard.system.mapper.SysRoleMenuMapper;
+import com.ard.system.mapper.SysUserRoleMapper;
/**
* 角色 业务层处理
diff --git a/ard-system/src/main/java/com/ard/system/system/service/impl/SysUserOnlineServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysUserOnlineServiceImpl.java
similarity index 94%
rename from ard-system/src/main/java/com/ard/system/system/service/impl/SysUserOnlineServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/impl/SysUserOnlineServiceImpl.java
index e70b2de..1b29d1c 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/impl/SysUserOnlineServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysUserOnlineServiceImpl.java
@@ -1,10 +1,10 @@
-package com.ard.system.system.service.impl;
+package com.ard.system.service.impl;
-import com.ard.system.system.service.ISysUserOnlineService;
+import com.ard.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.system.domain.SysUserOnline;
+import com.ard.system.domain.SysUserOnline;
/**
* 在线用户 服务层处理
diff --git a/ard-system/src/main/java/com/ard/system/system/service/impl/SysUserServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysUserServiceImpl.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/system/service/impl/SysUserServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/impl/SysUserServiceImpl.java
index fc91016..3580b6f 100644
--- a/ard-system/src/main/java/com/ard/system/system/service/impl/SysUserServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysUserServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ard.system.system.service.impl;
+package com.ard.system.service.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import javax.validation.Validator;
-import com.ard.system.system.service.ISysConfigService;
-import com.ard.system.system.service.ISysDeptService;
-import com.ard.system.system.service.ISysUserService;
+import com.ard.system.service.ISysConfigService;
+import com.ard.system.service.ISysDeptService;
+import com.ard.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.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;
+import com.ard.system.domain.SysPost;
+import com.ard.system.domain.SysUserPost;
+import com.ard.system.domain.SysUserRole;
+import com.ard.system.mapper.SysPostMapper;
+import com.ard.system.mapper.SysRoleMapper;
+import com.ard.system.mapper.SysUserMapper;
+import com.ard.system.mapper.SysUserPostMapper;
+import com.ard.system.mapper.SysUserRoleMapper;
/**
* 用户 业务层处理
diff --git a/ard-system/src/main/java/com/ard/system/system/vo/MetaVo.java b/ard-system/src/main/java/com/ard/system/vo/MetaVo.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/system/vo/MetaVo.java
rename to ard-system/src/main/java/com/ard/system/vo/MetaVo.java
index 1162cb6..c588e34 100644
--- a/ard-system/src/main/java/com/ard/system/system/vo/MetaVo.java
+++ b/ard-system/src/main/java/com/ard/system/vo/MetaVo.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.vo;
+package com.ard.system.vo;
import com.ard.common.utils.StringUtils;
diff --git a/ard-system/src/main/java/com/ard/system/system/vo/RouterVo.java b/ard-system/src/main/java/com/ard/system/vo/RouterVo.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/system/vo/RouterVo.java
rename to ard-system/src/main/java/com/ard/system/vo/RouterVo.java
index 076529c..9dc13b5 100644
--- a/ard-system/src/main/java/com/ard/system/system/vo/RouterVo.java
+++ b/ard-system/src/main/java/com/ard/system/vo/RouterVo.java
@@ -1,4 +1,4 @@
-package com.ard.system.system.vo;
+package com.ard.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 0a55ac8..ca4da9f 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.data.mapper.ArdMapManagementMapper">
+<mapper namespace="com.ard.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 16f924b..f6e113f 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.data.mapper.ArdModelManagementMapper">
+<mapper namespace="com.ard.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 596e99d..e95b888 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.data.mapper.ArdTileManagementMapper">
+<mapper namespace="com.ard.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 e0673cb..382aaca 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.noflyzone.mapper.ArdNoFlyZoneMapper">
+<mapper namespace="com.ard.data.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.noflyzone.domain.FeatureCollectionTypeHandler"/>
+ <result property="geojson" column="geojson" typeHandler="com.ard.data.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 ceae830..c24ffb5 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.system.mapper.SysConfigMapper">
+<mapper namespace="com.ard.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 96a9fce..c5ee411 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.system.mapper.SysDeptMapper">
+<mapper namespace="com.ard.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 29e1af7..aaba830 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.system.mapper.SysDictDataMapper">
+<mapper namespace="com.ard.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 80da7d5..a1a3863 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.system.mapper.SysDictTypeMapper">
+<mapper namespace="com.ard.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 d94463f..7bee661 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.system.mapper.SysLogininforMapper">
+<mapper namespace="com.ard.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 f7c38c7..a268181 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.system.mapper.SysMenuMapper">
+<mapper namespace="com.ard.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 a998b45..cfbcd8b 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.system.mapper.SysNoticeMapper">
+<mapper namespace="com.ard.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 2a5be82..75a0c81 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.system.mapper.SysOperLogMapper">
+<mapper namespace="com.ard.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 a8578a5..9f32397 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.system.mapper.SysPostMapper">
+<mapper namespace="com.ard.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 efd30c9..feae472 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.system.mapper.SysRoleDeptMapper">
+<mapper namespace="com.ard.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 9421f97..2d97532 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.system.mapper.SysRoleMapper">
+<mapper namespace="com.ard.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 466521c..b0b8eab 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.system.mapper.SysRoleMenuMapper">
+<mapper namespace="com.ard.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 17f20bd..dfad20f 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.system.mapper.SysUserMapper">
+<mapper namespace="com.ard.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 e288d20..a3f2216 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.system.mapper.SysUserPostMapper">
+<mapper namespace="com.ard.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 74e017a..1f1f356 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.system.mapper.SysUserRoleMapper">
+<mapper namespace="com.ard.system.mapper.SysUserRoleMapper">
<resultMap type="SysUserRole" id="SysUserRoleResult">
<result property="userId" column="user_id" />
--
Gitblit v1.9.3