1.整理system文件，根据功能分类。 2.整理kmz文件路径。

Xiajijian

2025-10-14 639c706cac20523358e6c9666069fbda9fdd4d57

1.整理system文件，根据功能分类。
2.整理kmz文件路径。

 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;

/**
 * 验证码操作处理

 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;

 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;

 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;

 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;

 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;

/**
 * 缓存监控

 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;

/**
 * 系统访问记录

 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;

/**
 * 操作日志记录

 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;

/**
 * 在线用户监控

 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;

 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;

 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;

/**
 * 参数配置 信息操作处理

 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;

/**
 * 部门信息

 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;

/**
 * 数据字典信息

 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;

/**
 * 数据字典信息

 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;

/**
 * 登录验证

 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;

/**
 * 菜单信息

 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;

/**
 * 公告 信息操作处理

 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;

/**
 * 岗位信息操作处理

 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;

/**
 * 个人信息 业务处理

 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;

/**
 * 注册验证

 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;

/**
 * 角色信息

 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;

/**
 * 用户信息

 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;

/**
 * 操作日志记录处理

 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;

/**

 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;

/**
 * 登录校验方法

 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;

/**
 * 用户权限处理

 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;

/**
 * 注册校验方法

 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;

/**
 * 用户验证处理

 ard-route/src/main/java/com/ard/route/constant/FileTypeConstants.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/constant/FileTypeConstants.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.constant;
package com.ard.route.constant;

public interface FileTypeConstants {


 ard-route/src/main/java/com/ard/route/domain/ActionTriggerReq.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/domain/ActionTriggerReq.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.domain;
package com.ard.route.domain;

import lombok.Data;


 ard-route/src/main/java/com/ard/route/domain/CoordinatePointReq.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/domain/CoordinatePointReq.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.domain;
package com.ard.route.domain;

import lombok.Data;


 ard-route/src/main/java/com/ard/route/domain/MappingTypeReq.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/domain/MappingTypeReq.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.domain;
package com.ard.route.domain;

import lombok.Data;


 ard-route/src/main/java/com/ard/route/domain/PointActionReq.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/domain/PointActionReq.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.domain;
package com.ard.route.domain;

import lombok.Data;


 ard-route/src/main/java/com/ard/route/domain/RoutePointReq.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/domain/RoutePointReq.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.domain;
package com.ard.route.domain;

import lombok.Data;


 ard-route/src/main/java/com/ard/route/domain/UavRouteReq.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/domain/UavRouteReq.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.domain;
package com.ard.route.domain;

import lombok.Data;


 ard-route/src/main/java/com/ard/route/domain/WaypointHeadingReq.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/domain/WaypointHeadingReq.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.domain;
package com.ard.route.domain;

import lombok.Data;


 ard-route/src/main/java/com/ard/route/domain/WaypointTurnReq.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/domain/WaypointTurnReq.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.domain;
package com.ard.route.domain;

import lombok.Data;


 ard-route/src/main/java/com/ard/route/domain/kml/KmlAction.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlActionActuatorFuncParam.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlActionGroup.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlActionTrigger.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlDocument.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlDroneInfo.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlFolder.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlGlobalWaypointHeadingParam.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlInfo.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlLineString.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlLinearRing.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlMissionConfig.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlOuterBoundaryIs.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlOverlap.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlParams.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlPayloadInfo.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlPayloadParam.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlPlacemark.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlPoint.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlPolygon.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlWayLineCoordinateSysParam.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointGimbalHeadingParam.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointHeadingParam.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/KmlWaypointTurnParam.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/domain/kml/RoutePointInfo.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/enums/kml/ActionActuatorFuncEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ActionActuatorFuncEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:actionActuatorFunc     动作类型

 ard-route/src/main/java/com/ard/route/enums/kml/ActionGroupModeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ActionGroupModeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:actionGroupMode     动作执行模式

 ard-route/src/main/java/com/ard/route/enums/kml/ActionTriggerTypeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ActionTriggerTypeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:actionTriggerType     动作触发器类型

 ard-route/src/main/java/com/ard/route/enums/kml/AircraftPathModeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/AircraftPathModeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:aircraftPathMode     飞行器偏航角转动模式

 ard-route/src/main/java/com/ard/route/enums/kml/CollectionMethodEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/CollectionMethodEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:overlap     采集类型

 ard-route/src/main/java/com/ard/route/enums/kml/DroneEnumValueEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/DroneEnumValueEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:droneEnumValue     飞行器机型主类型

 ard-route/src/main/java/com/ard/route/enums/kml/ExecuteHeightModeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ExecuteHeightModeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:executeHeightMode 执行高度模式

 ard-route/src/main/java/com/ard/route/enums/kml/ExecuteRCLostActionEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ExecuteRCLostActionEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:executeRCLostAction     失控动作类型

 ard-route/src/main/java/com/ard/route/enums/kml/ExitOnRCLostEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ExitOnRCLostEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:exitOnRCLost 失控是否继续执行航线

 ard-route/src/main/java/com/ard/route/enums/kml/FinishActionEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/FinishActionEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:finishAction 航线结束动作

 ard-route/src/main/java/com/ard/route/enums/kml/FlyToWaylineModeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/FlyToWaylineModeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:flyToWaylineMode 飞向首航点模式

 ard-route/src/main/java/com/ard/route/enums/kml/FocusModeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/FocusModeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:focusMode         负载对焦模式

 ard-route/src/main/java/com/ard/route/enums/kml/GimbalPitchModeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/GimbalPitchModeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:gimbalPitchMode     云台俯仰角控制模式

 ard-route/src/main/java/com/ard/route/enums/kml/GlobalWaypointTurnModeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/GlobalWaypointTurnModeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:globalWaypointTurnMode     全局航点类型（全局航点转弯模式）

 ard-route/src/main/java/com/ard/route/enums/kml/HeightModeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/HeightModeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:heightMode     航点高程参考平面

 ard-route/src/main/java/com/ard/route/enums/kml/ImageFormatEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ImageFormatEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:imageFormat         图片格式列表

 ard-route/src/main/java/com/ard/route/enums/kml/LensTypeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/LensTypeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:overlap     采集类型

 ard-route/src/main/java/com/ard/route/enums/kml/MeteringModeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/MeteringModeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:meteringMode         负载测光模式

 ard-route/src/main/java/com/ard/route/enums/kml/PayloadPositionIndexEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/PayloadPositionIndexEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:payloadPositionIndex     负载挂载位置

 ard-route/src/main/java/com/ard/route/enums/kml/PayloadTypeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/PayloadTypeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:payloadEnumValue     负载机型主类型

 ard-route/src/main/java/com/ard/route/enums/kml/PositioningTypeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/PositioningTypeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:positioningType     经纬度与高度数据源

 ard-route/src/main/java/com/ard/route/enums/kml/ReturnModeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ReturnModeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:returnMode         激光雷达回波模式

 ard-route/src/main/java/com/ard/route/enums/kml/ScanningModeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ScanningModeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:scanningMode         负载扫描模式

 ard-route/src/main/java/com/ard/route/enums/kml/ShootTypeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/ShootTypeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:shootType 拍照模式（定时或定距）

 ard-route/src/main/java/com/ard/route/enums/kml/TemplateTypeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/TemplateTypeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:templateType     预定义模板类型

 ard-route/src/main/java/com/ard/route/enums/kml/WaypointHeadingModeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/WaypointHeadingModeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:waypointHeadingMode     飞行器偏航角模式

 ard-route/src/main/java/com/ard/route/enums/kml/WaypointHeadingPathModeEnums.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/enums/kml/WaypointHeadingPathModeEnums.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.enums.kml;
package com.ard.route.enums.kml;

/**
 * wpml:waypointHeadingPathMode     飞行器偏航角转动方向

 ard-route/src/main/java/com/ard/route/service/UavRouteService.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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 {


 ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 ard-route/src/main/java/com/ard/route/util/Gps.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/util/Gps.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.util;
package com.ard.route.util;

import lombok.AllArgsConstructor;
import lombok.Data;

 ard-route/src/main/java/com/ard/route/util/PositionUtils.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/util/PositionUtils.java
@@ -1,4 +1,4 @@
package com.ard.route.kmz.util;
package com.ard.route.util;
/**
 * 各地图API坐标系统比较与转换;
 *

 ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java

File was renamed from ard-route/src/main/java/com/ard/route/kmz/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;

 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;

 ard-system/src/main/java/com/ard/system/common/AuthorizeUtil.java

File was renamed from ard-system/src/main/java/com/ard/authorize/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;

 ard-system/src/main/java/com/ard/system/common/DateTimeUtil.java

File was renamed from ard-system/src/main/java/com/ard/authorize/common/DateTimeUtil.java
@@ -1,4 +1,4 @@
package com.ard.authorize.common;
package com.ard.system.common;

import org.apache.commons.lang3.time.DateUtils;


 ard-system/src/main/java/com/ard/system/common/Md5Utils.java

File was renamed from ard-system/src/main/java/com/ard/authorize/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;

 ard-system/src/main/java/com/ard/system/domain/authorize/AuthorizeInfo.java

File was renamed from ard-system/src/main/java/com/ard/authorize/domain/AuthorizeInfo.java
@@ -1,4 +1,4 @@
package com.ard.authorize.domain;
package com.ard.system.domain.authorize;

import lombok.AllArgsConstructor;
import lombok.Data;

 ard-system/src/main/java/com/ard/system/domain/authorize/ParsLicenseInfo.java

File was renamed from ard-system/src/main/java/com/ard/authorize/domain/ParsLicenseInfo.java
@@ -1,4 +1,4 @@
package com.ard.authorize.domain;
package com.ard.system.domain.authorize;

import lombok.AllArgsConstructor;
import lombok.Data;

 ard-system/src/main/java/com/ard/system/domain/data/ArdMapManagement.java

File was renamed from ard-system/src/main/java/com/ard/data/domain/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;

 ard-system/src/main/java/com/ard/system/domain/data/ArdModelManagement.java

File was renamed from ard-system/src/main/java/com/ard/data/domain/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;

}

 ard-system/src/main/java/com/ard/system/domain/data/ArdTileManagement.java

File was renamed from ard-system/src/main/java/com/ard/data/domain/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;

 ard-system/src/main/java/com/ard/system/domain/noflyzone/ArdNoFlyZone.java

File was renamed from ard-system/src/main/java/com/ard/data/noflyzone/domain/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;


 ard-system/src/main/java/com/ard/system/domain/noflyzone/FeatureCollection.java

File was renamed from ard-system/src/main/java/com/ard/data/noflyzone/domain/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;

 ard-system/src/main/java/com/ard/system/domain/noflyzone/FeatureCollectionTypeHandler.java

File was renamed from ard-system/src/main/java/com/ard/data/noflyzone/domain/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;

 ard-system/src/main/java/com/ard/system/domain/system/SysCache.java

File was renamed from ard-system/src/main/java/com/ard/system/domain/SysCache.java
@@ -1,4 +1,4 @@
package com.ard.system.domain;
package com.ard.system.domain.system;

import com.ard.common.utils.StringUtils;


 ard-system/src/main/java/com/ard/system/domain/system/SysConfig.java

File was renamed from ard-system/src/main/java/com/ard/system/domain/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;

 ard-system/src/main/java/com/ard/system/domain/system/SysLogininfor.java

File was renamed from ard-system/src/main/java/com/ard/system/domain/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;

 ard-system/src/main/java/com/ard/system/domain/system/SysNotice.java

File was renamed from ard-system/src/main/java/com/ard/system/domain/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;

 ard-system/src/main/java/com/ard/system/domain/system/SysOperLog.java

File was renamed from ard-system/src/main/java/com/ard/system/domain/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;

 ard-system/src/main/java/com/ard/system/domain/system/SysPost.java

File was renamed from ard-system/src/main/java/com/ard/system/domain/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;

 ard-system/src/main/java/com/ard/system/domain/system/SysRoleDept.java

File was renamed from ard-system/src/main/java/com/ard/system/domain/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;

 ard-system/src/main/java/com/ard/system/domain/system/SysRoleMenu.java

File was renamed from ard-system/src/main/java/com/ard/system/domain/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;

 ard-system/src/main/java/com/ard/system/domain/system/SysUserOnline.java

File was renamed from ard-system/src/main/java/com/ard/system/domain/SysUserOnline.java
@@ -1,4 +1,4 @@
package com.ard.system.domain;
package com.ard.system.domain.system;

/**
 * 当前在线会话

 ard-system/src/main/java/com/ard/system/domain/system/SysUserPost.java

File was renamed from ard-system/src/main/java/com/ard/system/domain/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;

 ard-system/src/main/java/com/ard/system/domain/system/SysUserRole.java

File was renamed from ard-system/src/main/java/com/ard/system/domain/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;

 ard-system/src/main/java/com/ard/system/mapper/data/ArdMapManagementMapper.java

File was renamed from ard-system/src/main/java/com/ard/data/mapper/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;


 ard-system/src/main/java/com/ard/system/mapper/data/ArdModelManagementMapper.java

File was renamed from ard-system/src/main/java/com/ard/data/mapper/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;


 ard-system/src/main/java/com/ard/system/mapper/data/ArdTileManagementMapper.java

File was renamed from ard-system/src/main/java/com/ard/data/mapper/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;


 ard-system/src/main/java/com/ard/system/mapper/noflyzone/ArdNoFlyZoneMapper.java

File was renamed from ard-system/src/main/java/com/ard/data/noflyzone/mapper/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接口

 ard-system/src/main/java/com/ard/system/mapper/system/SysConfigMapper.java

File was renamed from ard-system/src/main/java/com/ard/system/mapper/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;

/**
 * 参数配置 数据层

 ard-system/src/main/java/com/ard/system/mapper/system/SysDeptMapper.java

File was renamed from ard-system/src/main/java/com/ard/system/mapper/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;

 ard-system/src/main/java/com/ard/system/mapper/system/SysDictDataMapper.java

File was renamed from ard-system/src/main/java/com/ard/system/mapper/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;

 ard-system/src/main/java/com/ard/system/mapper/system/SysDictTypeMapper.java

File was renamed from ard-system/src/main/java/com/ard/system/mapper/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;

 ard-system/src/main/java/com/ard/system/mapper/system/SysLogininforMapper.java

File was renamed from ard-system/src/main/java/com/ard/system/mapper/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;

/**
 * 系统访问日志情况信息 数据层

 ard-system/src/main/java/com/ard/system/mapper/system/SysMenuMapper.java

File was renamed from ard-system/src/main/java/com/ard/system/mapper/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;

 ard-system/src/main/java/com/ard/system/mapper/system/SysNoticeMapper.java

File was renamed from ard-system/src/main/java/com/ard/system/mapper/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;

/**
 * 通知公告表 数据层

 ard-system/src/main/java/com/ard/system/mapper/system/SysOperLogMapper.java

File was renamed from ard-system/src/main/java/com/ard/system/mapper/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;

/**
 * 操作日志 数据层

 ard-system/src/main/java/com/ard/system/mapper/system/SysPostMapper.java

File was renamed from ard-system/src/main/java/com/ard/system/mapper/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;

/**
 * 岗位信息 数据层

 ard-system/src/main/java/com/ard/system/mapper/system/SysRoleDeptMapper.java

File was renamed from ard-system/src/main/java/com/ard/system/mapper/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;

/**
 * 角色与部门关联表 数据层

 ard-system/src/main/java/com/ard/system/mapper/system/SysRoleMapper.java

File was renamed from ard-system/src/main/java/com/ard/system/mapper/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;

 ard-system/src/main/java/com/ard/system/mapper/system/SysRoleMenuMapper.java

File was renamed from ard-system/src/main/java/com/ard/system/mapper/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;

/**
 * 角色与菜单关联表 数据层

 ard-system/src/main/java/com/ard/system/mapper/system/SysUserMapper.java

File was renamed from ard-system/src/main/java/com/ard/system/mapper/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;

 ard-system/src/main/java/com/ard/system/mapper/system/SysUserPostMapper.java

File was renamed from ard-system/src/main/java/com/ard/system/mapper/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;

/**
 * 用户与岗位关联表 数据层

 ard-system/src/main/java/com/ard/system/mapper/system/SysUserRoleMapper.java

File was renamed from ard-system/src/main/java/com/ard/system/mapper/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;

/**
 * 用户与角色关联表 数据层

 ard-system/src/main/java/com/ard/system/service/authorize/AuthorizeService.java

File was renamed from ard-system/src/main/java/com/ard/authorize/service/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;

 ard-system/src/main/java/com/ard/system/service/authorize/impl/AuthorizeServiceImpl.java

File was renamed from ard-system/src/main/java/com/ard/authorize/service/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;

 ard-system/src/main/java/com/ard/system/service/data/IArdMapManagementService.java

File was renamed from ard-system/src/main/java/com/ard/data/service/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;


 ard-system/src/main/java/com/ard/system/service/data/IArdModelManagementService.java

File was renamed from ard-system/src/main/java/com/ard/data/service/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;


 ard-system/src/main/java/com/ard/system/service/data/IArdTileManagementService.java

File was renamed from ard-system/src/main/java/com/ard/data/service/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;


 ard-system/src/main/java/com/ard/system/service/data/impl/ArdMapManagementServiceImpl.java

File was renamed from ard-system/src/main/java/com/ard/data/service/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;


 ard-system/src/main/java/com/ard/system/service/data/impl/ArdModelManagementServiceImpl.java

File was renamed from ard-system/src/main/java/com/ard/data/service/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;


 ard-system/src/main/java/com/ard/system/service/data/impl/ArdTileManagementServiceImpl.java

File was renamed from ard-system/src/main/java/com/ard/data/service/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;


 ard-system/src/main/java/com/ard/system/service/noflyzone/IArdNoFlyZoneService.java

File was renamed from ard-system/src/main/java/com/ard/data/noflyzone/service/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接口

 ard-system/src/main/java/com/ard/system/service/noflyzone/impl/ArdNoFlyZoneServiceImpl.java

File was renamed from ard-system/src/main/java/com/ard/data/noflyzone/service/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;


 ard-system/src/main/java/com/ard/system/service/system/ISysConfigService.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 参数配置 服务层

 ard-system/src/main/java/com/ard/system/service/system/ISysDeptService.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

 ard-system/src/main/java/com/ard/system/service/system/ISysDictDataService.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

 ard-system/src/main/java/com/ard/system/service/system/ISysDictTypeService.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

 ard-system/src/main/java/com/ard/system/service/system/ISysLogininforService.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 系统访问日志情况信息 服务层

 ard-system/src/main/java/com/ard/system/service/system/ISysMenuService.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

 ard-system/src/main/java/com/ard/system/service/system/ISysNoticeService.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 公告 服务层

 ard-system/src/main/java/com/ard/system/service/system/ISysOperLogService.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 操作日志 服务层

 ard-system/src/main/java/com/ard/system/service/system/ISysPostService.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 岗位信息 服务层

 ard-system/src/main/java/com/ard/system/service/system/ISysRoleService.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 角色业务层

 ard-system/src/main/java/com/ard/system/service/system/ISysUserOnlineService.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 在线用户 服务层

 ard-system/src/main/java/com/ard/system/service/system/ISysUserService.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

 ard-system/src/main/java/com/ard/system/service/system/impl/SysConfigServiceImpl.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 参数配置 服务层实现

 ard-system/src/main/java/com/ard/system/service/system/impl/SysDeptServiceImpl.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 部门管理 服务实现

 ard-system/src/main/java/com/ard/system/service/system/impl/SysDictDataServiceImpl.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 字典 业务层处理

 ard-system/src/main/java/com/ard/system/service/system/impl/SysDictTypeServiceImpl.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 字典 业务层处理

 ard-system/src/main/java/com/ard/system/service/system/impl/SysLogininforServiceImpl.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 系统访问日志情况信息 服务层处理

 ard-system/src/main/java/com/ard/system/service/system/impl/SysMenuServiceImpl.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 菜单 业务层处理

 ard-system/src/main/java/com/ard/system/service/system/impl/SysNoticeServiceImpl.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 公告 服务层实现

 ard-system/src/main/java/com/ard/system/service/system/impl/SysOperLogServiceImpl.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 操作日志 服务层处理

 ard-system/src/main/java/com/ard/system/service/system/impl/SysPostServiceImpl.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 岗位信息 服务层处理

 ard-system/src/main/java/com/ard/system/service/system/impl/SysRoleServiceImpl.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 角色 业务层处理

 ard-system/src/main/java/com/ard/system/service/system/impl/SysUserOnlineServiceImpl.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 在线用户 服务层处理

 ard-system/src/main/java/com/ard/system/service/system/impl/SysUserServiceImpl.java

File was renamed from ard-system/src/main/java/com/ard/system/service/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;

/**
 * 用户 业务层处理

 ard-system/src/main/resources/mapper/data/ArdMapManagementMapper.xml

File was renamed from ard-system/src/main/resources/mapper/system/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"    />

 ard-system/src/main/resources/mapper/data/ArdModelManagementMapper.xml

File was renamed from ard-system/src/main/resources/mapper/system/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"    />

 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"    />

 ard-system/src/main/resources/mapper/data/ArdTileManagementMapper.xml

File was renamed from ard-system/src/main/resources/mapper/system/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"    />

 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"      />

 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"     />

 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"   />

 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"     />

 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"           />

 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"        />

 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"       />

 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"        />

 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"       />

 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"      />

 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"               />

 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"      />

 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"      />

 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"      />

 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"      />

 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: