From 639c706cac20523358e6c9666069fbda9fdd4d57 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Tue, 14 Oct 2025 15:33:05 +0800
Subject: [PATCH] 1.整理system文件，根据功能分类。 2.整理kmz文件路径。
---
ard-framework/src/main/java/com/ard/framework/manager/factory/AsyncFactory.java | 8
ard-route/src/main/java/com/ard/route/enums/kml/TemplateTypeEnums.java | 2
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-route/src/main/java/com/ard/route/domain/kml/KmlPoint.java | 2
ard-route/src/main/java/com/ard/route/domain/kml/KmlActionGroup.java | 2
ard-system/src/main/resources/mapper/system/SysUserPostMapper.xml | 2
ard-system/src/main/java/com/ard/system/service/data/impl/ArdTileManagementServiceImpl.java | 8
ard-admin/src/main/java/com/ard/web/controller/common/CaptchaController.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/ExecuteHeightModeEnums.java | 2
ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java | 2
ard-system/src/main/resources/mapper/system/SysMenuMapper.xml | 2
ard-system/src/main/resources/mapper/system/SysLogininforMapper.xml | 2
ard-route/src/main/java/com/ard/route/domain/kml/KmlPolygon.java | 2
ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java | 10
ard-system/src/main/java/com/ard/system/service/system/impl/SysDictTypeServiceImpl.java | 9
ard-admin/src/main/java/com/ard/web/controller/system/SysNoticeController.java | 4
ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointTurnParam.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/DroneEnumValueEnums.java | 2
ard-system/src/main/java/com/ard/system/common/Md5Utils.java | 2
ard-system/src/main/java/com/ard/system/domain/noflyzone/ArdNoFlyZone.java | 4
ard-route/src/main/java/com/ard/route/constant/FileTypeConstants.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/ActionActuatorFuncEnums.java | 2
ard-system/src/main/java/com/ard/system/mapper/system/SysDictDataMapper.java | 2
ard-system/src/main/java/com/ard/system/mapper/system/SysUserRoleMapper.java | 4
ard-system/src/main/java/com/ard/system/domain/noflyzone/FeatureCollection.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysDictTypeController.java | 2
ard-route/src/main/java/com/ard/route/domain/kml/KmlOverlap.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/ActionGroupModeEnums.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-route/src/main/java/com/ard/route/domain/kml/KmlAction.java | 2
ard-system/src/main/java/com/ard/system/service/system/ISysLogininforService.java | 4
ard-system/src/main/java/com/ard/system/service/system/ISysPostService.java | 4
ard-system/src/main/java/com/ard/system/service/system/impl/SysDictDataServiceImpl.java | 7
ard-system/src/main/resources/mapper/system/SysUserRoleMapper.xml | 2
ard-route/src/main/java/com/ard/route/domain/kml/KmlDroneInfo.java | 2
ard-system/src/main/java/com/ard/system/mapper/noflyzone/ArdNoFlyZoneMapper.java | 4
ard-route/src/main/java/com/ard/route/enums/kml/LensTypeEnums.java | 2
ard-system/src/main/java/com/ard/system/mapper/system/SysUserPostMapper.java | 4
ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java | 2
ard-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml | 2
ard-route/src/main/java/com/ard/route/domain/kml/KmlGlobalWaypointHeadingParam.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/AircraftPathModeEnums.java | 2
ard-system/src/main/java/com/ard/system/service/system/ISysDictTypeService.java | 2
ard-route/src/main/java/com/ard/route/domain/CoordinatePointReq.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/WaypointHeadingPathModeEnums.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysProfileController.java | 2
ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointHeadingParam.java | 2
ard-system/src/main/java/com/ard/system/domain/authorize/AuthorizeInfo.java | 2
ard-system/src/main/java/com/ard/system/domain/noflyzone/FeatureCollectionTypeHandler.java | 2
ard-system/src/main/java/com/ard/system/domain/system/SysPost.java | 2
ard-route/src/main/java/com/ard/route/service/UavRouteService.java | 4
ard-route/src/main/java/com/ard/route/domain/kml/KmlActionActuatorFuncParam.java | 2
ard-route/src/main/java/com/ard/route/domain/kml/KmlWayLineCoordinateSysParam.java | 2
ard-route/src/main/java/com/ard/route/domain/kml/KmlMissionConfig.java | 2
ard-route/src/main/java/com/ard/route/domain/kml/KmlInfo.java | 2
ard-route/src/main/java/com/ard/route/domain/kml/KmlOuterBoundaryIs.java | 2
ard-admin/src/main/java/com/ard/web/controller/monitor/SysLogininforController.java | 4
ard-route/src/main/java/com/ard/route/domain/WaypointTurnReq.java | 2
ard-system/src/main/java/com/ard/system/service/system/ISysUserOnlineService.java | 4
ard-system/src/main/java/com/ard/system/service/system/impl/SysPostServiceImpl.java | 11
ard-system/src/main/java/com/ard/system/service/system/impl/SysMenuServiceImpl.java | 11
ard-system/src/main/java/com/ard/system/service/noflyzone/impl/ArdNoFlyZoneServiceImpl.java | 8
ard-route/src/main/java/com/ard/route/domain/kml/KmlActionTrigger.java | 2
ard-system/src/main/resources/mapper/system/SysOperLogMapper.xml | 2
ard-admin/src/main/java/com/ard/web/controller/data/ArdMapManagementController.java | 4
ard-route/src/main/java/com/ard/route/domain/kml/KmlLineString.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/ReturnModeEnums.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/AuthorizationController.java | 2
ard-system/src/main/java/com/ard/system/service/authorize/impl/AuthorizeServiceImpl.java | 11
ard-system/src/main/java/com/ard/system/service/system/ISysConfigService.java | 4
ard-system/src/main/java/com/ard/system/mapper/system/SysMenuMapper.java | 2
ard-system/src/main/java/com/ard/system/service/system/impl/SysUserServiceImpl.java | 25 +-
ard-system/src/main/java/com/ard/system/service/system/impl/SysDeptServiceImpl.java | 9
ard-framework/src/main/java/com/ard/framework/aspectj/LogAspect.java | 2
ard-route/src/main/java/com/ard/route/domain/RoutePointReq.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/HeightModeEnums.java | 2
ard-system/src/main/java/com/ard/system/mapper/system/SysConfigMapper.java | 4
ard-system/src/main/java/com/ard/system/mapper/system/SysLogininforMapper.java | 4
ard-system/src/main/java/com/ard/system/service/system/ISysUserService.java | 2
ard-system/src/main/java/com/ard/system/mapper/system/SysDeptMapper.java | 2
ard-route/src/main/java/com/ard/route/domain/kml/KmlPayloadParam.java | 2
ard-system/src/main/java/com/ard/system/domain/system/SysNotice.java | 2
ard-system/src/main/java/com/ard/system/domain/system/SysOperLog.java | 2
ard-system/src/main/java/com/ard/system/mapper/system/SysRoleDeptMapper.java | 4
ard-system/src/main/java/com/ard/system/domain/system/SysUserPost.java | 2
ard-system/src/main/java/com/ard/system/mapper/system/SysDictTypeMapper.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/FlyToWaylineModeEnums.java | 2
ard-system/src/main/java/com/ard/system/domain/data/ArdModelManagement.java | 4
ard-system/src/main/java/com/ard/system/mapper/system/SysRoleMenuMapper.java | 4
ard-system/src/main/java/com/ard/system/service/system/impl/SysUserOnlineServiceImpl.java | 6
ard-system/src/main/resources/mapper/system/SysPostMapper.xml | 2
ard-system/src/main/java/com/ard/system/service/system/ISysOperLogService.java | 4
ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java | 20
ard-admin/src/main/java/com/ard/web/controller/system/SysMenuController.java | 2
ard-system/src/main/java/com/ard/system/domain/system/SysUserOnline.java | 2
ard-system/src/main/java/com/ard/system/service/authorize/AuthorizeService.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/PositioningTypeEnums.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/ScanningModeEnums.java | 2
ard-system/src/main/java/com/ard/system/service/data/IArdModelManagementService.java | 4
ard-route/src/main/java/com/ard/route/enums/kml/CollectionMethodEnums.java | 2
ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java | 4
ard-framework/src/main/java/com/ard/framework/web/service/SysLoginService.java | 4
ard-route/src/main/java/com/ard/route/domain/kml/KmlPlacemark.java | 2
ard-system/src/main/java/com/ard/system/domain/data/ArdTileManagement.java | 2
ard-route/src/main/java/com/ard/route/domain/kml/KmlFolder.java | 2
ard-route/src/main/java/com/ard/route/util/Gps.java | 2
ard-system/src/main/java/com/ard/system/service/system/ISysRoleService.java | 4
ard-admin/src/main/java/com/ard/web/controller/system/SysConfigController.java | 4
ard-route/src/main/java/com/ard/route/domain/UavRouteReq.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysPostController.java | 4
ard-system/src/main/java/com/ard/system/service/data/impl/ArdModelManagementServiceImpl.java | 8
ard-system/src/main/resources/mapper/system/SysDictTypeMapper.xml | 2
ard-route/src/main/java/com/ard/route/domain/kml/KmlParams.java | 8
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-route/src/main/java/com/ard/route/enums/kml/FocusModeEnums.java | 2
ard-route/src/main/java/com/ard/route/domain/WaypointHeadingReq.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/ExecuteRCLostActionEnums.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/GimbalPitchModeEnums.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/ImageFormatEnums.java | 2
ard-system/src/main/java/com/ard/system/domain/system/SysLogininfor.java | 2
ard-route/src/main/java/com/ard/route/domain/MappingTypeReq.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/PayloadPositionIndexEnums.java | 2
ard-route/src/main/java/com/ard/route/domain/kml/KmlLinearRing.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysDictDataController.java | 4
ard-route/src/main/java/com/ard/route/util/PositionUtils.java | 2
ard-admin/src/main/java/com/ard/web/controller/monitor/SysOperlogController.java | 4
ard-admin/src/main/java/com/ard/web/controller/data/ArdTileManagementController.java | 4
ard-system/src/main/resources/mapper/data/ArdNoFlyZoneMapper.xml | 4
ard-system/src/main/java/com/ard/system/mapper/system/SysOperLogMapper.java | 4
ard-system/src/main/java/com/ard/system/domain/data/ArdMapManagement.java | 2
ard-system/src/main/java/com/ard/system/service/system/impl/SysNoticeServiceImpl.java | 9
ard-system/src/main/resources/mapper/system/SysRoleMapper.xml | 2
ard-system/src/main/java/com/ard/system/domain/system/SysRoleMenu.java | 2
ard-system/src/main/resources/mapper/system/SysDeptMapper.xml | 2
ard-route/src/main/java/com/ard/route/enums/kml/PayloadTypeEnums.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/domain/authorize/ParsLicenseInfo.java | 2
ard-system/src/main/java/com/ard/system/mapper/data/ArdModelManagementMapper.java | 4
ard-route/src/main/java/com/ard/route/enums/kml/ActionTriggerTypeEnums.java | 2
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java | 2
ard-system/src/main/java/com/ard/system/domain/system/SysRoleDept.java | 2
ard-system/src/main/resources/mapper/data/ArdModelManagementMapper.xml | 2
ard-system/src/main/java/com/ard/system/service/system/ISysDeptService.java | 2
ard-system/src/main/resources/mapper/data/ArdTileManagementMapper.xml | 2
ard-system/src/main/java/com/ard/system/domain/system/SysConfig.java | 2
ard-system/src/main/java/com/ard/system/service/system/impl/SysConfigServiceImpl.java | 9
ard-route/src/main/java/com/ard/route/domain/kml/RoutePointInfo.java | 8
ard-system/src/main/java/com/ard/system/service/system/impl/SysLogininforServiceImpl.java | 9
ard-system/src/main/resources/mapper/system/SysUserMapper.xml | 2
ard-route/src/main/java/com/ard/route/enums/kml/GlobalWaypointTurnModeEnums.java | 2
ard-system/src/main/java/com/ard/system/service/system/impl/SysRoleServiceImpl.java | 19
ard-admin/src/main/java/com/ard/web/controller/system/SysRegisterController.java | 2
ard-route/src/main/java/com/ard/route/domain/kml/KmlDocument.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/ShootTypeEnums.java | 2
ard-system/src/main/java/com/ard/system/mapper/data/ArdMapManagementMapper.java | 4
ard-system/src/main/java/com/ard/system/service/system/ISysDictDataService.java | 2
ard-system/src/main/java/com/ard/system/domain/system/SysUserRole.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/MeteringModeEnums.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/FinishActionEnums.java | 2
ard-system/src/main/java/com/ard/system/service/system/impl/SysOperLogServiceImpl.java | 9
ard-system/src/main/java/com/ard/system/mapper/system/SysPostMapper.java | 4
ard-system/src/main/resources/mapper/system/SysDictDataMapper.xml | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysRoleController.java | 8
ard-system/src/main/java/com/ard/system/service/data/IArdMapManagementService.java | 4
ard-framework/src/main/java/com/ard/framework/web/service/UserDetailsServiceImpl.java | 2
ard-system/src/main/java/com/ard/system/mapper/system/SysNoticeMapper.java | 4
ard-system/src/main/java/com/ard/system/common/AuthorizeUtil.java | 2
ard-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml | 2
ard-route/src/main/java/com/ard/route/domain/ActionTriggerReq.java | 2
ard-system/src/main/java/com/ard/system/service/system/ISysNoticeService.java | 4
ard-admin/src/main/java/com/ard/web/controller/monitor/SysUserOnlineController.java | 4
ard-route/src/main/java/com/ard/route/enums/kml/ExitOnRCLostEnums.java | 2
ard-system/src/main/java/com/ard/system/domain/system/SysCache.java | 2
ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointGimbalHeadingParam.java | 2
ard-system/src/main/java/com/ard/system/service/data/IArdTileManagementService.java | 4
ard-system/src/main/java/com/ard/system/service/system/ISysMenuService.java | 2
ard-system/src/main/java/com/ard/system/service/data/impl/ArdMapManagementServiceImpl.java | 8
ard-route/src/main/java/com/ard/route/domain/kml/KmlPayloadInfo.java | 2
ard-route/src/main/java/com/ard/route/enums/kml/WaypointHeadingModeEnums.java | 2
ard-system/src/main/java/com/ard/system/mapper/data/ArdTileManagementMapper.java | 4
ard-system/src/main/java/com/ard/system/service/noflyzone/IArdNoFlyZoneService.java | 4
ard-system/src/main/java/com/ard/system/mapper/system/SysUserMapper.java | 2
ard-system/src/main/java/com/ard/system/common/DateTimeUtil.java | 2
ard-system/src/main/java/com/ard/system/mapper/system/SysRoleMapper.java | 2
ard-route/src/main/java/com/ard/route/domain/PointActionReq.java | 2
ard-system/src/main/resources/mapper/system/SysConfigMapper.xml | 2
191 files changed, 339 insertions(+), 329 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 f264278..bbcaf97 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/common/CaptchaController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/common/CaptchaController.java
@@ -18,7 +18,7 @@
import com.ard.common.core.redis.RedisCache;
import com.ard.common.utils.sign.Base64;
import com.ard.common.utils.uuid.IdUtils;
-import com.ard.system.service.ISysConfigService;
+import com.ard.system.service.system.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 48dfb57..d48e99f 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.data.domain.ArdMapManagement;
-import com.ard.data.service.IArdMapManagementService;
+import com.ard.system.domain.data.ArdMapManagement;
+import com.ard.system.service.data.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 0dfc2db..91d8247 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.data.domain.ArdModelManagement;
-import com.ard.data.service.IArdModelManagementService;
+import com.ard.system.domain.data.ArdModelManagement;
+import com.ard.system.service.data.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 0c91912..b701ebe 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.data.noflyzone.domain.FeatureCollection;
+import com.ard.system.domain.noflyzone.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.data.noflyzone.domain.ArdNoFlyZone;
-import com.ard.data.noflyzone.service.IArdNoFlyZoneService;
+import com.ard.system.domain.noflyzone.ArdNoFlyZone;
+import com.ard.system.service.noflyzone.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 6a9083e..d459ecd 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.data.domain.ArdTileManagement;
-import com.ard.data.service.IArdTileManagementService;
+import com.ard.system.domain.data.ArdTileManagement;
+import com.ard.system.service.data.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 dec29e2..93d23e5 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java
@@ -20,7 +20,7 @@
import com.ard.common.constant.CacheConstants;
import com.ard.common.core.domain.AjaxResult;
import com.ard.common.utils.StringUtils;
-import com.ard.system.domain.SysCache;
+import com.ard.system.domain.system.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 1cebd93..7bdf098 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/monitor/SysLogininforController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/monitor/SysLogininforController.java
@@ -17,8 +17,8 @@
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.poi.ExcelUtil;
import com.ard.framework.web.service.SysPasswordService;
-import com.ard.system.domain.SysLogininfor;
-import com.ard.system.service.ISysLogininforService;
+import com.ard.system.domain.system.SysLogininfor;
+import com.ard.system.service.system.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 4343e17..0354560 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/monitor/SysOperlogController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/monitor/SysOperlogController.java
@@ -16,8 +16,8 @@
import com.ard.common.core.page.TableDataInfo;
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.poi.ExcelUtil;
-import com.ard.system.domain.SysOperLog;
-import com.ard.system.service.ISysOperLogService;
+import com.ard.system.domain.system.SysOperLog;
+import com.ard.system.service.system.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 3e7b2da..12b78c1 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/monitor/SysUserOnlineController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/monitor/SysUserOnlineController.java
@@ -20,8 +20,8 @@
import com.ard.common.core.redis.RedisCache;
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.StringUtils;
-import com.ard.system.domain.SysUserOnline;
-import com.ard.system.service.ISysUserOnlineService;
+import com.ard.system.domain.system.SysUserOnline;
+import com.ard.system.service.system.ISysUserOnlineService;
/**
* 在线用户监控
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java b/ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java
index 5c3640d..10d0cb0 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java
@@ -1,7 +1,7 @@
package com.ard.web.controller.route;
-import com.ard.route.kmz.domain.UavRouteReq;
-import com.ard.route.kmz.service.UavRouteService;
+import com.ard.route.domain.UavRouteReq;
+import com.ard.route.service.UavRouteService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/AuthorizationController.java b/ard-admin/src/main/java/com/ard/web/controller/system/AuthorizationController.java
index baf5a54..151a6fd 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/AuthorizationController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/AuthorizationController.java
@@ -1,7 +1,7 @@
package com.ard.web.controller.system;
import com.alibaba.fastjson2.JSONObject;
-import com.ard.authorize.service.AuthorizeService;
+import com.ard.system.service.authorize.AuthorizeService;
import com.ard.common.annotation.Anonymous;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysConfigController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysConfigController.java
index 1e23abc..7e2837d 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysConfigController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysConfigController.java
@@ -19,8 +19,8 @@
import com.ard.common.core.page.TableDataInfo;
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.poi.ExcelUtil;
-import com.ard.system.domain.SysConfig;
-import com.ard.system.service.ISysConfigService;
+import com.ard.system.domain.system.SysConfig;
+import com.ard.system.service.system.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 8414417..377cc49 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysDeptController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysDeptController.java
@@ -20,7 +20,7 @@
import com.ard.common.core.domain.entity.SysDept;
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.StringUtils;
-import com.ard.system.service.ISysDeptService;
+import com.ard.system.service.system.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 3f20dd7..b0856a7 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysDictDataController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysDictDataController.java
@@ -22,8 +22,8 @@
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.StringUtils;
import com.ard.common.utils.poi.ExcelUtil;
-import com.ard.system.service.ISysDictDataService;
-import com.ard.system.service.ISysDictTypeService;
+import com.ard.system.service.system.ISysDictDataService;
+import com.ard.system.service.system.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 548d2bb..b1e36cf 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysDictTypeController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysDictTypeController.java
@@ -20,7 +20,7 @@
import com.ard.common.core.page.TableDataInfo;
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.poi.ExcelUtil;
-import com.ard.system.service.ISysDictTypeService;
+import com.ard.system.service.system.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 9ba7d34..ac37dc4 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysLoginController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysLoginController.java
@@ -22,7 +22,7 @@
import com.ard.framework.web.service.SysLoginService;
import com.ard.framework.web.service.SysPermissionService;
import com.ard.framework.web.service.TokenService;
-import com.ard.system.service.ISysMenuService;
+import com.ard.system.service.system.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 d785d89..ae2b867 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysMenuController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysMenuController.java
@@ -19,7 +19,7 @@
import com.ard.common.core.domain.entity.SysMenu;
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.StringUtils;
-import com.ard.system.service.ISysMenuService;
+import com.ard.system.service.system.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 13ea9b7..30d8ab4 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysNoticeController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysNoticeController.java
@@ -17,8 +17,8 @@
import com.ard.common.core.domain.AjaxResult;
import com.ard.common.core.page.TableDataInfo;
import com.ard.common.enums.BusinessType;
-import com.ard.system.domain.SysNotice;
-import com.ard.system.service.ISysNoticeService;
+import com.ard.system.domain.system.SysNotice;
+import com.ard.system.service.system.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 5202be8..686345f 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysPostController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysPostController.java
@@ -19,8 +19,8 @@
import com.ard.common.core.page.TableDataInfo;
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.poi.ExcelUtil;
-import com.ard.system.domain.SysPost;
-import com.ard.system.service.ISysPostService;
+import com.ard.system.domain.system.SysPost;
+import com.ard.system.service.system.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 572c205..90728a3 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysProfileController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysProfileController.java
@@ -21,7 +21,7 @@
import com.ard.common.utils.file.FileUploadUtils;
import com.ard.common.utils.file.MimeTypeUtils;
import com.ard.framework.web.service.TokenService;
-import com.ard.system.service.ISysUserService;
+import com.ard.system.service.system.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 95cb7f0..ae8210a 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysRegisterController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysRegisterController.java
@@ -9,7 +9,7 @@
import com.ard.common.core.domain.model.RegisterBody;
import com.ard.common.utils.StringUtils;
import com.ard.framework.web.service.SysRegisterService;
-import com.ard.system.service.ISysConfigService;
+import com.ard.system.service.system.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 749453c..c4f47c7 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysRoleController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysRoleController.java
@@ -26,10 +26,10 @@
import com.ard.common.utils.poi.ExcelUtil;
import com.ard.framework.web.service.SysPermissionService;
import com.ard.framework.web.service.TokenService;
-import com.ard.system.domain.SysUserRole;
-import com.ard.system.service.ISysDeptService;
-import com.ard.system.service.ISysRoleService;
-import com.ard.system.service.ISysUserService;
+import com.ard.system.domain.system.SysUserRole;
+import com.ard.system.service.system.ISysDeptService;
+import com.ard.system.service.system.ISysRoleService;
+import com.ard.system.service.system.ISysUserService;
/**
* 角色信息
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 0b9de9b..b97d953 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysUserController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysUserController.java
@@ -30,10 +30,10 @@
import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.StringUtils;
import com.ard.common.utils.poi.ExcelUtil;
-import com.ard.system.service.ISysDeptService;
-import com.ard.system.service.ISysPostService;
-import com.ard.system.service.ISysRoleService;
-import com.ard.system.service.ISysUserService;
+import com.ard.system.service.system.ISysDeptService;
+import com.ard.system.service.system.ISysPostService;
+import com.ard.system.service.system.ISysRoleService;
+import com.ard.system.service.system.ISysUserService;
/**
* 用户信息
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 43e1fc4..7932226 100644
--- a/ard-framework/src/main/java/com/ard/framework/aspectj/LogAspect.java
+++ b/ard-framework/src/main/java/com/ard/framework/aspectj/LogAspect.java
@@ -29,7 +29,7 @@
import com.ard.common.utils.ip.IpUtils;
import com.ard.framework.manager.AsyncManager;
import com.ard.framework.manager.factory.AsyncFactory;
-import com.ard.system.domain.SysOperLog;
+import com.ard.system.domain.system.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 9c20c34..e0aa02e 100644
--- a/ard-framework/src/main/java/com/ard/framework/manager/factory/AsyncFactory.java
+++ b/ard-framework/src/main/java/com/ard/framework/manager/factory/AsyncFactory.java
@@ -10,10 +10,10 @@
import com.ard.common.utils.ip.AddressUtils;
import com.ard.common.utils.ip.IpUtils;
import com.ard.common.utils.spring.SpringUtils;
-import com.ard.system.domain.SysLogininfor;
-import com.ard.system.domain.SysOperLog;
-import com.ard.system.service.ISysLogininforService;
-import com.ard.system.service.ISysOperLogService;
+import com.ard.system.domain.system.SysLogininfor;
+import com.ard.system.domain.system.SysOperLog;
+import com.ard.system.service.system.ISysLogininforService;
+import com.ard.system.service.system.ISysOperLogService;
import 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 d7fec9a..01d5784 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/service/SysLoginService.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/service/SysLoginService.java
@@ -30,8 +30,8 @@
import com.ard.framework.manager.AsyncManager;
import com.ard.framework.manager.factory.AsyncFactory;
import com.ard.framework.security.context.AuthenticationContextHolder;
-import com.ard.system.service.ISysConfigService;
-import com.ard.system.service.ISysUserService;
+import com.ard.system.service.system.ISysConfigService;
+import com.ard.system.service.system.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 2aa845b..8dcc3fa 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/service/SysPermissionService.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/service/SysPermissionService.java
@@ -10,8 +10,8 @@
import com.ard.common.core.domain.entity.SysRole;
import com.ard.common.core.domain.entity.SysUser;
import com.ard.common.utils.StringUtils;
-import com.ard.system.service.ISysMenuService;
-import com.ard.system.service.ISysRoleService;
+import com.ard.system.service.system.ISysMenuService;
+import com.ard.system.service.system.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 9aae269..691a279 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/service/SysRegisterService.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/service/SysRegisterService.java
@@ -15,8 +15,8 @@
import com.ard.common.utils.StringUtils;
import com.ard.framework.manager.AsyncManager;
import com.ard.framework.manager.factory.AsyncFactory;
-import com.ard.system.service.ISysConfigService;
-import com.ard.system.service.ISysUserService;
+import com.ard.system.service.system.ISysConfigService;
+import com.ard.system.service.system.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 172ca65..917634c 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/service/UserDetailsServiceImpl.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/service/UserDetailsServiceImpl.java
@@ -13,7 +13,7 @@
import com.ard.common.exception.ServiceException;
import com.ard.common.utils.MessageUtils;
import com.ard.common.utils.StringUtils;
-import com.ard.system.service.ISysUserService;
+import com.ard.system.service.system.ISysUserService;
/**
* 用户验证处理
diff --git a/ard-route/src/main/java/com/ard/route/kmz/constant/FileTypeConstants.java b/ard-route/src/main/java/com/ard/route/constant/FileTypeConstants.java
similarity index 90%
rename from ard-route/src/main/java/com/ard/route/kmz/constant/FileTypeConstants.java
rename to ard-route/src/main/java/com/ard/route/constant/FileTypeConstants.java
index 9340708..38d365d 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/constant/FileTypeConstants.java
+++ b/ard-route/src/main/java/com/ard/route/constant/FileTypeConstants.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.constant;
+package com.ard.route.constant;
public interface FileTypeConstants {
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/ActionTriggerReq.java b/ard-route/src/main/java/com/ard/route/domain/ActionTriggerReq.java
similarity index 90%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/ActionTriggerReq.java
rename to ard-route/src/main/java/com/ard/route/domain/ActionTriggerReq.java
index fe793ea..ed6f4f1 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/ActionTriggerReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/ActionTriggerReq.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain;
+package com.ard.route.domain;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/CoordinatePointReq.java b/ard-route/src/main/java/com/ard/route/domain/CoordinatePointReq.java
similarity index 91%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/CoordinatePointReq.java
rename to ard-route/src/main/java/com/ard/route/domain/CoordinatePointReq.java
index b692a1f..1f02dbb 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/CoordinatePointReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/CoordinatePointReq.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain;
+package com.ard.route.domain;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/MappingTypeReq.java b/ard-route/src/main/java/com/ard/route/domain/MappingTypeReq.java
similarity index 96%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/MappingTypeReq.java
rename to ard-route/src/main/java/com/ard/route/domain/MappingTypeReq.java
index d88690b..6c2016b 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/MappingTypeReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/MappingTypeReq.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain;
+package com.ard.route.domain;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/PointActionReq.java b/ard-route/src/main/java/com/ard/route/domain/PointActionReq.java
similarity index 96%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/PointActionReq.java
rename to ard-route/src/main/java/com/ard/route/domain/PointActionReq.java
index ac0870e..d0c0806 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/PointActionReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/PointActionReq.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain;
+package com.ard.route.domain;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/RoutePointReq.java b/ard-route/src/main/java/com/ard/route/domain/RoutePointReq.java
similarity index 96%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/RoutePointReq.java
rename to ard-route/src/main/java/com/ard/route/domain/RoutePointReq.java
index ba528eb..15aab97 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/RoutePointReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/RoutePointReq.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain;
+package com.ard.route.domain;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/UavRouteReq.java b/ard-route/src/main/java/com/ard/route/domain/UavRouteReq.java
similarity index 97%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/UavRouteReq.java
rename to ard-route/src/main/java/com/ard/route/domain/UavRouteReq.java
index 64d1917..e886147 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/UavRouteReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/UavRouteReq.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain;
+package com.ard.route.domain;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/WaypointHeadingReq.java b/ard-route/src/main/java/com/ard/route/domain/WaypointHeadingReq.java
similarity index 91%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/WaypointHeadingReq.java
rename to ard-route/src/main/java/com/ard/route/domain/WaypointHeadingReq.java
index 080fc23..1cf1f2d 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/WaypointHeadingReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/WaypointHeadingReq.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain;
+package com.ard.route.domain;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/WaypointTurnReq.java b/ard-route/src/main/java/com/ard/route/domain/WaypointTurnReq.java
similarity index 92%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/WaypointTurnReq.java
rename to ard-route/src/main/java/com/ard/route/domain/WaypointTurnReq.java
index 1cd4f6e..e9854d1 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/WaypointTurnReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/WaypointTurnReq.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain;
+package com.ard.route.domain;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlAction.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlAction.java
similarity index 91%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlAction.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlAction.java
index 653b2b4..06583c6 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlAction.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlAction.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlActionActuatorFuncParam.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlActionActuatorFuncParam.java
similarity index 98%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlActionActuatorFuncParam.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlActionActuatorFuncParam.java
index fc40c11..eb7fa1b 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlActionActuatorFuncParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlActionActuatorFuncParam.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlActionGroup.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlActionGroup.java
similarity index 94%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlActionGroup.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlActionGroup.java
index 595dd9f..d1c1302 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlActionGroup.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlActionGroup.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlActionTrigger.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlActionTrigger.java
similarity index 89%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlActionTrigger.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlActionTrigger.java
index 7c8f07b..8ea5fb9 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlActionTrigger.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlActionTrigger.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlDocument.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlDocument.java
similarity index 92%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlDocument.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlDocument.java
index cbe125e..8a90b10 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlDocument.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlDocument.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlDroneInfo.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlDroneInfo.java
similarity index 88%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlDroneInfo.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlDroneInfo.java
index d7b8d73..c69370c 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlDroneInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlDroneInfo.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlFolder.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlFolder.java
similarity index 97%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlFolder.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlFolder.java
index 884dd4f..29338fd 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlFolder.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlFolder.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamImplicit;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlGlobalWaypointHeadingParam.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlGlobalWaypointHeadingParam.java
similarity index 93%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlGlobalWaypointHeadingParam.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlGlobalWaypointHeadingParam.java
index c3867f4..19b98c9 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlGlobalWaypointHeadingParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlGlobalWaypointHeadingParam.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlInfo.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlInfo.java
similarity index 92%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlInfo.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlInfo.java
index 678be78..23dbb57 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlInfo.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlLineString.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlLineString.java
similarity index 84%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlLineString.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlLineString.java
index 50a86db..61b0299 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlLineString.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlLineString.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlLinearRing.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlLinearRing.java
similarity index 84%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlLinearRing.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlLinearRing.java
index e41f28f..a331e99 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlLinearRing.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlLinearRing.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlMissionConfig.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlMissionConfig.java
similarity index 96%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlMissionConfig.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlMissionConfig.java
index 13a3999..80faaba 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlMissionConfig.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlMissionConfig.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlOuterBoundaryIs.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlOuterBoundaryIs.java
similarity index 85%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlOuterBoundaryIs.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlOuterBoundaryIs.java
index c61b3ea..13cbbfe 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlOuterBoundaryIs.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlOuterBoundaryIs.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlOverlap.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlOverlap.java
similarity index 95%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlOverlap.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlOverlap.java
index 49e31c1..061b2e3 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlOverlap.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlOverlap.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlParams.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlParams.java
similarity index 88%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlParams.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlParams.java
index 4370f94..de84a46 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlParams.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlParams.java
@@ -1,8 +1,8 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
-import com.ard.route.kmz.domain.MappingTypeReq;
-import com.ard.route.kmz.domain.WaypointHeadingReq;
-import com.ard.route.kmz.domain.WaypointTurnReq;
+import com.ard.route.domain.MappingTypeReq;
+import com.ard.route.domain.WaypointHeadingReq;
+import com.ard.route.domain.WaypointTurnReq;
import lombok.Data;
import java.util.List;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlPayloadInfo.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlPayloadInfo.java
similarity index 89%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlPayloadInfo.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlPayloadInfo.java
index 95f3eee..8662d08 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlPayloadInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlPayloadInfo.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlPayloadParam.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlPayloadParam.java
similarity index 95%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlPayloadParam.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlPayloadParam.java
index c127131..e7cbfa0 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlPayloadParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlPayloadParam.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlPlacemark.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlPlacemark.java
similarity index 98%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlPlacemark.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlPlacemark.java
index f3d4bcd..fe33390 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlPlacemark.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlPlacemark.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlPoint.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlPoint.java
similarity index 84%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlPoint.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlPoint.java
index 13adf9f..666de8a 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlPoint.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlPoint.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlPolygon.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlPolygon.java
similarity index 85%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlPolygon.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlPolygon.java
index 7c6b29c..25026e3 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlPolygon.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlPolygon.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlWayLineCoordinateSysParam.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlWayLineCoordinateSysParam.java
similarity index 94%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlWayLineCoordinateSysParam.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlWayLineCoordinateSysParam.java
index d55754c..5f4a1af 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlWayLineCoordinateSysParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlWayLineCoordinateSysParam.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlWaypointGimbalHeadingParam.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointGimbalHeadingParam.java
similarity index 90%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlWaypointGimbalHeadingParam.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointGimbalHeadingParam.java
index 0c96471..9025f27 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlWaypointGimbalHeadingParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointGimbalHeadingParam.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlWaypointHeadingParam.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointHeadingParam.java
similarity index 93%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlWaypointHeadingParam.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointHeadingParam.java
index e484361..5fe75d0 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlWaypointHeadingParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointHeadingParam.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlWaypointTurnParam.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointTurnParam.java
similarity index 89%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlWaypointTurnParam.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointTurnParam.java
index a8e98e0..5a04cea 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/KmlWaypointTurnParam.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointTurnParam.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/RoutePointInfo.java b/ard-route/src/main/java/com/ard/route/domain/kml/RoutePointInfo.java
similarity index 86%
rename from ard-route/src/main/java/com/ard/route/kmz/domain/kml/RoutePointInfo.java
rename to ard-route/src/main/java/com/ard/route/domain/kml/RoutePointInfo.java
index a8c7251..e82695d 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/domain/kml/RoutePointInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/RoutePointInfo.java
@@ -1,8 +1,8 @@
-package com.ard.route.kmz.domain.kml;
+package com.ard.route.domain.kml;
-import com.ard.route.kmz.domain.PointActionReq;
-import com.ard.route.kmz.domain.WaypointHeadingReq;
-import com.ard.route.kmz.domain.WaypointTurnReq;
+import com.ard.route.domain.PointActionReq;
+import com.ard.route.domain.WaypointHeadingReq;
+import com.ard.route.domain.WaypointTurnReq;
import lombok.Data;
import java.io.Serializable;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ActionActuatorFuncEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/ActionActuatorFuncEnums.java
similarity index 96%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ActionActuatorFuncEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/ActionActuatorFuncEnums.java
index b617e99..b1af235 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ActionActuatorFuncEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/ActionActuatorFuncEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:actionActuatorFunc 动作类型
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ActionGroupModeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/ActionGroupModeEnums.java
similarity index 94%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ActionGroupModeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/ActionGroupModeEnums.java
index 97cf29b..5348730 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ActionGroupModeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/ActionGroupModeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:actionGroupMode 动作执行模式
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ActionTriggerTypeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/ActionTriggerTypeEnums.java
similarity index 95%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ActionTriggerTypeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/ActionTriggerTypeEnums.java
index 07256fb..7f4fe9c 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ActionTriggerTypeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/ActionTriggerTypeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:actionTriggerType 动作触发器类型
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/AircraftPathModeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/AircraftPathModeEnums.java
similarity index 94%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/AircraftPathModeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/AircraftPathModeEnums.java
index be1fa1a..f20a0d0 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/AircraftPathModeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/AircraftPathModeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:aircraftPathMode 飞行器偏航角转动模式
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/CollectionMethodEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/CollectionMethodEnums.java
similarity index 94%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/CollectionMethodEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/CollectionMethodEnums.java
index 54d6792..c8bf92c 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/CollectionMethodEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/CollectionMethodEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:overlap 采集类型
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/DroneEnumValueEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/DroneEnumValueEnums.java
similarity index 95%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/DroneEnumValueEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/DroneEnumValueEnums.java
index 03beb27..3449f16 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/DroneEnumValueEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/DroneEnumValueEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:droneEnumValue 飞行器机型主类型
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ExecuteHeightModeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/ExecuteHeightModeEnums.java
similarity index 95%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ExecuteHeightModeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/ExecuteHeightModeEnums.java
index c2b9ee3..93fdecc 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ExecuteHeightModeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/ExecuteHeightModeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:executeHeightMode 执行高度模式
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ExecuteRCLostActionEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/ExecuteRCLostActionEnums.java
similarity index 95%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ExecuteRCLostActionEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/ExecuteRCLostActionEnums.java
index 073c262..87e7caf 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ExecuteRCLostActionEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/ExecuteRCLostActionEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:executeRCLostAction 失控动作类型
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ExitOnRCLostEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/ExitOnRCLostEnums.java
similarity index 94%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ExitOnRCLostEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/ExitOnRCLostEnums.java
index b55af40..a2276b2 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ExitOnRCLostEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/ExitOnRCLostEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:exitOnRCLost 失控是否继续执行航线
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/FinishActionEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/FinishActionEnums.java
similarity index 96%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/FinishActionEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/FinishActionEnums.java
index 8cc370d..d724e93 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/FinishActionEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/FinishActionEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:finishAction 航线结束动作
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/FlyToWaylineModeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/FlyToWaylineModeEnums.java
similarity index 94%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/FlyToWaylineModeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/FlyToWaylineModeEnums.java
index 1c02254..30d18c2 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/FlyToWaylineModeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/FlyToWaylineModeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:flyToWaylineMode 飞向首航点模式
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/FocusModeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/FocusModeEnums.java
similarity index 94%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/FocusModeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/FocusModeEnums.java
index 681c72f..5e58af6 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/FocusModeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/FocusModeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:focusMode 负载对焦模式
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/GimbalPitchModeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/GimbalPitchModeEnums.java
similarity index 94%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/GimbalPitchModeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/GimbalPitchModeEnums.java
index a9e1ac3..f2c1b6a 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/GimbalPitchModeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/GimbalPitchModeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:gimbalPitchMode 云台俯仰角控制模式
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/GlobalWaypointTurnModeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/GlobalWaypointTurnModeEnums.java
similarity index 96%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/GlobalWaypointTurnModeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/GlobalWaypointTurnModeEnums.java
index 1f567d8..663c812 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/GlobalWaypointTurnModeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/GlobalWaypointTurnModeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:globalWaypointTurnMode 全局航点类型（全局航点转弯模式）
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/HeightModeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/HeightModeEnums.java
similarity index 96%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/HeightModeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/HeightModeEnums.java
index 6b29695..3367d4f 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/HeightModeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/HeightModeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:heightMode 航点高程参考平面
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ImageFormatEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/ImageFormatEnums.java
similarity index 95%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ImageFormatEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/ImageFormatEnums.java
index 9a60d2c..bf4f449 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ImageFormatEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/ImageFormatEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:imageFormat 图片格式列表
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/LensTypeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/LensTypeEnums.java
similarity index 94%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/LensTypeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/LensTypeEnums.java
index 0f84d97..bfd4515 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/LensTypeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/LensTypeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:overlap 采集类型
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/MeteringModeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/MeteringModeEnums.java
similarity index 94%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/MeteringModeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/MeteringModeEnums.java
index 3b08baa..6ecb127 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/MeteringModeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/MeteringModeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:meteringMode 负载测光模式
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/PayloadPositionIndexEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/PayloadPositionIndexEnums.java
similarity index 95%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/PayloadPositionIndexEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/PayloadPositionIndexEnums.java
index 9b799f7..3c15a76 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/PayloadPositionIndexEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/PayloadPositionIndexEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:payloadPositionIndex 负载挂载位置
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/PayloadTypeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/PayloadTypeEnums.java
similarity index 96%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/PayloadTypeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/PayloadTypeEnums.java
index 6305eca..640d3ca 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/PayloadTypeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/PayloadTypeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:payloadEnumValue 负载机型主类型
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/PositioningTypeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/PositioningTypeEnums.java
similarity index 96%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/PositioningTypeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/PositioningTypeEnums.java
index 290b232..4c6c934 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/PositioningTypeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/PositioningTypeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:positioningType 经纬度与高度数据源
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ReturnModeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/ReturnModeEnums.java
similarity index 95%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ReturnModeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/ReturnModeEnums.java
index 457615b..087f19e 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ReturnModeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/ReturnModeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:returnMode 激光雷达回波模式
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ScanningModeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/ScanningModeEnums.java
similarity index 94%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ScanningModeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/ScanningModeEnums.java
index 4941a30..3f58483 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ScanningModeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/ScanningModeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:scanningMode 负载扫描模式
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ShootTypeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/ShootTypeEnums.java
similarity index 94%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ShootTypeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/ShootTypeEnums.java
index 6f4fb9b..314b83a 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/ShootTypeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/ShootTypeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:shootType 拍照模式（定时或定距）
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/TemplateTypeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/TemplateTypeEnums.java
similarity index 95%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/TemplateTypeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/TemplateTypeEnums.java
index 26fdb05..412c926 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/TemplateTypeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/TemplateTypeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:templateType 预定义模板类型
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/WaypointHeadingModeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/WaypointHeadingModeEnums.java
similarity index 96%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/WaypointHeadingModeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/WaypointHeadingModeEnums.java
index 93dd3e2..ef1c440 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/WaypointHeadingModeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/WaypointHeadingModeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:waypointHeadingMode 飞行器偏航角模式
diff --git a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/WaypointHeadingPathModeEnums.java b/ard-route/src/main/java/com/ard/route/enums/kml/WaypointHeadingPathModeEnums.java
similarity index 95%
rename from ard-route/src/main/java/com/ard/route/kmz/enums/kml/WaypointHeadingPathModeEnums.java
rename to ard-route/src/main/java/com/ard/route/enums/kml/WaypointHeadingPathModeEnums.java
index ad1afdd..bb9371d 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/enums/kml/WaypointHeadingPathModeEnums.java
+++ b/ard-route/src/main/java/com/ard/route/enums/kml/WaypointHeadingPathModeEnums.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.enums.kml;
+package com.ard.route.enums.kml;
/**
* wpml:waypointHeadingPathMode 飞行器偏航角转动方向
diff --git a/ard-route/src/main/java/com/ard/route/kmz/service/UavRouteService.java b/ard-route/src/main/java/com/ard/route/service/UavRouteService.java
similarity index 73%
rename from ard-route/src/main/java/com/ard/route/kmz/service/UavRouteService.java
rename to ard-route/src/main/java/com/ard/route/service/UavRouteService.java
index 30434cf..6aef571 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/service/UavRouteService.java
+++ b/ard-route/src/main/java/com/ard/route/service/UavRouteService.java
@@ -1,6 +1,6 @@
-package com.ard.route.kmz.service;
+package com.ard.route.service;
-import com.ard.route.kmz.domain.UavRouteReq;
+import com.ard.route.domain.UavRouteReq;
public interface UavRouteService {
diff --git a/ard-route/src/main/java/com/ard/route/kmz/service/impl/UavRouteServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
similarity index 91%
rename from ard-route/src/main/java/com/ard/route/kmz/service/impl/UavRouteServiceImpl.java
rename to ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
index cee3911..33b596b 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/service/impl/UavRouteServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
@@ -1,17 +1,17 @@
-package com.ard.route.kmz.service.impl;
+package com.ard.route.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.io.FileUtil;
-import com.ard.route.kmz.domain.kml.*;
-import com.ard.route.kmz.util.RouteFileUtils;
-import com.ard.route.kmz.constant.FileTypeConstants;
-import com.ard.route.kmz.domain.RoutePointReq;
-import com.ard.route.kmz.domain.UavRouteReq;
-import com.ard.route.kmz.domain.WaypointHeadingReq;
-import com.ard.route.kmz.domain.WaypointTurnReq;
-import com.ard.route.kmz.enums.kml.ExitOnRCLostEnums;
-import com.ard.route.kmz.service.UavRouteService;
+import com.ard.route.constant.FileTypeConstants;
+import com.ard.route.domain.RoutePointReq;
+import com.ard.route.domain.UavRouteReq;
+import com.ard.route.domain.WaypointHeadingReq;
+import com.ard.route.domain.WaypointTurnReq;
+import com.ard.route.domain.kml.*;
+import com.ard.route.enums.kml.ExitOnRCLostEnums;
+import com.ard.route.util.RouteFileUtils;
+import com.ard.route.service.UavRouteService;
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.ArchiveInputStream;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/util/Gps.java b/ard-route/src/main/java/com/ard/route/util/Gps.java
similarity index 86%
rename from ard-route/src/main/java/com/ard/route/kmz/util/Gps.java
rename to ard-route/src/main/java/com/ard/route/util/Gps.java
index 402459b..7c4ff84 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/util/Gps.java
+++ b/ard-route/src/main/java/com/ard/route/util/Gps.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.util;
+package com.ard.route.util;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/ard-route/src/main/java/com/ard/route/kmz/util/PositionUtils.java b/ard-route/src/main/java/com/ard/route/util/PositionUtils.java
similarity index 99%
rename from ard-route/src/main/java/com/ard/route/kmz/util/PositionUtils.java
rename to ard-route/src/main/java/com/ard/route/util/PositionUtils.java
index 44df1ca..1a0a11c 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/util/PositionUtils.java
+++ b/ard-route/src/main/java/com/ard/route/util/PositionUtils.java
@@ -1,4 +1,4 @@
-package com.ard.route.kmz.util;
+package com.ard.route.util;
/**
* 各地图API坐标系统比较与转换;
*
diff --git a/ard-route/src/main/java/com/ard/route/kmz/util/RouteFileUtils.java b/ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java
similarity index 99%
rename from ard-route/src/main/java/com/ard/route/kmz/util/RouteFileUtils.java
rename to ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java
index c745a74..cff95f2 100644
--- a/ard-route/src/main/java/com/ard/route/kmz/util/RouteFileUtils.java
+++ b/ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java
@@ -1,12 +1,12 @@
-package com.ard.route.kmz.util;
+package com.ard.route.util;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
-import com.ard.route.kmz.domain.*;
-import com.ard.route.kmz.domain.kml.*;
-import com.ard.route.kmz.enums.kml.*;
-import com.ard.route.kmz.constant.FileTypeConstants;
+import com.ard.route.domain.*;
+import com.ard.route.domain.kml.*;
+import com.ard.route.enums.kml.*;
+import com.ard.route.constant.FileTypeConstants;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
import org.apache.commons.lang3.StringUtils;
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 c6aa5aa..e62cb5f 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
@@ -26,7 +26,7 @@
import com.ard.sample.manage.model.param.DeviceQueryParam;
import com.ard.sample.manage.model.receiver.*;
import com.ard.sample.manage.service.*;
-import com.ard.system.service.ISysDeptService;
+import com.ard.system.service.system.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/authorize/common/AuthorizeUtil.java b/ard-system/src/main/java/com/ard/system/common/AuthorizeUtil.java
similarity index 99%
rename from ard-system/src/main/java/com/ard/authorize/common/AuthorizeUtil.java
rename to ard-system/src/main/java/com/ard/system/common/AuthorizeUtil.java
index 4d5aea2..00cec06 100644
--- a/ard-system/src/main/java/com/ard/authorize/common/AuthorizeUtil.java
+++ b/ard-system/src/main/java/com/ard/system/common/AuthorizeUtil.java
@@ -1,4 +1,4 @@
-package com.ard.authorize.common;
+package com.ard.system.common;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.binary.Hex;
diff --git a/ard-system/src/main/java/com/ard/authorize/common/DateTimeUtil.java b/ard-system/src/main/java/com/ard/system/common/DateTimeUtil.java
similarity index 99%
rename from ard-system/src/main/java/com/ard/authorize/common/DateTimeUtil.java
rename to ard-system/src/main/java/com/ard/system/common/DateTimeUtil.java
index 0010479..67beb43 100644
--- a/ard-system/src/main/java/com/ard/authorize/common/DateTimeUtil.java
+++ b/ard-system/src/main/java/com/ard/system/common/DateTimeUtil.java
@@ -1,4 +1,4 @@
-package com.ard.authorize.common;
+package com.ard.system.common;
import org.apache.commons.lang3.time.DateUtils;
diff --git a/ard-system/src/main/java/com/ard/authorize/common/Md5Utils.java b/ard-system/src/main/java/com/ard/system/common/Md5Utils.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/authorize/common/Md5Utils.java
rename to ard-system/src/main/java/com/ard/system/common/Md5Utils.java
index 35fdfac..ac5be99 100644
--- a/ard-system/src/main/java/com/ard/authorize/common/Md5Utils.java
+++ b/ard-system/src/main/java/com/ard/system/common/Md5Utils.java
@@ -1,4 +1,4 @@
-package com.ard.authorize.common;
+package com.ard.system.common;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/ard-system/src/main/java/com/ard/authorize/domain/AuthorizeInfo.java b/ard-system/src/main/java/com/ard/system/domain/authorize/AuthorizeInfo.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/authorize/domain/AuthorizeInfo.java
rename to ard-system/src/main/java/com/ard/system/domain/authorize/AuthorizeInfo.java
index 5025b50..7a68fba 100644
--- a/ard-system/src/main/java/com/ard/authorize/domain/AuthorizeInfo.java
+++ b/ard-system/src/main/java/com/ard/system/domain/authorize/AuthorizeInfo.java
@@ -1,4 +1,4 @@
-package com.ard.authorize.domain;
+package com.ard.system.domain.authorize;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/ard-system/src/main/java/com/ard/authorize/domain/ParsLicenseInfo.java b/ard-system/src/main/java/com/ard/system/domain/authorize/ParsLicenseInfo.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/authorize/domain/ParsLicenseInfo.java
rename to ard-system/src/main/java/com/ard/system/domain/authorize/ParsLicenseInfo.java
index d61fd9d..47e19f6 100644
--- a/ard-system/src/main/java/com/ard/authorize/domain/ParsLicenseInfo.java
+++ b/ard-system/src/main/java/com/ard/system/domain/authorize/ParsLicenseInfo.java
@@ -1,4 +1,4 @@
-package com.ard.authorize.domain;
+package com.ard.system.domain.authorize;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/ard-system/src/main/java/com/ard/data/domain/ArdMapManagement.java b/ard-system/src/main/java/com/ard/system/domain/data/ArdMapManagement.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/data/domain/ArdMapManagement.java
rename to ard-system/src/main/java/com/ard/system/domain/data/ArdMapManagement.java
index b5b0fc0..dc005b8 100644
--- a/ard-system/src/main/java/com/ard/data/domain/ArdMapManagement.java
+++ b/ard-system/src/main/java/com/ard/system/domain/data/ArdMapManagement.java
@@ -1,4 +1,4 @@
-package com.ard.data.domain;
+package com.ard.system.domain.data;
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
diff --git a/ard-system/src/main/java/com/ard/data/domain/ArdModelManagement.java b/ard-system/src/main/java/com/ard/system/domain/data/ArdModelManagement.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/data/domain/ArdModelManagement.java
rename to ard-system/src/main/java/com/ard/system/domain/data/ArdModelManagement.java
index 909883d..766cafc 100644
--- a/ard-system/src/main/java/com/ard/data/domain/ArdModelManagement.java
+++ b/ard-system/src/main/java/com/ard/system/domain/data/ArdModelManagement.java
@@ -1,4 +1,4 @@
-package com.ard.data.domain;
+package com.ard.system.domain.data;
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
@@ -39,6 +39,6 @@
/** 模型路径 */
@Excel(name = "模型路径")
- private Long modelUrl;
+ private String modelUrl;
}
diff --git a/ard-system/src/main/java/com/ard/data/domain/ArdTileManagement.java b/ard-system/src/main/java/com/ard/system/domain/data/ArdTileManagement.java
similarity index 96%
rename from ard-system/src/main/java/com/ard/data/domain/ArdTileManagement.java
rename to ard-system/src/main/java/com/ard/system/domain/data/ArdTileManagement.java
index 321b41d..c742cc9 100644
--- a/ard-system/src/main/java/com/ard/data/domain/ArdTileManagement.java
+++ b/ard-system/src/main/java/com/ard/system/domain/data/ArdTileManagement.java
@@ -1,4 +1,4 @@
-package com.ard.data.domain;
+package com.ard.system.domain.data;
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
diff --git a/ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java b/ard-system/src/main/java/com/ard/system/domain/noflyzone/ArdNoFlyZone.java
similarity index 80%
rename from ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java
rename to ard-system/src/main/java/com/ard/system/domain/noflyzone/ArdNoFlyZone.java
index 003a1fb..a2805e2 100644
--- a/ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java
+++ b/ard-system/src/main/java/com/ard/system/domain/noflyzone/ArdNoFlyZone.java
@@ -1,10 +1,8 @@
-package com.ard.data.noflyzone.domain;
+package com.ard.system.domain.noflyzone;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
diff --git a/ard-system/src/main/java/com/ard/data/noflyzone/domain/FeatureCollection.java b/ard-system/src/main/java/com/ard/system/domain/noflyzone/FeatureCollection.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/data/noflyzone/domain/FeatureCollection.java
rename to ard-system/src/main/java/com/ard/system/domain/noflyzone/FeatureCollection.java
index 4caf0ba..803bf40 100644
--- a/ard-system/src/main/java/com/ard/data/noflyzone/domain/FeatureCollection.java
+++ b/ard-system/src/main/java/com/ard/system/domain/noflyzone/FeatureCollection.java
@@ -1,4 +1,4 @@
-package com.ard.data.noflyzone.domain;
+package com.ard.system.domain.noflyzone;
import lombok.Data;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/data/noflyzone/domain/FeatureCollectionTypeHandler.java b/ard-system/src/main/java/com/ard/system/domain/noflyzone/FeatureCollectionTypeHandler.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/data/noflyzone/domain/FeatureCollectionTypeHandler.java
rename to ard-system/src/main/java/com/ard/system/domain/noflyzone/FeatureCollectionTypeHandler.java
index 888d20b..d8440a7 100644
--- a/ard-system/src/main/java/com/ard/data/noflyzone/domain/FeatureCollectionTypeHandler.java
+++ b/ard-system/src/main/java/com/ard/system/domain/noflyzone/FeatureCollectionTypeHandler.java
@@ -1,4 +1,4 @@
-package com.ard.data.noflyzone.domain;
+package com.ard.system.domain.noflyzone;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysCache.java b/ard-system/src/main/java/com/ard/system/domain/system/SysCache.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/domain/SysCache.java
rename to ard-system/src/main/java/com/ard/system/domain/system/SysCache.java
index 7a556b8..9893322 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysCache.java
+++ b/ard-system/src/main/java/com/ard/system/domain/system/SysCache.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain;
+package com.ard.system.domain.system;
import com.ard.common.utils.StringUtils;
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysConfig.java b/ard-system/src/main/java/com/ard/system/domain/system/SysConfig.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/domain/SysConfig.java
rename to ard-system/src/main/java/com/ard/system/domain/system/SysConfig.java
index 3a432a4..2108dfd 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysConfig.java
+++ b/ard-system/src/main/java/com/ard/system/domain/system/SysConfig.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain;
+package com.ard.system.domain.system;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysLogininfor.java b/ard-system/src/main/java/com/ard/system/domain/system/SysLogininfor.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/domain/SysLogininfor.java
rename to ard-system/src/main/java/com/ard/system/domain/system/SysLogininfor.java
index f02267c..1fa7b22 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysLogininfor.java
+++ b/ard-system/src/main/java/com/ard/system/domain/system/SysLogininfor.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain;
+package com.ard.system.domain.system;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysNotice.java b/ard-system/src/main/java/com/ard/system/domain/system/SysNotice.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/domain/SysNotice.java
rename to ard-system/src/main/java/com/ard/system/domain/system/SysNotice.java
index 27b23ab..4791e52 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysNotice.java
+++ b/ard-system/src/main/java/com/ard/system/domain/system/SysNotice.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain;
+package com.ard.system.domain.system;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysOperLog.java b/ard-system/src/main/java/com/ard/system/domain/system/SysOperLog.java
similarity index 99%
rename from ard-system/src/main/java/com/ard/system/domain/SysOperLog.java
rename to ard-system/src/main/java/com/ard/system/domain/system/SysOperLog.java
index 0d4794f..3cf57f3 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysOperLog.java
+++ b/ard-system/src/main/java/com/ard/system/domain/system/SysOperLog.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain;
+package com.ard.system.domain.system;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysPost.java b/ard-system/src/main/java/com/ard/system/domain/system/SysPost.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/domain/SysPost.java
rename to ard-system/src/main/java/com/ard/system/domain/system/SysPost.java
index 08dc845..8ee3368 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysPost.java
+++ b/ard-system/src/main/java/com/ard/system/domain/system/SysPost.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain;
+package com.ard.system.domain.system;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysRoleDept.java b/ard-system/src/main/java/com/ard/system/domain/system/SysRoleDept.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/domain/SysRoleDept.java
rename to ard-system/src/main/java/com/ard/system/domain/system/SysRoleDept.java
index e73c591..67d9476 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysRoleDept.java
+++ b/ard-system/src/main/java/com/ard/system/domain/system/SysRoleDept.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain;
+package com.ard.system.domain.system;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysRoleMenu.java b/ard-system/src/main/java/com/ard/system/domain/system/SysRoleMenu.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/domain/SysRoleMenu.java
rename to ard-system/src/main/java/com/ard/system/domain/system/SysRoleMenu.java
index 1e9ef62..0786883 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysRoleMenu.java
+++ b/ard-system/src/main/java/com/ard/system/domain/system/SysRoleMenu.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain;
+package com.ard.system.domain.system;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysUserOnline.java b/ard-system/src/main/java/com/ard/system/domain/system/SysUserOnline.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/domain/SysUserOnline.java
rename to ard-system/src/main/java/com/ard/system/domain/system/SysUserOnline.java
index 5ffe7c7..68a9a2a 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysUserOnline.java
+++ b/ard-system/src/main/java/com/ard/system/domain/system/SysUserOnline.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain;
+package com.ard.system.domain.system;
/**
* 当前在线会话
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysUserPost.java b/ard-system/src/main/java/com/ard/system/domain/system/SysUserPost.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/domain/SysUserPost.java
rename to ard-system/src/main/java/com/ard/system/domain/system/SysUserPost.java
index 74cf441..8b086b0 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysUserPost.java
+++ b/ard-system/src/main/java/com/ard/system/domain/system/SysUserPost.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain;
+package com.ard.system.domain.system;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysUserRole.java b/ard-system/src/main/java/com/ard/system/domain/system/SysUserRole.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/domain/SysUserRole.java
rename to ard-system/src/main/java/com/ard/system/domain/system/SysUserRole.java
index 13176f0..2bd82e1 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysUserRole.java
+++ b/ard-system/src/main/java/com/ard/system/domain/system/SysUserRole.java
@@ -1,4 +1,4 @@
-package com.ard.system.domain;
+package com.ard.system.domain.system;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/ard-system/src/main/java/com/ard/data/mapper/ArdMapManagementMapper.java b/ard-system/src/main/java/com/ard/system/mapper/data/ArdMapManagementMapper.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/data/mapper/ArdMapManagementMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/data/ArdMapManagementMapper.java
index d3e8555..10380ac 100644
--- a/ard-system/src/main/java/com/ard/data/mapper/ArdMapManagementMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/data/ArdMapManagementMapper.java
@@ -1,6 +1,6 @@
-package com.ard.data.mapper;
+package com.ard.system.mapper.data;
-import com.ard.data.domain.ArdMapManagement;
+import com.ard.system.domain.data.ArdMapManagement;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/data/mapper/ArdModelManagementMapper.java b/ard-system/src/main/java/com/ard/system/mapper/data/ArdModelManagementMapper.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/data/mapper/ArdModelManagementMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/data/ArdModelManagementMapper.java
index 387cae0..3d0d496 100644
--- a/ard-system/src/main/java/com/ard/data/mapper/ArdModelManagementMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/data/ArdModelManagementMapper.java
@@ -1,6 +1,6 @@
-package com.ard.data.mapper;
+package com.ard.system.mapper.data;
-import com.ard.data.domain.ArdModelManagement;
+import com.ard.system.domain.data.ArdModelManagement;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/data/mapper/ArdTileManagementMapper.java b/ard-system/src/main/java/com/ard/system/mapper/data/ArdTileManagementMapper.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/data/mapper/ArdTileManagementMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/data/ArdTileManagementMapper.java
index 85f912c..99c71a3 100644
--- a/ard-system/src/main/java/com/ard/data/mapper/ArdTileManagementMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/data/ArdTileManagementMapper.java
@@ -1,6 +1,6 @@
-package com.ard.data.mapper;
+package com.ard.system.mapper.data;
-import com.ard.data.domain.ArdTileManagement;
+import com.ard.system.domain.data.ArdTileManagement;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/data/noflyzone/mapper/ArdNoFlyZoneMapper.java b/ard-system/src/main/java/com/ard/system/mapper/noflyzone/ArdNoFlyZoneMapper.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/data/noflyzone/mapper/ArdNoFlyZoneMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/noflyzone/ArdNoFlyZoneMapper.java
index 0a0acc3..6115e1e 100644
--- a/ard-system/src/main/java/com/ard/data/noflyzone/mapper/ArdNoFlyZoneMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/noflyzone/ArdNoFlyZoneMapper.java
@@ -1,7 +1,7 @@
-package com.ard.data.noflyzone.mapper;
+package com.ard.system.mapper.noflyzone;
import java.util.List;
-import com.ard.data.noflyzone.domain.ArdNoFlyZone;
+import com.ard.system.domain.noflyzone.ArdNoFlyZone;
/**
* 禁飞区管理Mapper接口
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysConfigMapper.java b/ard-system/src/main/java/com/ard/system/mapper/system/SysConfigMapper.java
similarity index 94%
rename from ard-system/src/main/java/com/ard/system/mapper/SysConfigMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/system/SysConfigMapper.java
index ba13619..dd2827e 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysConfigMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/system/SysConfigMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.mapper;
+package com.ard.system.mapper.system;
import java.util.List;
-import com.ard.system.domain.SysConfig;
+import com.ard.system.domain.system.SysConfig;
/**
* 参数配置 数据层
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysDeptMapper.java b/ard-system/src/main/java/com/ard/system/mapper/system/SysDeptMapper.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/mapper/SysDeptMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/system/SysDeptMapper.java
index 6eaf635..7e19a61 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysDeptMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/system/SysDeptMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.mapper;
+package com.ard.system.mapper.system;
import java.util.List;
import org.apache.ibatis.annotations.Param;
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysDictDataMapper.java b/ard-system/src/main/java/com/ard/system/mapper/system/SysDictDataMapper.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/mapper/SysDictDataMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/system/SysDictDataMapper.java
index ab33e70..0ac4c84 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysDictDataMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/system/SysDictDataMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.mapper;
+package com.ard.system.mapper.system;
import java.util.List;
import org.apache.ibatis.annotations.Param;
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysDictTypeMapper.java b/ard-system/src/main/java/com/ard/system/mapper/system/SysDictTypeMapper.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/mapper/SysDictTypeMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/system/SysDictTypeMapper.java
index ed318b4..c207b40 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysDictTypeMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/system/SysDictTypeMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.mapper;
+package com.ard.system.mapper.system;
import java.util.List;
import com.ard.common.core.domain.entity.SysDictType;
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysLogininforMapper.java b/ard-system/src/main/java/com/ard/system/mapper/system/SysLogininforMapper.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/system/mapper/SysLogininforMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/system/SysLogininforMapper.java
index 91b5105..c982e09 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysLogininforMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/system/SysLogininforMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.mapper;
+package com.ard.system.mapper.system;
import java.util.List;
-import com.ard.system.domain.SysLogininfor;
+import com.ard.system.domain.system.SysLogininfor;
/**
* 系统访问日志情况信息 数据层
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysMenuMapper.java b/ard-system/src/main/java/com/ard/system/mapper/system/SysMenuMapper.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/mapper/SysMenuMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/system/SysMenuMapper.java
index 9964aa6..392da5d 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysMenuMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/system/SysMenuMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.mapper;
+package com.ard.system.mapper.system;
import java.util.List;
import org.apache.ibatis.annotations.Param;
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysNoticeMapper.java b/ard-system/src/main/java/com/ard/system/mapper/system/SysNoticeMapper.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/system/mapper/SysNoticeMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/system/SysNoticeMapper.java
index c04a66d..65fee4b 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysNoticeMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/system/SysNoticeMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.mapper;
+package com.ard.system.mapper.system;
import java.util.List;
-import com.ard.system.domain.SysNotice;
+import com.ard.system.domain.system.SysNotice;
/**
* 通知公告表 数据层
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysOperLogMapper.java b/ard-system/src/main/java/com/ard/system/mapper/system/SysOperLogMapper.java
similarity index 91%
rename from ard-system/src/main/java/com/ard/system/mapper/SysOperLogMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/system/SysOperLogMapper.java
index 96a935b..b9b8bb6 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysOperLogMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/system/SysOperLogMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.mapper;
+package com.ard.system.mapper.system;
import java.util.List;
-import com.ard.system.domain.SysOperLog;
+import com.ard.system.domain.system.SysOperLog;
/**
* 操作日志 数据层
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysPostMapper.java b/ard-system/src/main/java/com/ard/system/mapper/system/SysPostMapper.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/mapper/SysPostMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/system/SysPostMapper.java
index 0b4c55c..dc97602 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysPostMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/system/SysPostMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.mapper;
+package com.ard.system.mapper.system;
import java.util.List;
-import com.ard.system.domain.SysPost;
+import com.ard.system.domain.system.SysPost;
/**
* 岗位信息 数据层
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysRoleDeptMapper.java b/ard-system/src/main/java/com/ard/system/mapper/system/SysRoleDeptMapper.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/system/mapper/SysRoleDeptMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/system/SysRoleDeptMapper.java
index c5d2afc..6891bb5 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysRoleDeptMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/system/SysRoleDeptMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.mapper;
+package com.ard.system.mapper.system;
import java.util.List;
-import com.ard.system.domain.SysRoleDept;
+import com.ard.system.domain.system.SysRoleDept;
/**
* 角色与部门关联表 数据层
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysRoleMapper.java b/ard-system/src/main/java/com/ard/system/mapper/system/SysRoleMapper.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/mapper/SysRoleMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/system/SysRoleMapper.java
index ebf8377..e757017 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysRoleMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/system/SysRoleMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.mapper;
+package com.ard.system.mapper.system;
import java.util.List;
import com.ard.common.core.domain.entity.SysRole;
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysRoleMenuMapper.java b/ard-system/src/main/java/com/ard/system/mapper/system/SysRoleMenuMapper.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/system/mapper/SysRoleMenuMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/system/SysRoleMenuMapper.java
index 4e9b440..9375625 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysRoleMenuMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/system/SysRoleMenuMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.mapper;
+package com.ard.system.mapper.system;
import java.util.List;
-import com.ard.system.domain.SysRoleMenu;
+import com.ard.system.domain.system.SysRoleMenu;
/**
* 角色与菜单关联表 数据层
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysUserMapper.java b/ard-system/src/main/java/com/ard/system/mapper/system/SysUserMapper.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/mapper/SysUserMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/system/SysUserMapper.java
index b5826a9..cd5d106 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysUserMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/system/SysUserMapper.java
@@ -1,4 +1,4 @@
-package com.ard.system.mapper;
+package com.ard.system.mapper.system;
import java.util.List;
import org.apache.ibatis.annotations.Param;
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysUserPostMapper.java b/ard-system/src/main/java/com/ard/system/mapper/system/SysUserPostMapper.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/system/mapper/SysUserPostMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/system/SysUserPostMapper.java
index aa36127..c1b452c 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysUserPostMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/system/SysUserPostMapper.java
@@ -1,7 +1,7 @@
-package com.ard.system.mapper;
+package com.ard.system.mapper.system;
import java.util.List;
-import com.ard.system.domain.SysUserPost;
+import com.ard.system.domain.system.SysUserPost;
/**
* 用户与岗位关联表 数据层
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysUserRoleMapper.java b/ard-system/src/main/java/com/ard/system/mapper/system/SysUserRoleMapper.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/system/mapper/SysUserRoleMapper.java
rename to ard-system/src/main/java/com/ard/system/mapper/system/SysUserRoleMapper.java
index eccaa51..a45be86 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysUserRoleMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/system/SysUserRoleMapper.java
@@ -1,8 +1,8 @@
-package com.ard.system.mapper;
+package com.ard.system.mapper.system;
import java.util.List;
import org.apache.ibatis.annotations.Param;
-import com.ard.system.domain.SysUserRole;
+import com.ard.system.domain.system.SysUserRole;
/**
* 用户与角色关联表 数据层
diff --git a/ard-system/src/main/java/com/ard/authorize/service/AuthorizeService.java b/ard-system/src/main/java/com/ard/system/service/authorize/AuthorizeService.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/authorize/service/AuthorizeService.java
rename to ard-system/src/main/java/com/ard/system/service/authorize/AuthorizeService.java
index 0c01655..449c89a 100644
--- a/ard-system/src/main/java/com/ard/authorize/service/AuthorizeService.java
+++ b/ard-system/src/main/java/com/ard/system/service/authorize/AuthorizeService.java
@@ -1,4 +1,4 @@
-package com.ard.authorize.service;
+package com.ard.system.service.authorize;
import com.alibaba.fastjson2.JSONObject;
import org.springframework.web.multipart.MultipartFile;
diff --git a/ard-system/src/main/java/com/ard/authorize/service/AuthorizeServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/authorize/impl/AuthorizeServiceImpl.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/authorize/service/AuthorizeServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/authorize/impl/AuthorizeServiceImpl.java
index 3f49e23..d2fa2e9 100644
--- a/ard-system/src/main/java/com/ard/authorize/service/AuthorizeServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/authorize/impl/AuthorizeServiceImpl.java
@@ -1,13 +1,14 @@
-package com.ard.authorize.service;
+package com.ard.system.service.authorize.impl;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
-import com.ard.authorize.common.AuthorizeUtil;
-import com.ard.authorize.common.DateTimeUtil;
-import com.ard.authorize.domain.AuthorizeInfo;
-import com.ard.authorize.domain.ParsLicenseInfo;
+import com.ard.system.common.AuthorizeUtil;
+import com.ard.system.common.DateTimeUtil;
+import com.ard.system.domain.authorize.AuthorizeInfo;
+import com.ard.system.domain.authorize.ParsLicenseInfo;
import com.ard.common.constant.CacheConstants;
import com.ard.common.core.redis.RedisCache;
+import com.ard.system.service.authorize.AuthorizeService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.IOUtils;
import org.springframework.stereotype.Service;
diff --git a/ard-system/src/main/java/com/ard/data/service/IArdMapManagementService.java b/ard-system/src/main/java/com/ard/system/service/data/IArdMapManagementService.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/data/service/IArdMapManagementService.java
rename to ard-system/src/main/java/com/ard/system/service/data/IArdMapManagementService.java
index a141a13..d1778d6 100644
--- a/ard-system/src/main/java/com/ard/data/service/IArdMapManagementService.java
+++ b/ard-system/src/main/java/com/ard/system/service/data/IArdMapManagementService.java
@@ -1,6 +1,6 @@
-package com.ard.data.service;
+package com.ard.system.service.data;
-import com.ard.data.domain.ArdMapManagement;
+import com.ard.system.domain.data.ArdMapManagement;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/data/service/IArdModelManagementService.java b/ard-system/src/main/java/com/ard/system/service/data/IArdModelManagementService.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/data/service/IArdModelManagementService.java
rename to ard-system/src/main/java/com/ard/system/service/data/IArdModelManagementService.java
index 718eeb5..a03000d 100644
--- a/ard-system/src/main/java/com/ard/data/service/IArdModelManagementService.java
+++ b/ard-system/src/main/java/com/ard/system/service/data/IArdModelManagementService.java
@@ -1,6 +1,6 @@
-package com.ard.data.service;
+package com.ard.system.service.data;
-import com.ard.data.domain.ArdModelManagement;
+import com.ard.system.domain.data.ArdModelManagement;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/data/service/IArdTileManagementService.java b/ard-system/src/main/java/com/ard/system/service/data/IArdTileManagementService.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/data/service/IArdTileManagementService.java
rename to ard-system/src/main/java/com/ard/system/service/data/IArdTileManagementService.java
index 8323d05..68a5533 100644
--- a/ard-system/src/main/java/com/ard/data/service/IArdTileManagementService.java
+++ b/ard-system/src/main/java/com/ard/system/service/data/IArdTileManagementService.java
@@ -1,6 +1,6 @@
-package com.ard.data.service;
+package com.ard.system.service.data;
-import com.ard.data.domain.ArdTileManagement;
+import com.ard.system.domain.data.ArdTileManagement;
import java.util.List;
diff --git a/ard-system/src/main/java/com/ard/data/service/impl/ArdMapManagementServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/data/impl/ArdMapManagementServiceImpl.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/data/service/impl/ArdMapManagementServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/data/impl/ArdMapManagementServiceImpl.java
index 881611a..403cb96 100644
--- a/ard-system/src/main/java/com/ard/data/service/impl/ArdMapManagementServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/data/impl/ArdMapManagementServiceImpl.java
@@ -1,11 +1,11 @@
-package com.ard.data.service.impl;
+package com.ard.system.service.data.impl;
import java.util.List;
import com.ard.common.utils.uuid.IdUtils;
-import com.ard.data.domain.ArdMapManagement;
-import com.ard.data.mapper.ArdMapManagementMapper;
-import com.ard.data.service.IArdMapManagementService;
+import com.ard.system.domain.data.ArdMapManagement;
+import com.ard.system.mapper.data.ArdMapManagementMapper;
+import com.ard.system.service.data.IArdMapManagementService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/ard-system/src/main/java/com/ard/data/service/impl/ArdModelManagementServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/data/impl/ArdModelManagementServiceImpl.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/data/service/impl/ArdModelManagementServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/data/impl/ArdModelManagementServiceImpl.java
index 5f67652..61608dd 100644
--- a/ard-system/src/main/java/com/ard/data/service/impl/ArdModelManagementServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/data/impl/ArdModelManagementServiceImpl.java
@@ -1,11 +1,11 @@
-package com.ard.data.service.impl;
+package com.ard.system.service.data.impl;
import java.util.List;
import com.ard.common.utils.uuid.IdUtils;
-import com.ard.data.domain.ArdModelManagement;
-import com.ard.data.mapper.ArdModelManagementMapper;
-import com.ard.data.service.IArdModelManagementService;
+import com.ard.system.domain.data.ArdModelManagement;
+import com.ard.system.mapper.data.ArdModelManagementMapper;
+import com.ard.system.service.data.IArdModelManagementService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/ard-system/src/main/java/com/ard/data/service/impl/ArdTileManagementServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/data/impl/ArdTileManagementServiceImpl.java
similarity index 90%
rename from ard-system/src/main/java/com/ard/data/service/impl/ArdTileManagementServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/data/impl/ArdTileManagementServiceImpl.java
index 26abf05..cbe83c9 100644
--- a/ard-system/src/main/java/com/ard/data/service/impl/ArdTileManagementServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/data/impl/ArdTileManagementServiceImpl.java
@@ -1,11 +1,11 @@
-package com.ard.data.service.impl;
+package com.ard.system.service.data.impl;
import java.util.List;
import com.ard.common.utils.uuid.IdUtils;
-import com.ard.data.domain.ArdTileManagement;
-import com.ard.data.mapper.ArdTileManagementMapper;
-import com.ard.data.service.IArdTileManagementService;
+import com.ard.system.domain.data.ArdTileManagement;
+import com.ard.system.mapper.data.ArdTileManagementMapper;
+import com.ard.system.service.data.IArdTileManagementService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/ard-system/src/main/java/com/ard/data/noflyzone/service/IArdNoFlyZoneService.java b/ard-system/src/main/java/com/ard/system/service/noflyzone/IArdNoFlyZoneService.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/data/noflyzone/service/IArdNoFlyZoneService.java
rename to ard-system/src/main/java/com/ard/system/service/noflyzone/IArdNoFlyZoneService.java
index 4287024..d11fed5 100644
--- a/ard-system/src/main/java/com/ard/data/noflyzone/service/IArdNoFlyZoneService.java
+++ b/ard-system/src/main/java/com/ard/system/service/noflyzone/IArdNoFlyZoneService.java
@@ -1,7 +1,7 @@
-package com.ard.data.noflyzone.service;
+package com.ard.system.service.noflyzone;
import java.util.List;
-import com.ard.data.noflyzone.domain.ArdNoFlyZone;
+import com.ard.system.domain.noflyzone.ArdNoFlyZone;
/**
* 禁飞区管理Service接口
diff --git a/ard-system/src/main/java/com/ard/data/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/noflyzone/impl/ArdNoFlyZoneServiceImpl.java
similarity index 91%
rename from ard-system/src/main/java/com/ard/data/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/noflyzone/impl/ArdNoFlyZoneServiceImpl.java
index a2549c6..f401263 100644
--- a/ard-system/src/main/java/com/ard/data/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/noflyzone/impl/ArdNoFlyZoneServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ard.data.noflyzone.service.impl;
+package com.ard.system.service.noflyzone.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.data.noflyzone.service.IArdNoFlyZoneService;
+import com.ard.system.service.noflyzone.IArdNoFlyZoneService;
import org.springframework.stereotype.Service;
-import com.ard.data.noflyzone.mapper.ArdNoFlyZoneMapper;
-import com.ard.data.noflyzone.domain.ArdNoFlyZone;
+import com.ard.system.mapper.noflyzone.ArdNoFlyZoneMapper;
+import com.ard.system.domain.noflyzone.ArdNoFlyZone;
import javax.annotation.Resource;
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysConfigService.java b/ard-system/src/main/java/com/ard/system/service/system/ISysConfigService.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/service/ISysConfigService.java
rename to ard-system/src/main/java/com/ard/system/service/system/ISysConfigService.java
index 67a8d80..13d3281 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysConfigService.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/ISysConfigService.java
@@ -1,7 +1,7 @@
-package com.ard.system.service;
+package com.ard.system.service.system;
import java.util.List;
-import com.ard.system.domain.SysConfig;
+import com.ard.system.domain.system.SysConfig;
/**
* 参数配置 服务层
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysDeptService.java b/ard-system/src/main/java/com/ard/system/service/system/ISysDeptService.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/service/ISysDeptService.java
rename to ard-system/src/main/java/com/ard/system/service/system/ISysDeptService.java
index abbac63..d7bfc76 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysDeptService.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/ISysDeptService.java
@@ -1,4 +1,4 @@
-package com.ard.system.service;
+package com.ard.system.service.system;
import java.util.List;
import com.ard.common.core.domain.TreeSelect;
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysDictDataService.java b/ard-system/src/main/java/com/ard/system/service/system/ISysDictDataService.java
similarity index 96%
rename from ard-system/src/main/java/com/ard/system/service/ISysDictDataService.java
rename to ard-system/src/main/java/com/ard/system/service/system/ISysDictDataService.java
index 00e8c3b..2e707da 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysDictDataService.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/ISysDictDataService.java
@@ -1,4 +1,4 @@
-package com.ard.system.service;
+package com.ard.system.service.system;
import java.util.List;
import com.ard.common.core.domain.entity.SysDictData;
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysDictTypeService.java b/ard-system/src/main/java/com/ard/system/service/system/ISysDictTypeService.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/service/ISysDictTypeService.java
rename to ard-system/src/main/java/com/ard/system/service/system/ISysDictTypeService.java
index 3304348..93ab48e 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysDictTypeService.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/ISysDictTypeService.java
@@ -1,4 +1,4 @@
-package com.ard.system.service;
+package com.ard.system.service.system;
import java.util.List;
import com.ard.common.core.domain.entity.SysDictData;
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysLogininforService.java b/ard-system/src/main/java/com/ard/system/service/system/ISysLogininforService.java
similarity index 89%
rename from ard-system/src/main/java/com/ard/system/service/ISysLogininforService.java
rename to ard-system/src/main/java/com/ard/system/service/system/ISysLogininforService.java
index 29cd89d..18b99d8 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysLogininforService.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/ISysLogininforService.java
@@ -1,7 +1,7 @@
-package com.ard.system.service;
+package com.ard.system.service.system;
import java.util.List;
-import com.ard.system.domain.SysLogininfor;
+import com.ard.system.domain.system.SysLogininfor;
/**
* 系统访问日志情况信息 服务层
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysMenuService.java b/ard-system/src/main/java/com/ard/system/service/system/ISysMenuService.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/service/ISysMenuService.java
rename to ard-system/src/main/java/com/ard/system/service/system/ISysMenuService.java
index db3e33b..2a3353e 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysMenuService.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/ISysMenuService.java
@@ -1,4 +1,4 @@
-package com.ard.system.service;
+package com.ard.system.service.system;
import java.util.List;
import java.util.Set;
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysNoticeService.java b/ard-system/src/main/java/com/ard/system/service/system/ISysNoticeService.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/system/service/ISysNoticeService.java
rename to ard-system/src/main/java/com/ard/system/service/system/ISysNoticeService.java
index 3eaa5e6..1893c19 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysNoticeService.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/ISysNoticeService.java
@@ -1,7 +1,7 @@
-package com.ard.system.service;
+package com.ard.system.service.system;
import java.util.List;
-import com.ard.system.domain.SysNotice;
+import com.ard.system.domain.system.SysNotice;
/**
* 公告 服务层
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysOperLogService.java b/ard-system/src/main/java/com/ard/system/service/system/ISysOperLogService.java
similarity index 91%
rename from ard-system/src/main/java/com/ard/system/service/ISysOperLogService.java
rename to ard-system/src/main/java/com/ard/system/service/system/ISysOperLogService.java
index 6137656..2ec2fb9 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysOperLogService.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/ISysOperLogService.java
@@ -1,7 +1,7 @@
-package com.ard.system.service;
+package com.ard.system.service.system;
import java.util.List;
-import com.ard.system.domain.SysOperLog;
+import com.ard.system.domain.system.SysOperLog;
/**
* 操作日志 服务层
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysPostService.java b/ard-system/src/main/java/com/ard/system/service/system/ISysPostService.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/service/ISysPostService.java
rename to ard-system/src/main/java/com/ard/system/service/system/ISysPostService.java
index 3177095..bac16c1 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysPostService.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/ISysPostService.java
@@ -1,7 +1,7 @@
-package com.ard.system.service;
+package com.ard.system.service.system;
import java.util.List;
-import com.ard.system.domain.SysPost;
+import com.ard.system.domain.system.SysPost;
/**
* 岗位信息 服务层
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysRoleService.java b/ard-system/src/main/java/com/ard/system/service/system/ISysRoleService.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/service/ISysRoleService.java
rename to ard-system/src/main/java/com/ard/system/service/system/ISysRoleService.java
index 770a16e..944cab6 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysRoleService.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/ISysRoleService.java
@@ -1,9 +1,9 @@
-package com.ard.system.service;
+package com.ard.system.service.system;
import java.util.List;
import java.util.Set;
import com.ard.common.core.domain.entity.SysRole;
-import com.ard.system.domain.SysUserRole;
+import com.ard.system.domain.system.SysUserRole;
/**
* 角色业务层
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysUserOnlineService.java b/ard-system/src/main/java/com/ard/system/service/system/ISysUserOnlineService.java
similarity index 92%
rename from ard-system/src/main/java/com/ard/system/service/ISysUserOnlineService.java
rename to ard-system/src/main/java/com/ard/system/service/system/ISysUserOnlineService.java
index caa0ec9..1fe515d 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysUserOnlineService.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/ISysUserOnlineService.java
@@ -1,7 +1,7 @@
-package com.ard.system.service;
+package com.ard.system.service.system;
import com.ard.common.core.domain.model.LoginUser;
-import com.ard.system.domain.SysUserOnline;
+import com.ard.system.domain.system.SysUserOnline;
/**
* 在线用户 服务层
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysUserService.java b/ard-system/src/main/java/com/ard/system/service/system/ISysUserService.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/service/ISysUserService.java
rename to ard-system/src/main/java/com/ard/system/service/system/ISysUserService.java
index c4cb956..f3adaa3 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysUserService.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/ISysUserService.java
@@ -1,4 +1,4 @@
-package com.ard.system.service;
+package com.ard.system.service.system;
import java.util.List;
import com.ard.common.core.domain.entity.SysUser;
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysConfigServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/system/impl/SysConfigServiceImpl.java
similarity index 96%
rename from ard-system/src/main/java/com/ard/system/service/impl/SysConfigServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/system/impl/SysConfigServiceImpl.java
index e8fb445..8c8e7a6 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysConfigServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/impl/SysConfigServiceImpl.java
@@ -1,8 +1,10 @@
-package com.ard.system.service.impl;
+package com.ard.system.service.system.impl;
import java.util.Collection;
import java.util.List;
import javax.annotation.PostConstruct;
+
+import com.ard.system.service.system.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.common.annotation.DataSource;
@@ -13,9 +15,8 @@
import com.ard.common.enums.DataSourceType;
import com.ard.common.exception.ServiceException;
import com.ard.common.utils.StringUtils;
-import com.ard.system.domain.SysConfig;
-import com.ard.system.mapper.SysConfigMapper;
-import com.ard.system.service.ISysConfigService;
+import com.ard.system.domain.system.SysConfig;
+import com.ard.system.mapper.system.SysConfigMapper;
/**
* 参数配置 服务层实现
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysDeptServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/system/impl/SysDeptServiceImpl.java
similarity index 97%
rename from ard-system/src/main/java/com/ard/system/service/impl/SysDeptServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/system/impl/SysDeptServiceImpl.java
index 6d21710..47b55ef 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysDeptServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/impl/SysDeptServiceImpl.java
@@ -1,9 +1,11 @@
-package com.ard.system.service.impl;
+package com.ard.system.service.system.impl;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
+
+import com.ard.system.service.system.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.common.annotation.DataScope;
@@ -17,9 +19,8 @@
import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.StringUtils;
import com.ard.common.utils.spring.SpringUtils;
-import com.ard.system.mapper.SysDeptMapper;
-import com.ard.system.mapper.SysRoleMapper;
-import com.ard.system.service.ISysDeptService;
+import com.ard.system.mapper.system.SysDeptMapper;
+import com.ard.system.mapper.system.SysRoleMapper;
/**
* 部门管理 服务实现
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysDictDataServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/system/impl/SysDictDataServiceImpl.java
similarity index 94%
rename from ard-system/src/main/java/com/ard/system/service/impl/SysDictDataServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/system/impl/SysDictDataServiceImpl.java
index aa16ce9..8451a57 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysDictDataServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/impl/SysDictDataServiceImpl.java
@@ -1,12 +1,13 @@
-package com.ard.system.service.impl;
+package com.ard.system.service.system.impl;
import java.util.List;
+
+import com.ard.system.service.system.ISysDictDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.common.core.domain.entity.SysDictData;
import com.ard.common.utils.DictUtils;
-import com.ard.system.mapper.SysDictDataMapper;
-import com.ard.system.service.ISysDictDataService;
+import com.ard.system.mapper.system.SysDictDataMapper;
/**
* 字典 业务层处理
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysDictTypeServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/system/impl/SysDictTypeServiceImpl.java
similarity index 96%
rename from ard-system/src/main/java/com/ard/system/service/impl/SysDictTypeServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/system/impl/SysDictTypeServiceImpl.java
index b810ebd..f4ea582 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/impl/SysDictTypeServiceImpl.java
@@ -1,10 +1,12 @@
-package com.ard.system.service.impl;
+package com.ard.system.service.system.impl;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
+
+import com.ard.system.service.system.ISysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -14,9 +16,8 @@
import com.ard.common.exception.ServiceException;
import com.ard.common.utils.DictUtils;
import com.ard.common.utils.StringUtils;
-import com.ard.system.mapper.SysDictDataMapper;
-import com.ard.system.mapper.SysDictTypeMapper;
-import com.ard.system.service.ISysDictTypeService;
+import com.ard.system.mapper.system.SysDictDataMapper;
+import com.ard.system.mapper.system.SysDictTypeMapper;
/**
* 字典 业务层处理
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysLogininforServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/system/impl/SysLogininforServiceImpl.java
similarity index 86%
rename from ard-system/src/main/java/com/ard/system/service/impl/SysLogininforServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/system/impl/SysLogininforServiceImpl.java
index cf03d1a..8b11771 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysLogininforServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/impl/SysLogininforServiceImpl.java
@@ -1,11 +1,12 @@
-package com.ard.system.service.impl;
+package com.ard.system.service.system.impl;
import java.util.List;
+
+import com.ard.system.service.system.ISysLogininforService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ard.system.domain.SysLogininfor;
-import com.ard.system.mapper.SysLogininforMapper;
-import com.ard.system.service.ISysLogininforService;
+import com.ard.system.domain.system.SysLogininfor;
+import com.ard.system.mapper.system.SysLogininforMapper;
/**
* 系统访问日志情况信息 服务层处理
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysMenuServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/system/impl/SysMenuServiceImpl.java
similarity index 98%
rename from ard-system/src/main/java/com/ard/system/service/impl/SysMenuServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/system/impl/SysMenuServiceImpl.java
index 3695dd5..d76e861 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysMenuServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/impl/SysMenuServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ard.system.service.impl;
+package com.ard.system.service.system.impl;
import java.util.ArrayList;
import java.util.Arrays;
@@ -8,6 +8,8 @@
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
+
+import com.ard.system.service.system.ISysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.common.constant.Constants;
@@ -20,10 +22,9 @@
import com.ard.common.utils.StringUtils;
import com.ard.system.domain.vo.MetaVo;
import com.ard.system.domain.vo.RouterVo;
-import com.ard.system.mapper.SysMenuMapper;
-import com.ard.system.mapper.SysRoleMapper;
-import com.ard.system.mapper.SysRoleMenuMapper;
-import com.ard.system.service.ISysMenuService;
+import com.ard.system.mapper.system.SysMenuMapper;
+import com.ard.system.mapper.system.SysRoleMapper;
+import com.ard.system.mapper.system.SysRoleMenuMapper;
/**
* 菜单 业务层处理
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysNoticeServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/system/impl/SysNoticeServiceImpl.java
similarity index 89%
rename from ard-system/src/main/java/com/ard/system/service/impl/SysNoticeServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/system/impl/SysNoticeServiceImpl.java
index 9e7ea2d..97f5620 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysNoticeServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/impl/SysNoticeServiceImpl.java
@@ -1,11 +1,12 @@
-package com.ard.system.service.impl;
+package com.ard.system.service.system.impl;
import java.util.List;
+
+import com.ard.system.service.system.ISysNoticeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ard.system.domain.SysNotice;
-import com.ard.system.mapper.SysNoticeMapper;
-import com.ard.system.service.ISysNoticeService;
+import com.ard.system.domain.system.SysNotice;
+import com.ard.system.mapper.system.SysNoticeMapper;
/**
* 公告 服务层实现
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysOperLogServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/system/impl/SysOperLogServiceImpl.java
similarity index 87%
rename from ard-system/src/main/java/com/ard/system/service/impl/SysOperLogServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/system/impl/SysOperLogServiceImpl.java
index d31020a..9589070 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysOperLogServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/impl/SysOperLogServiceImpl.java
@@ -1,11 +1,12 @@
-package com.ard.system.service.impl;
+package com.ard.system.service.system.impl;
import java.util.List;
+
+import com.ard.system.service.system.ISysOperLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ard.system.domain.SysOperLog;
-import com.ard.system.mapper.SysOperLogMapper;
-import com.ard.system.service.ISysOperLogService;
+import com.ard.system.domain.system.SysOperLog;
+import com.ard.system.mapper.system.SysOperLogMapper;
/**
* 操作日志 服务层处理
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysPostServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/system/impl/SysPostServiceImpl.java
similarity index 93%
rename from ard-system/src/main/java/com/ard/system/service/impl/SysPostServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/system/impl/SysPostServiceImpl.java
index 972b9ad..ce82715 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysPostServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/impl/SysPostServiceImpl.java
@@ -1,15 +1,16 @@
-package com.ard.system.service.impl;
+package com.ard.system.service.system.impl;
import java.util.List;
+
+import com.ard.system.service.system.ISysPostService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.common.constant.UserConstants;
import com.ard.common.exception.ServiceException;
import com.ard.common.utils.StringUtils;
-import com.ard.system.domain.SysPost;
-import com.ard.system.mapper.SysPostMapper;
-import com.ard.system.mapper.SysUserPostMapper;
-import com.ard.system.service.ISysPostService;
+import com.ard.system.domain.system.SysPost;
+import com.ard.system.mapper.system.SysPostMapper;
+import com.ard.system.mapper.system.SysUserPostMapper;
/**
* 岗位信息 服务层处理
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysRoleServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/system/impl/SysRoleServiceImpl.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/service/impl/SysRoleServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/system/impl/SysRoleServiceImpl.java
index 9ffff75..50a9e49 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysRoleServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/impl/SysRoleServiceImpl.java
@@ -1,10 +1,12 @@
-package com.ard.system.service.impl;
+package com.ard.system.service.system.impl;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+
+import com.ard.system.service.system.ISysRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -16,14 +18,13 @@
import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.StringUtils;
import com.ard.common.utils.spring.SpringUtils;
-import com.ard.system.domain.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;
-import com.ard.system.service.ISysRoleService;
+import com.ard.system.domain.system.SysRoleDept;
+import com.ard.system.domain.system.SysRoleMenu;
+import com.ard.system.domain.system.SysUserRole;
+import com.ard.system.mapper.system.SysRoleDeptMapper;
+import com.ard.system.mapper.system.SysRoleMapper;
+import com.ard.system.mapper.system.SysRoleMenuMapper;
+import com.ard.system.mapper.system.SysUserRoleMapper;
/**
* 角色 业务层处理
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysUserOnlineServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/system/impl/SysUserOnlineServiceImpl.java
similarity index 94%
rename from ard-system/src/main/java/com/ard/system/service/impl/SysUserOnlineServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/system/impl/SysUserOnlineServiceImpl.java
index 4b021ab..8801250 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysUserOnlineServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/impl/SysUserOnlineServiceImpl.java
@@ -1,10 +1,10 @@
-package com.ard.system.service.impl;
+package com.ard.system.service.system.impl;
+import com.ard.system.service.system.ISysUserOnlineService;
import org.springframework.stereotype.Service;
import com.ard.common.core.domain.model.LoginUser;
import com.ard.common.utils.StringUtils;
-import com.ard.system.domain.SysUserOnline;
-import com.ard.system.service.ISysUserOnlineService;
+import com.ard.system.domain.system.SysUserOnline;
/**
* 在线用户 服务层处理
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysUserServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/system/impl/SysUserServiceImpl.java
similarity index 95%
rename from ard-system/src/main/java/com/ard/system/service/impl/SysUserServiceImpl.java
rename to ard-system/src/main/java/com/ard/system/service/system/impl/SysUserServiceImpl.java
index cd83507..151afb8 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysUserServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/system/impl/SysUserServiceImpl.java
@@ -1,9 +1,13 @@
-package com.ard.system.service.impl;
+package com.ard.system.service.system.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import javax.validation.Validator;
+
+import com.ard.system.service.system.ISysConfigService;
+import com.ard.system.service.system.ISysDeptService;
+import com.ard.system.service.system.ISysUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,17 +23,14 @@
import com.ard.common.utils.StringUtils;
import com.ard.common.utils.bean.BeanValidators;
import com.ard.common.utils.spring.SpringUtils;
-import com.ard.system.domain.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;
-import com.ard.system.service.ISysConfigService;
-import com.ard.system.service.ISysDeptService;
-import com.ard.system.service.ISysUserService;
+import com.ard.system.domain.system.SysPost;
+import com.ard.system.domain.system.SysUserPost;
+import com.ard.system.domain.system.SysUserRole;
+import com.ard.system.mapper.system.SysPostMapper;
+import com.ard.system.mapper.system.SysRoleMapper;
+import com.ard.system.mapper.system.SysUserMapper;
+import com.ard.system.mapper.system.SysUserPostMapper;
+import com.ard.system.mapper.system.SysUserRoleMapper;
/**
* 用户 业务层处理
diff --git a/ard-system/src/main/resources/mapper/system/ArdMapManagementMapper.xml b/ard-system/src/main/resources/mapper/data/ArdMapManagementMapper.xml
similarity index 97%
rename from ard-system/src/main/resources/mapper/system/ArdMapManagementMapper.xml
rename to ard-system/src/main/resources/mapper/data/ArdMapManagementMapper.xml
index ca4da9f..3650021 100644
--- a/ard-system/src/main/resources/mapper/system/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.data.mapper.ArdMapManagementMapper">
+<mapper namespace="com.ard.system.mapper.data.ArdMapManagementMapper">
<resultMap type="ArdMapManagement" id="ArdMapManagementResult">
<result property="id" column="id" />
diff --git a/ard-system/src/main/resources/mapper/system/ArdModelManagementMapper.xml b/ard-system/src/main/resources/mapper/data/ArdModelManagementMapper.xml
similarity index 97%
rename from ard-system/src/main/resources/mapper/system/ArdModelManagementMapper.xml
rename to ard-system/src/main/resources/mapper/data/ArdModelManagementMapper.xml
index f6e113f..c0ea39b 100644
--- a/ard-system/src/main/resources/mapper/system/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.data.mapper.ArdModelManagementMapper">
+<mapper namespace="com.ard.system.mapper.data.ArdModelManagementMapper">
<resultMap type="ArdModelManagement" id="ArdModelManagementResult">
<result property="id" column="id" />
diff --git a/ard-system/src/main/resources/mapper/data/ArdNoFlyZoneMapper.xml b/ard-system/src/main/resources/mapper/data/ArdNoFlyZoneMapper.xml
index 8b5ef2f..8520471 100644
--- a/ard-system/src/main/resources/mapper/data/ArdNoFlyZoneMapper.xml
+++ b/ard-system/src/main/resources/mapper/data/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.data.noflyzone.mapper.ArdNoFlyZoneMapper">
+<mapper namespace="com.ard.system.mapper.noflyzone.ArdNoFlyZoneMapper">
<resultMap type="ArdNoFlyZone" id="ArdNoFlyZoneResult">
<result property="id" column="id" />
<result property="name" column="name" />
- <result property="geojson" column="geojson" typeHandler="com.ard.data.noflyzone.domain.FeatureCollectionTypeHandler"/>
+ <result property="geojson" column="geojson" typeHandler="com.ard.system.domain.noflyzone.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/ArdTileManagementMapper.xml b/ard-system/src/main/resources/mapper/data/ArdTileManagementMapper.xml
similarity index 98%
rename from ard-system/src/main/resources/mapper/system/ArdTileManagementMapper.xml
rename to ard-system/src/main/resources/mapper/data/ArdTileManagementMapper.xml
index e95b888..3aecd68 100644
--- a/ard-system/src/main/resources/mapper/system/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.data.mapper.ArdTileManagementMapper">
+<mapper namespace="com.ard.system.mapper.data.ArdTileManagementMapper">
<resultMap type="ArdTileManagement" id="ArdTileManagementResult">
<result property="id" column="id" />
diff --git a/ard-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ard-system/src/main/resources/mapper/system/SysConfigMapper.xml
index c24ffb5..b4f3144 100644
--- a/ard-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.SysConfigMapper">
+<mapper namespace="com.ard.system.mapper.system.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 c5ee411..fd3836f 100644
--- a/ard-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.SysDeptMapper">
+<mapper namespace="com.ard.system.mapper.system.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 aaba830..7081f29 100644
--- a/ard-system/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.SysDictDataMapper">
+<mapper namespace="com.ard.system.mapper.system.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 a1a3863..6787ea1 100644
--- a/ard-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.SysDictTypeMapper">
+<mapper namespace="com.ard.system.mapper.system.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 7bee661..1607722 100644
--- a/ard-system/src/main/resources/mapper/system/SysLogininforMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysLogininforMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.SysLogininforMapper">
+<mapper namespace="com.ard.system.mapper.system.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 a268181..73af4d7 100644
--- a/ard-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.SysMenuMapper">
+<mapper namespace="com.ard.system.mapper.system.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 cfbcd8b..db60b22 100644
--- a/ard-system/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.SysNoticeMapper">
+<mapper namespace="com.ard.system.mapper.system.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 75a0c81..f5c00c3 100644
--- a/ard-system/src/main/resources/mapper/system/SysOperLogMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysOperLogMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.SysOperLogMapper">
+<mapper namespace="com.ard.system.mapper.system.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 9f32397..957c099 100644
--- a/ard-system/src/main/resources/mapper/system/SysPostMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysPostMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.SysPostMapper">
+<mapper namespace="com.ard.system.mapper.system.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 feae472..3f8df05 100644
--- a/ard-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.SysRoleDeptMapper">
+<mapper namespace="com.ard.system.mapper.system.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 2d97532..0fb44f9 100644
--- a/ard-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.SysRoleMapper">
+<mapper namespace="com.ard.system.mapper.system.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 b0b8eab..ec5c618 100644
--- a/ard-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.SysRoleMenuMapper">
+<mapper namespace="com.ard.system.mapper.system.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 dfad20f..89cb757 100644
--- a/ard-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.SysUserMapper">
+<mapper namespace="com.ard.system.mapper.system.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 a3f2216..41a5f7c 100644
--- a/ard-system/src/main/resources/mapper/system/SysUserPostMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysUserPostMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.SysUserPostMapper">
+<mapper namespace="com.ard.system.mapper.system.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 1f1f356..51b257b 100644
--- a/ard-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
+++ b/ard-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.system.mapper.SysUserRoleMapper">
+<mapper namespace="com.ard.system.mapper.system.SysUserRoleMapper">
<resultMap type="SysUserRole" id="SysUserRoleResult">
<result property="userId" column="user_id" />
diff --git a/ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java b/ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java
index 6adfc48..58553f5 100644
--- a/ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java
+++ b/ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java
@@ -44,7 +44,7 @@
BaseMessage<?> baseMessage = JSON.parseObject(payload, BaseMessage.class);
MessageType messageType = MessageType.fromString(baseMessage.getType());
switch (messageType) {
- case STREAM:
+ case STREAM: // 直播地址
break;
case STATE:
--
Gitblit v1.9.3